diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/BUILD_DEBUG_APK.md b/BUILD_DEBUG_APK.md
new file mode 100644
index 0000000..652d753
--- /dev/null
+++ b/BUILD_DEBUG_APK.md
@@ -0,0 +1,47 @@
+# Build debug APKs (User, Driver, Merchant)
+
+## One command (recommended)
+
+From the repo root (where this file is):
+
+```bash
+./build-debug-apks.sh
+```
+
+**Requires:** JDK 17+ and Android SDK (API 33) installed. If you use Android Studio, it provides both.
+
+---
+
+## Output locations
+
+After a successful run you get:
+
+| App     | Debug APK path |
+|---------|----------------|
+| **User**    | `OnTime_User_live/app/build/outputs/apk/debug/app-debug.apk` |
+| **Driver**  | `OnTime_Driver_live/app/build/outputs/apk/debug/app-debug.apk` |
+| **Merchant**| `OnTime_Merchant_live/app/build/outputs/apk/debug/app-debug.apk` |
+
+---
+
+## Build each app separately
+
+```bash
+# User
+cd OnTime_User_live && ./gradlew assembleDebug && cd ..
+
+# Driver
+cd OnTime_Driver_live && ./gradlew assembleDebug && cd ..
+
+# Merchant
+cd OnTime_Merchant_live && ./gradlew assembleDebug && cd ..
+```
+
+---
+
+## Signing
+
+- **User** and **Merchant** use `app/ontimekeystore.jks` (same keystore). User has it; the script copies it to Merchant if missing.
+- **Driver** uses the default Android debug keystore (no custom jks).
+
+If User or Merchant build fails with “keystore not found”, ensure `OnTime_User_live/app/ontimekeystore.jks` exists, then run the script again.
diff --git a/FCM_V1_PROCESS.md b/FCM_V1_PROCESS.md
new file mode 100644
index 0000000..0d5c7f4
--- /dev/null
+++ b/FCM_V1_PROCESS.md
@@ -0,0 +1,47 @@
+# Firebase FCM v1 Process (Login, Send, Receive)
+
+Reference: **test** app (`test/app`). All three live apps and the backend use the same Firebase project **ngojol-trial** and FCM HTTP v1 for login, sending, and receiving messages.
+
+## 1. Firebase project and config
+
+- **Project:** `ngojol-trial` (project_number: 158861273889)
+- **Backend:** Uses `ngojol-trial-firebase-adminsdk-lc81n-00c9e935db.json` and `fcm_v1_helper.php` to send via FCM HTTP v1 API.
+- **Android apps:** Each app uses `google-services.json` that includes the **id.ontime.*** package entries for this project:
+  - **User:** `id.ontime.customer`
+  - **Driver:** `id.ontime.driver`
+  - **Merchant:** `id.ontime.merchant`  
+  Use the same multi-app `google-services.json` as in **test/app/google-services.json** (or ensure your Firebase Console has these three Android apps under ngojol-trial).
+
+## 2. Login and FCM token (FCM v1)
+
+- **Token retrieval:** All apps use `FirebaseMessaging.getInstance().getToken()` (async) instead of deprecated `FirebaseInstanceId.getInstance().getToken()`.
+- **BaseApp (User, Driver, Merchant):** On startup, get token with `getToken().addOnCompleteListener(...)`, then subscribe to topics (`pelanggan` / `driver`+`ouride` / `mitra`+`ouride`) and store the token in Realm.
+- **LoginActivity:** On sign-in, get token with `getToken().addOnCompleteListener(...)` and send it to the backend as `reg_id` in the login request so the server can target this device for FCM.
+- **RegisterActivity (User):** Registration request sends the FCM token via `getToken().addOnCompleteListener(...)` then `request.setToken(...)` and `service.register(request)`.
+- **onNewToken:** In each app’s `MessagingService`, `onNewToken()` saves the new token in Realm and posts it on EventBus so the UI can use the latest token; the next login will send the updated token to the backend.
+
+## 3. Sending messages (backend → devices)
+
+- Backend uses **FCM HTTP v1** only:
+  - `application/helpers/fcm_v1_helper.php`: `fcm_v1_get_access_token()`, `fcm_v1_send($target, $data, $is_topic, $options)`.
+  - `application/models/Notification_model.php`: `send_generic_to_token()` and `send_generic_to_topic()` call `fcm_v1_send`.
+- Config in `application/config/config.php`: `FCM_PROJECT_ID` = `ngojol-trial`, `FCM_CREDENTIALS_PATH` = path to the service account JSON.
+- All notification flows (order, chat, top-up, etc.) go through this v1 path.
+
+## 4. Receiving messages (devices)
+
+- Each app has a `MessagingService` extending `FirebaseMessagingService`:
+  - **User:** `id.ontime.customer.utils.api.service.MessagingService`
+  - **Driver:** `id.ontime.driver.utils.api.service.MessagingService`
+  - **Merchant:** `id.ontime.merchant.utils.api.service.MessagingService`
+- `onMessageReceived(RemoteMessage)` handles data payloads (e.g. `type` 1=order, 2=chat, 3/4=other), shows notifications and updates UI (including broadcasts for order status).
+- No legacy FCM or `FirebaseInstanceId` usage; token handling is FCM v1 only.
+
+## 5. Checklist
+
+- [x] BaseApp: FCM token via `FirebaseMessaging.getToken()` async + topic subscribe.
+- [x] LoginActivity: Send `reg_id` to backend using token from `getToken().addOnCompleteListener(...)`.
+- [x] RegisterActivity (User): Send token with register request via async `getToken()`.
+- [x] MessagingService: `onNewToken()` implemented; token stored in Realm and posted on EventBus.
+- [x] Backend: Sends all FCM via `fcm_v1_helper` (FCM HTTP v1).
+- [x] All apps and backend use the same Firebase project (**ngojol-trial**) and matching `google-services.json` / service account.
diff --git a/JDK_REQUIREMENTS.md b/JDK_REQUIREMENTS.md
new file mode 100644
index 0000000..e7cc2ea
--- /dev/null
+++ b/JDK_REQUIREMENTS.md
@@ -0,0 +1,112 @@
+# JDK version for OnTime (User, Driver, Merchant)
+
+## Required: **JDK 17** or **JDK 21**
+
+The project uses:
+- **Gradle 8.9** (gradle-wrapper)
+- **Android Gradle Plugin 8.5.0** (User app; Driver/Merchant use similar)
+- **App source/target:** Java 11 (Driver, Merchant); User follows Gradle default
+
+Android Gradle Plugin 8.x needs **JDK 17** or newer. Use **JDK 17** or **JDK 21**.
+
+---
+
+## Install JDK
+
+### macOS (Homebrew)
+
+```bash
+# JDK 17 (LTS)
+brew install openjdk@17
+
+# Or JDK 21
+brew install openjdk@21
+```
+
+Then link and set `JAVA_HOME` (add to `~/.zshrc` or `~/.bash_profile`):
+
+```bash
+# For JDK 17
+export JAVA_HOME="$(/usr/libexec/java_home -v 17 2>/dev/null || echo /opt/homebrew/opt/openjdk@17)"
+export PATH="$JAVA_HOME/bin:$PATH"
+```
+
+### macOS (manual)
+
+1. Download **JDK 17** or **21** from [Adoptium](https://adoptium.net/) or [Oracle](https://www.oracle.com/java/technologies/downloads/).
+2. Install the `.pkg`.
+3. Set `JAVA_HOME`, e.g. for Adoptium 17 on Apple Silicon:
+   ```bash
+   export JAVA_HOME=/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home
+   ```
+
+### Windows
+
+1. Download **JDK 17** or **21** from [Adoptium](https://adoptium.net/).
+2. Run the installer and note the install path (e.g. `C:\Program Files\Eclipse Adoptium\jdk-17`).
+3. Set environment variables:
+   - `JAVA_HOME` = that path
+   - Add `%JAVA_HOME%\bin` to `Path`.
+
+### Linux (apt)
+
+```bash
+# JDK 17
+sudo apt update
+sudo apt install openjdk-17-jdk
+
+# Or JDK 21
+sudo apt install openjdk-21-jdk
+```
+
+Set `JAVA_HOME` if needed (e.g. in `~/.bashrc`):
+
+```bash
+export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+export PATH="$JAVA_HOME/bin:$PATH"
+```
+
+---
+
+## Check version
+
+```bash
+java -version
+javac -version
+```
+
+You should see version **17** or **21**.
+
+---
+
+## Android SDK (required for building)
+
+Gradle needs the Android SDK path. Either:
+
+1. **Set `ANDROID_HOME`** (recommended):
+   ```bash
+   export ANDROID_HOME=$HOME/Library/Android/sdk   # macOS default
+   export PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools
+   ```
+
+2. **Or use `local.properties`** in each app folder (already created if you opened the project):
+   - `OnTime_User_live/local.properties`
+   - `OnTime_Driver_live/local.properties`
+   - `OnTime_Merchant_live/local.properties`  
+   Each should contain:
+   ```properties
+   sdk.dir=/Users/YOUR_USERNAME/Library/Android/sdk
+   ```
+   Replace `YOUR_USERNAME` with your macOS username, or use the path where Android Studio installed the SDK (e.g. Windows: `C:\\Users\\You\\AppData\\Local\\Android\\Sdk`).
+
+If the SDK is in a different location, edit `sdk.dir` in each `local.properties` or set `ANDROID_HOME` to that path.
+
+---
+
+Then build the apps:
+
+```bash
+./build-debug-apks.sh
+```
+
+Or open **OnTime_User_live**, **OnTime_Driver_live**, or **OnTime_Merchant_live** in Android Studio (it will use the JDK configured in **File → Settings → Build → Build Tools → Gradle**).
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/ORDERING_WORKFLOW.md b/ORDERING_WORKFLOW.md
new file mode 100644
index 0000000..388217c
--- /dev/null
+++ b/ORDERING_WORKFLOW.md
@@ -0,0 +1,78 @@
+# OnTime Ordering Workflow & Firebase Alignment
+
+## Order flow (User → Driver → Tujuan)
+
+1. **User: Set jemput (pickup)** – In RideCarActivity, user sets pickup via map/Places (`pickUpText`, `pickUpLatLang`).
+2. **User: Set tujuan (destination)** – User sets destination (`destinationText`, `destinationLatLang`). Route and price are calculated.
+3. **User: Set payment** – Cash or wallet (`checkedpaywallet`, `cashpayment` / `walletpayment`).
+4. **Search driver** – `GetNearRideCarRequestJson` / `GetNearRideCarResponseJson` loads nearby drivers; `driverAvailable` is used for FCM.
+5. **User: Order** – `sendRequestTransaksi()` calls backend, then `fcmBroadcast()` sends FCM to each driver token via **backend** `notification/send_generic`.
+6. **Driver: Bid or auto bid** – Driver receives FCM in `MessagingService` (type=1), opens `NewOrderActivity`. Manual: tap "order"; Auto: `getaccept(true)` after 2s if setting is ON.
+7. **Driver: Accept** – `getaccept()` calls backend `accept`, then sends FCM to **user token** (`regid`) with `OrderFCM` (response="2", type=1, id_driver, id_transaksi).
+8. **User: Driver accepted** – User app `MessagingService` gets type=1, response="2", posts `DriverResponse` via EventBus; `RideCarActivity.onMessageEvent` starts `ProgressActivity` (response "2").
+9. **Progress (until tujuan)** – User stays in `ProgressActivity`; driver in `OrderFragment` can tap "finish" (start) then "finish" (arrive). Each action: driver calls backend (`startrequest` / `finishrequest`), then FCM to user with response "3" (start) or "4" (finish/tujuan).
+10. **User: Start / Finish** – `MessagingService` parses type=1 and response "3"/"4", posts `DriverResponse`; `ProgressActivity` receives via EventBus or broadcast, `orderHandler()` updates status (e.g. "driver start", "finish/tiba di tujuan").
+
+## Test backend API
+
+**To test backend, use endpoint: `apitest.semestaterpadu.my.id`**
+
+All apps and the backend panel use the same test API base URL:
+
+| Component    | Config location | Base URL | API base |
+|-------------|-----------------|----------|----------|
+| User app    | `OnTime_User_live` → `Constants.java` | `https://apitest.semestaterpadu.my.id/` | `.../api/` |
+| Driver app  | `OnTime_Driver_live` → `Constants.java` | `https://apitest.semestaterpadu.my.id/` | `.../api/` |
+| Backend     | `backendpanel/application/config/config.php` → `$config['base_url']` | `https://apitest.semestaterpadu.my.id/` | same |
+
+Example test endpoints:
+- Base: `https://apitest.semestaterpadu.my.id/`
+- API (login, transaksi, etc.): `https://apitest.semestaterpadu.my.id/api/`
+- FCM send: `POST https://apitest.semestaterpadu.my.id/api/notification/send_generic`
+
+---
+
+## Firebase: same project for User, Backend, Driver
+
+- **Backend** – Single FCM project: uses `fcm_v1_helper` (HTTP v1) with service account (e.g. `FCM_CREDENTIALS_PATH` / `FCM_PROJECT_ID`). All sends go through **backend** `api/notification/send_generic` (POST).
+- **User app** – Receives FCM via `FirebaseMessagingService`; **sends** by calling same backend `Constants.CONNECTION + "notification/send_generic"` with `target` = driver token and `data` = `DriverRequest` (order offer).
+- **Driver app** – Receives FCM via `FirebaseMessagingService`; **sends** by calling same backend `Constants.CONNECTION + "notification/send_generic"` with `target` = user token and `data` = `OrderFCM` (accept/start/finish).
+
+Both apps use the same `BASE_URL` (e.g. `https://apitest.semestaterpadu.my.id/`) and same endpoint, so they share the same Firebase project and backend.
+
+## FCM type and payload alignment
+
+| Type | Meaning   | Sender   | Receiver | Key payload |
+|------|-----------|----------|----------|-------------|
+| 1    | Order     | User→Driver: `DriverRequest` (offer); Driver→User: `OrderFCM` (accept/start/finish/cancel) | Both | id_transaksi, id_driver, response ("2"/"3"/"4"/"5"), plus offer fields for driver |
+| 2    | Chat      | User/Driver | User/Driver | chat fields |
+| 3    | Other     | Backend  | User/Driver | title, message |
+| 4    | Other2    | Backend  | User/Driver | title, message |
+
+Backend `send_generic_to_token` / `send_generic_to_topic` flatten `data` and stringify values so FCM receives a flat string map.
+
+## Driver & merchant matching: purely GPS (no region)
+
+- **Driver nearby** (`list_ride` / `list_car`): Uses only **real GPS** – driver position from `config_driver` (updated by driver app’s `update_location`) and user/customer position from the request. **No region/wilayah** is used. Radius is `fitur.jarak_minimum` (km), with a minimum of 10 km.
+- **Merchant nearby**: Uses only **real GPS** – `merchant.latitude_merchant`, `merchant.longitude_merchant` and user’s lat/long. **No region** filter. Distance cap is `fitur.jarak_minimum`.
+
+Driver’s `wilayah` (partner_region) is only used in the admin panel for display; it is **not** used when finding nearby drivers or merchants for the user.
+
+---
+
+## "Tidak ada pengemudi di sekitar Anda" – checklist
+
+If the user always sees "Maaf, tidak ada pengemudi di sekitar Anda" even when a driver is close:
+
+1. **Driver must be "online"** – In the driver app the driver must be in "online" / status 1 mode. The backend only returns drivers where `config_driver.status = '1'`.
+2. **Driver location** – The driver app sends location via `driver/update_location`. Ensure the driver has opened the app and location permission is granted so `config_driver` has recent latitude/longitude.
+3. **Backend radius** – The backend uses `fitur.jarak_minimum` (km). A minimum radius of **10 km** is now applied so that small values in the admin panel (e.g. 1–2 km) still show drivers within 10 km. Admin can set **Services → jarak_minimum** to a larger value (e.g. 15 or 20 km) if needed.
+4. **User app** – If the first fetch was slow or location was not ready, the user can tap **Order** anyway: the app will **refetch** nearby drivers once (using pickup or last location) and then either place the order or show the message.
+
+## Fixes applied
+
+- **Backend:** Implemented `send_generic_to_token` and `send_generic_to_topic` in `Notification_model` using `fcm_v1_send`; controller loads `fcm_v1_helper` so generic FCM from both apps works.
+- **User MessagingService:** Null-safe handling for `getData()` and `type`; broadcast bundle now includes `code`, `response`, `id_transaksi`, `id_driver` so ProgressActivity can update when driver sends start/finish.
+- **ProgressActivity:** BroadcastReceiver only applies updates when `id_transaksi` matches; updates local `response` and calls `orderHandler(code)` so status and flow (e.g. sampai tujuan) stay correct.
+- **Driver MessagingService:** Null-safe handling for `getData()`, `type`, and `harga` to avoid NPE/crash on malformed FCM.
+- **"No driver near you":** Backend `get_driver_ride` now uses a minimum radius of 10 km (`GREATEST(COALESCE(f.jarak_minimum, 10), 10)`) so drivers within 10 km are found even if the fitur’s `jarak_minimum` is set very small. User app: when the user taps Order and the driver list is empty, the app refetches nearby drivers once (using pickup or last location) and then proceeds or shows the message.
diff --git a/OnTime_Driver_live/.gitignore b/OnTime_Driver_live/.gitignore
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/.gitignore b/OnTime_Driver_live/app/.gitignore
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/build.gradle b/OnTime_Driver_live/app/build.gradle
old mode 100644
new mode 100755
index e7c29ac..6aefb73
--- a/OnTime_Driver_live/app/build.gradle
+++ b/OnTime_Driver_live/app/build.gradle
@@ -8,12 +8,12 @@ android {
             // Use default debug keystore on this machine
         }
     }
-    compileSdk 33
+    compileSdk 34
 
         defaultConfig {
         applicationId "id.ontime.driver"
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdkVersion 23
+        targetSdkVersion 34
         versionCode 10
         versionName '1.1.0'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -55,11 +55,11 @@ dependencies {
     implementation 'com.google.android.libraries.places:places:2.5.0'
     implementation 'com.google.android.gms:play-services-maps:18.0.2'
     implementation 'com.google.android.gms:play-services-auth:20.1.0'
-    implementation 'com.google.firebase:firebase-database:20.0.3'
-    implementation 'com.google.firebase:firebase-storage:20.0.0'
-    implementation 'com.google.firebase:firebase-core:20.1.0'
-    implementation 'com.google.firebase:firebase-messaging:20.2.0'
-    implementation 'com.google.firebase:firebase-auth:19.3.1'
+    implementation platform('com.google.firebase:firebase-bom:33.1.0')
+    implementation 'com.google.firebase:firebase-database'
+    implementation 'com.google.firebase:firebase-storage'
+    implementation 'com.google.firebase:firebase-messaging'
+    implementation 'com.google.firebase:firebase-auth'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'com.google.android.material:material:1.5.0'
diff --git a/OnTime_Driver_live/app/butterknife-proguard-rules.pro b/OnTime_Driver_live/app/butterknife-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/guava-proguard-rules.pro b/OnTime_Driver_live/app/guava-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/okhttp3-proguard-rules.pro b/OnTime_Driver_live/app/okhttp3-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/proguard-rules.pro b/OnTime_Driver_live/app/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/release/output-metadata.json b/OnTime_Driver_live/app/release/output-metadata.json
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/retrofit-proguard-rules.pro b/OnTime_Driver_live/app/retrofit-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/saripaar-proguard-rules.pro b/OnTime_Driver_live/app/saripaar-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/sharuser.txt b/OnTime_Driver_live/app/sharuser.txt
new file mode 100644
index 0000000..a0d02f6
--- /dev/null
+++ b/OnTime_Driver_live/app/sharuser.txt
@@ -0,0 +1,26 @@
+Alias name: ontimekeystore
+Creation date: Oct 26, 2022
+Entry type: PrivateKeyEntry
+Certificate chain length: 1
+Certificate[1]:
+Owner: CN=Ontime Apps
+Issuer: CN=Ontime Apps
+Serial number: 39fdbb23
+Valid from: Wed Oct 26 11:27:28 WIB 2022 until: Thu Oct 13 11:27:28 WIB 2072
+Certificate fingerprints:
+	 SHA1: DC:13:DA:DC:9F:5F:A8:AD:3A:6C:F7:1C:5C:94:55:BB:AD:2E:F6:10
+	 SHA256: 73:17:40:D3:E1:63:4A:2E:AB:C1:BA:0A:65:BD:A4:77:A2:FB:CC:F5:46:C1:87:3D:AE:6D:87:4B:94:5C:2B:66
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+
+Extensions: 
+
+#1: ObjectId: 2.5.29.14 Criticality=false
+SubjectKeyIdentifier [
+KeyIdentifier [
+0000: 04 8E EC F7 50 72 86 16   C2 AF 1C 2B A9 B4 63 47  ....Pr.....+..cG
+0010: 71 55 24 44                                        qU$D
+]
+]
+
diff --git a/OnTime_Driver_live/app/src/main/AndroidManifest.xml b/OnTime_Driver_live/app/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
index f80dd50..ded77ed
--- a/OnTime_Driver_live/app/src/main/AndroidManifest.xml
+++ b/OnTime_Driver_live/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="id.ontime.driver"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
diff --git a/OnTime_Driver_live/app/src/main/assets/fonts/Montserrat_Bold.ttf b/OnTime_Driver_live/app/src/main/assets/fonts/Montserrat_Bold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/assets/fonts/Montserrat_Medium.ttf b/OnTime_Driver_live/app/src/main/assets/fonts/Montserrat_Medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/assets/fonts/Montserrat_Regular.ttf b/OnTime_Driver_live/app/src/main/assets/fonts/Montserrat_Regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/assets/fonts/Montserrat_SemiBold.ttf b/OnTime_Driver_live/app/src/main/assets/fonts/Montserrat_SemiBold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/assets/fonts/NeoSansPro_Medium.ttf b/OnTime_Driver_live/app/src/main/assets/fonts/NeoSansPro_Medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/assets/fonts/NeoSans_Pro_Regular.ttf b/OnTime_Driver_live/app/src/main/assets/fonts/NeoSans_Pro_Regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/assets/fonts/OpenSans-Bold.ttf b/OnTime_Driver_live/app/src/main/assets/fonts/OpenSans-Bold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/assets/fonts/OpenSans-Light.ttf b/OnTime_Driver_live/app/src/main/assets/fonts/OpenSans-Light.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/assets/fonts/OpenSans-Regular.ttf b/OnTime_Driver_live/app/src/main/assets/fonts/OpenSans-Regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/assets/fonts/ride_rewrite_bungee.ttf b/OnTime_Driver_live/app/src/main/assets/fonts/ride_rewrite_bungee.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/ic_launcher-playstore.png b/OnTime_Driver_live/app/src/main/ic_launcher-playstore.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/customfonts/AutoCompleteTextViewSFProDisplayRegular.java b/OnTime_Driver_live/app/src/main/java/customfonts/AutoCompleteTextViewSFProDisplayRegular.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/customfonts/Button_SF_Pro_Display_Medium.java b/OnTime_Driver_live/app/src/main/java/customfonts/Button_SF_Pro_Display_Medium.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/customfonts/EditTextSFProDisplayMedium.java b/OnTime_Driver_live/app/src/main/java/customfonts/EditTextSFProDisplayMedium.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/customfonts/EditTextSFProDisplayRegular.java b/OnTime_Driver_live/app/src/main/java/customfonts/EditTextSFProDisplayRegular.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/customfonts/RadioButton_SF_Pro_Display_Medium.java b/OnTime_Driver_live/app/src/main/java/customfonts/RadioButton_SF_Pro_Display_Medium.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/customfonts/TextViewSFProDisplayMedium.java b/OnTime_Driver_live/app/src/main/java/customfonts/TextViewSFProDisplayMedium.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/customfonts/TextViewSFProDisplayRegular.java b/OnTime_Driver_live/app/src/main/java/customfonts/TextViewSFProDisplayRegular.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/ChangepassActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/ChangepassActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/ChatActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/ChatActivity.java
old mode 100644
new mode 100755
index 9711ff7..9f5261f
--- a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/ChatActivity.java
+++ b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/ChatActivity.java
@@ -1359,7 +1359,9 @@ public class ChatActivity extends AppCompatActivity {
     }
 
     private void sendMessageToDriver(final String regIDTujuan, final Chat chat) {
-
+        if (regIDTujuan == null || regIDTujuan.trim().isEmpty()) {
+            return;
+        }
         final FCMMessage message = new FCMMessage();
         message.setTo(regIDTujuan);
         message.setData(chat);
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/ConfirmWAActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/ConfirmWAActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/EditKendaraanActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/EditKendaraanActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/EditProfileActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/EditProfileActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/IntroActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/IntroActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/LoginActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/LoginActivity.java
old mode 100644
new mode 100755
index a44e9c0..0ca9419
--- a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/LoginActivity.java
+++ b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/LoginActivity.java
@@ -31,8 +31,8 @@ import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.PhoneAuthCredential;
 import com.google.firebase.auth.PhoneAuthProvider;
+import com.google.firebase.messaging.FirebaseMessaging;
 
-import com.google.firebase.iid.FirebaseInstanceId;
 import id.ontime.driver.constants.BaseApp;
 import id.ontime.driver.R;
 import id.ontime.driver.constants.Constants;
@@ -478,7 +478,7 @@ public class LoginActivity extends AppCompatActivity {
 
     private void onSignInClick() {
         progressshow();
-        LoginRequestJson request = new LoginRequestJson();
+        final LoginRequestJson request = new LoginRequestJson();
         String emailText = email != null ? email.getText().toString().trim() : "";
         String phoneDigits = phoneText.getText().toString().trim();
 
@@ -490,13 +490,47 @@ public class LoginActivity extends AppCompatActivity {
             request.setNotelepon(countryCode.getText().toString().replace("+", "") + phoneDigits);
         }
         request.setPassword(password.getText().toString());
-        try {
-            FirebaseInstanceId token = FirebaseInstanceId.getInstance();
-            request.setRegId(token.getToken());
-        } catch (Exception e) {
-            request.setRegId(null);
+
+        // Enforce FCM token: login ONLY proceeds when we have a non-empty Firebase token.
+        // 1) Try to use token that was already stored in Realm (BaseApp / MessagingService.onNewToken).
+        io.realm.Realm realm = BaseApp.getInstance(this).getRealmInstance();
+        FirebaseToken storedToken = realm.where(FirebaseToken.class).findFirst();
+        if (storedToken != null && storedToken.getTokenId() != null && !storedToken.getTokenId().isEmpty()) {
+            request.setRegId(storedToken.getTokenId());
+            doLoginRequest(request, emailText);
+            return;
         }
 
+        // 2) If not yet stored, request a fresh token from FirebaseMessaging.
+        try {
+            FirebaseMessaging.getInstance().getToken()
+                    .addOnCompleteListener(task -> {
+                        if (task.isSuccessful() && task.getResult() != null && !task.getResult().isEmpty()) {
+                            String fcmToken = task.getResult();
+                            request.setRegId(fcmToken);
+
+                            // Persist so future logins can use the cached value.
+                            realm.executeTransaction(r -> {
+                                FirebaseToken t = new FirebaseToken(fcmToken);
+                                r.delete(FirebaseToken.class);
+                                r.copyToRealm(t);
+                            });
+
+                            doLoginRequest(request, emailText);
+                        } else {
+                            // Token is required: stop login and show message.
+                            progresshide();
+                            notif("Firebase token not ready, please check your network and try again.");
+                        }
+                    });
+        } catch (IllegalStateException e) {
+            // Firebase not initialized: block login instead of proceeding without token.
+            progresshide();
+            notif("Firebase is not initialized, cannot login. Please restart the app.");
+        }
+    }
+
+    private void doLoginRequest(LoginRequestJson request, String emailText) {
         String basicUser = !TextUtils.isEmpty(emailText) ? emailText : request.getNotelepon();
         DriverService service = ServiceGenerator.createService(DriverService.class, basicUser, request.getPassword());
         service.login(request).enqueue(new Callback<LoginResponseJson>() {
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/LupapassActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/LupapassActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/MainActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/MainActivity.java
old mode 100644
new mode 100755
index 0c0afa1..e6238c9
--- a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/MainActivity.java
+++ b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/MainActivity.java
@@ -372,6 +372,7 @@ public class MainActivity extends AppCompatActivity {
     public void onLocationChanged(Location location) {
         if (location != null) {
             User loginUser = BaseApp.getInstance(this).getLoginUser();
+            if (loginUser == null) return;
             DriverService service = ServiceGenerator.createService(DriverService.class, loginUser.getEmail(), loginUser.getPassword());
             UpdateLocationRequestJson param = new UpdateLocationRequestJson();
 
@@ -379,6 +380,12 @@ public class MainActivity extends AppCompatActivity {
             param.setLatitude(String.valueOf(location.getLatitude()));
             param.setLongitude(String.valueOf(location.getLongitude()));
             param.setBearing(String.valueOf(location.getBearing()));
+            // Include FCM token so backend always has latest reg_id for push notifications
+            io.realm.Realm realm = BaseApp.getInstance(this).getRealmInstance();
+            id.ontime.driver.models.FirebaseToken ft = realm.where(id.ontime.driver.models.FirebaseToken.class).findFirst();
+            if (ft != null && ft.getTokenId() != null && !ft.getTokenId().isEmpty()) {
+                param.setRegId(ft.getTokenId());
+            }
 
             service.updatelocation(param).enqueue(new Callback<ResponseJson>() {
                 @Override
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/NewOrderActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/NewOrderActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/OrderDetailActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/OrderDetailActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/PrivacyActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/PrivacyActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/RegisterActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/RegisterActivity.java
old mode 100644
new mode 100755
index d38eb24..9c8500e
--- a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/RegisterActivity.java
+++ b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/RegisterActivity.java
@@ -54,7 +54,7 @@ import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.PhoneAuthCredential;
 import com.google.firebase.auth.PhoneAuthProvider;
-import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.messaging.FirebaseMessaging;
 import id.ontime.driver.R;
 import id.ontime.driver.constants.Constants;
 import id.ontime.driver.json.JobResponseJson;
@@ -164,7 +164,12 @@ public class RegisterActivity extends AppCompatActivity {
         rlnotif2 = findViewById(R.id.rlnotif2);
         textnotif2 = findViewById(R.id.textnotif2);
         confirmButton = findViewById(R.id.buttonconfirm);
-        token = FirebaseInstanceId.getInstance().getToken();
+        // FCM v1: async token via FirebaseMessaging.getToken()
+        FirebaseMessaging.getInstance().getToken().addOnCompleteListener(task -> {
+            if (task.isSuccessful() && task.getResult() != null && !task.getResult().isEmpty()) {
+                token = task.getResult();
+            }
+        });
         numOne = findViewById(R.id.numone);
         numTwo = findViewById(R.id.numtwo);
         numThree = findViewById(R.id.numthree);
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/SplashActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/SplashActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/TopupSaldoActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/TopupSaldoActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/WalletActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/WalletActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/WithdrawActivity.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/activity/WithdrawActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/BaseApp.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/BaseApp.java
old mode 100644
new mode 100755
index 7875f85..22a71d4
--- a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/BaseApp.java
+++ b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/BaseApp.java
@@ -16,8 +16,8 @@ import com.google.android.gms.location.FusedLocationProviderClient;
 import com.google.android.gms.location.LocationRequest;
 import com.google.android.gms.location.LocationServices;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.messaging.FirebaseMessaging;
+import android.util.Log;
 import id.ontime.driver.json.UpdateLocationRequestJson;
 import id.ontime.driver.utils.MyLocationService;
 import id.ontime.driver.utils.api.ServiceGenerator;
@@ -71,22 +71,29 @@ public class BaseApp extends Application {
 //        realmInstance = Realm.getInstance(config);
         realmInstance = Realm.getDefaultInstance();
 
-        // Best-effort Firebase initialization and token registration for driver.
-        // If Firebase is not configured, ignore failures so the app can still run.
+        // FCM v1: async token fetch and topic subscribe (reference: test app).
         try {
             FirebaseApp app = FirebaseApp.initializeApp(this);
             if (app != null) {
-                String fcmToken = FirebaseInstanceId.getInstance().getToken();
-                if (fcmToken != null) {
-                    FirebaseToken token = new FirebaseToken(fcmToken);
-                    FirebaseMessaging.getInstance().subscribeToTopic("ouride");
-                    FirebaseMessaging.getInstance().subscribeToTopic("driver");
-
-                    realmInstance.beginTransaction();
-                    realmInstance.delete(FirebaseToken.class);
-                    realmInstance.copyToRealm(token);
-                    realmInstance.commitTransaction();
-                }
+                FirebaseMessaging.getInstance().getToken()
+                        .addOnCompleteListener(task -> {
+                            if (task.isSuccessful() && task.getResult() != null && !task.getResult().isEmpty()) {
+                                String fcmToken = task.getResult();
+                                Log.d("FCM_TOKEN", "BaseApp init token=" + fcmToken);
+                                FirebaseToken token = new FirebaseToken(fcmToken);
+                                FirebaseMessaging.getInstance().subscribeToTopic("ouride");
+                                FirebaseMessaging.getInstance().subscribeToTopic("driver");
+                                try {
+                                    realmInstance.beginTransaction();
+                                    realmInstance.delete(FirebaseToken.class);
+                                    realmInstance.copyToRealm(token);
+                                    realmInstance.commitTransaction();
+                                } catch (Exception e) {
+                                    if (realmInstance.isInTransaction()) realmInstance.cancelTransaction();
+                                    e.printStackTrace();
+                                }
+                            }
+                        });
             }
         } catch (IllegalStateException e) {
             e.printStackTrace();
@@ -160,6 +167,7 @@ public class BaseApp extends Application {
     public void onLocationChanged(Location location) {
         if (location != null) {
             User loginUser = getLoginUser();
+            if (loginUser == null) return;
             DriverService service = ServiceGenerator.createService(DriverService.class, loginUser.getEmail(), loginUser.getPassword());
             UpdateLocationRequestJson param = new UpdateLocationRequestJson();
 
@@ -167,6 +175,11 @@ public class BaseApp extends Application {
             param.setLatitude(String.valueOf(location.getLatitude()));
             param.setLongitude(String.valueOf(location.getLongitude()));
             param.setBearing(String.valueOf(location.getBearing()));
+            // Include FCM token so backend always has latest reg_id for push notifications
+            FirebaseToken ft = realmInstance.where(FirebaseToken.class).findFirst();
+            if (ft != null && ft.getTokenId() != null && !ft.getTokenId().isEmpty()) {
+                param.setRegId(ft.getTokenId());
+            }
 
             service.updatelocation(param).enqueue(new Callback<ResponseJson>() {
                 @Override
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/Constants.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/Constants.java
old mode 100644
new mode 100755
index 355dd64..db26b2a
--- a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/Constants.java
+++ b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/Constants.java
@@ -6,6 +6,7 @@ import java.util.Locale;
 
 public class Constants {
 
+    /** Test backend API base URL (api/, notification/send_generic, etc.). */
     private static final String BASE_URL = "https://apitest.semestaterpadu.my.id/";
     public static final String URL = "https://panic.on-time.id/"; //panicButton
     public static final String CONNECTION = BASE_URL + "api/";
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/Functions.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/Functions.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/VersionChecker.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/constants/VersionChecker.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/EnableLlocationFragment.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/EnableLlocationFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/FullImageFragment.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/FullImageFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/HistoryFragment.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/HistoryFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/HomeFragment.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/HomeFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/MessageFragment.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/MessageFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/OrderFragment.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/OrderFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/PlayAudioFragment.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/PlayAudioFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/ProfileFragment.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/fragment/ProfileFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/Direction.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/Direction.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/GMapDirection.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/GMapDirection.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Bound.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Bound.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Directions.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Directions.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Distance.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Distance.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Duration.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Duration.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Leg.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Leg.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Route.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Route.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Step.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/gmap/directions/Step.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/BankItem.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/BankItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/BanklistItem.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/BanklistItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/HistoryItem.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/HistoryItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/ItemChat.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/ItemChat.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/ItemPesananItem.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/ItemPesananItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/MessageItem.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/MessageItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/WalletItem.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/item/WalletItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/AcceptRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/AcceptRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/AcceptResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/AcceptResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/AllTransResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/AllTransResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/BankResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/BankResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/ChangePassRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/ChangePassRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/DetailRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/DetailRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/DetailTransResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/DetailTransResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/EditKendaraanRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/EditKendaraanRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/EditprofileRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/EditprofileRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/GetHomeRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/GetHomeRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/GetHomeResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/GetHomeResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/GetOnRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/GetOnRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/JobResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/JobResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/LoginRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/LoginRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/LoginResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/LoginResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/MobileTopUpDetailResponseModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/MobileTopUpDetailResponseModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/MobileTopUpRequestModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/MobileTopUpRequestModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/MobileTopUpResponseModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/MobileTopUpResponseModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/PrivacyRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/PrivacyRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/PrivacyResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/PrivacyResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/RegionResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/RegionResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/RegisterRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/RegisterRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/RegisterResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/RegisterResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/ResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/ResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/TopupRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/TopupRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/TopupResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/TopupResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/UpdateLocationRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/UpdateLocationRequestJson.java
old mode 100644
new mode 100755
index ca53b67..c71f300
--- a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/UpdateLocationRequestJson.java
+++ b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/UpdateLocationRequestJson.java
@@ -25,6 +25,10 @@ public class UpdateLocationRequestJson {
     @Expose
     private String bearing;
 
+    @SerializedName("reg_id")
+    @Expose
+    private String regId;
+
     public String getId() {
         return id;
     }
@@ -56,4 +60,12 @@ public class UpdateLocationRequestJson {
     public void setBearing(String bearing) {
         this.bearing = bearing;
     }
+
+    public String getRegId() {
+        return regId;
+    }
+
+    public void setRegId(String regId) {
+        this.regId = regId;
+    }
 }
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/VerifyRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/VerifyRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/WalletRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/WalletRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/WalletResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/WalletResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/WithdrawRequestJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/WithdrawRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/WithdrawResponseJson.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/WithdrawResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/fcm/FCMMessage.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/fcm/FCMMessage.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/fcm/FCMType.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/json/fcm/FCMType.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/AllTransaksiModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/AllTransaksiModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/BankModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/BankModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/BankModels.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/BankModels.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/Chat.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/Chat.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/ChatModels.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/ChatModels.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/FirebaseToken.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/FirebaseToken.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/ItemPesananModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/ItemPesananModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/JobModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/JobModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/MessageModels.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/MessageModels.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/Notif.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/Notif.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/OrderFCM.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/OrderFCM.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/PelangganModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/PelangganModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/RegionModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/RegionModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/SettingsModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/SettingsModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/TransaksiModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/TransaksiModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/TransaksiSendModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/TransaksiSendModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/User.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/User.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/WalletModel.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/models/WalletModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/AppIntroPagerAdapter.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/AppIntroPagerAdapter.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/BooleanSerializerDeserializer.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/BooleanSerializerDeserializer.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/Log.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/Log.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/MyLocationService.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/MyLocationService.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/NetworkUtils.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/NetworkUtils.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/PicassoTrustAll.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/PicassoTrustAll.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/ProjectUtils.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/ProjectUtils.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/SendAudio.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/SendAudio.java
old mode 100644
new mode 100755
index 34740a6..6371b26
--- a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/SendAudio.java
+++ b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/SendAudio.java
@@ -342,7 +342,9 @@ public class SendAudio {
     }
 
     private void sendMessageToDriver(final String regIDTujuan, final Chat chat) {
-
+        if (regIDTujuan == null || regIDTujuan.trim().isEmpty()) {
+            return;
+        }
         final FCMMessage message = new FCMMessage();
         message.setTo(regIDTujuan);
         message.setData(chat);
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/SettingPreference.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/SettingPreference.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/SharedPrefrence.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/SharedPrefrence.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/Utility.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/Utility.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/FCMHelper.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/FCMHelper.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/MapDirectionAPI.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/MapDirectionAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/ServiceGenerator.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/ServiceGenerator.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/service/DriverService.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/service/DriverService.java
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/service/MessagingService.java b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/service/MessagingService.java
old mode 100644
new mode 100755
index 2b16f83..dc7339b
--- a/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/service/MessagingService.java
+++ b/OnTime_Driver_live/app/src/main/java/id/ontime/driver/utils/api/service/MessagingService.java
@@ -26,6 +26,7 @@ import id.ontime.driver.constants.BaseApp;
 import id.ontime.driver.models.User;
 import id.ontime.driver.utils.SettingPreference;
 
+import java.util.Map;
 import java.util.Objects;
 
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
@@ -35,7 +36,6 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
  * Created by BBT Dev Team on 09/15/2020.
  */
 
-@SuppressLint("MissingFirebaseInstanceTokenRefresh")
 public class MessagingService extends FirebaseMessagingService {
     Intent intent;
     public static final String BROADCAST_ACTION = "id.ontime.driver";
@@ -47,7 +47,24 @@ public class MessagingService extends FirebaseMessagingService {
         super.onCreate();
         intent = new Intent(BROADCAST_ACTION);
         intentOrder = new Intent(BROADCAST_ORDER);
+    }
 
+    /** FCM v1: when token is refreshed, persist in Realm (reference: test app). */
+    @Override
+    public void onNewToken(@NonNull String token) {
+        super.onNewToken(token);
+        try {
+            android.util.Log.d("FCM_TOKEN", "MessagingService.onNewToken: " + token);
+            id.ontime.driver.models.FirebaseToken t = new id.ontime.driver.models.FirebaseToken(token);
+            io.realm.Realm realm = BaseApp.getInstance(this).getRealmInstance();
+            realm.executeTransaction(r -> {
+                r.delete(id.ontime.driver.models.FirebaseToken.class);
+                r.copyToRealm(t);
+            });
+            org.greenrobot.eventbus.EventBus.getDefault().postSticky(t);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 
@@ -55,19 +72,24 @@ public class MessagingService extends FirebaseMessagingService {
     @Override
     public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
         super.onMessageReceived(remoteMessage);
-        if (!remoteMessage.getData().isEmpty()) {
-            messageHandler(remoteMessage);
+        if (remoteMessage.getData() == null || remoteMessage.getData().isEmpty()) {
+            return;
         }
+        messageHandler(remoteMessage);
     }
 
     @RequiresApi(api = Build.VERSION_CODES.M)
     private void messageHandler(RemoteMessage remoteMessage){
+        Map<String, String> data = remoteMessage.getData();
+        if (data == null) return;
+        String type = data.get("type");
+        if (type == null) return;
         User user = BaseApp.getInstance(this).getLoginUser();
         SettingPreference sp = new SettingPreference(this);
-        if (Objects.requireNonNull(remoteMessage.getData().get("type")).equals("1")) {
+        if (type.equals("1")) {
             if (user != null) {
-                String resp = remoteMessage.getData().get("response");
-                if (resp == null ) {
+                String resp = data.get("response");
+                if (resp == null) {
                     if (sp.getSetting()[1].equals("Unlimited")) {
                         if (sp.getSetting()[2].equals("ON") && sp.getSetting()[3].equals("OFF")) {
 
@@ -78,7 +100,8 @@ public class MessagingService extends FirebaseMessagingService {
                         }
                     } else {
                         double uangbelanja = Double.parseDouble(sp.getSetting()[1]);
-                        double harga = Double.parseDouble(Objects.requireNonNull(remoteMessage.getData().get("harga")));
+                        String hargaStr = data.get("harga");
+                        double harga = (hargaStr != null && !hargaStr.isEmpty()) ? Double.parseDouble(hargaStr) : 0;
                         if (uangbelanja > harga && sp.getSetting()[2].equals("ON") && sp.getSetting()[3].equals("OFF")) {
                             notification(remoteMessage);
                         }
@@ -88,13 +111,13 @@ public class MessagingService extends FirebaseMessagingService {
                     intentCancel();
                 }
             }
-        } else if (Objects.requireNonNull(remoteMessage.getData().get("type")).equals("3")) {
+        } else if (type.equals("3")) {
             if (user != null) {
                 otherHandler(remoteMessage);
             }
-        } else if (Objects.requireNonNull(remoteMessage.getData().get("type")).equals("4")) {
-                otherHandler2(remoteMessage);
-        } else if (Objects.requireNonNull(remoteMessage.getData().get("type")).equals("2")) {
+        } else if (type.equals("4")) {
+            otherHandler2(remoteMessage);
+        } else if (type.equals("2")) {
             if (user != null) {
                 chat(remoteMessage);
             }
diff --git a/OnTime_Driver_live/app/src/main/res/anim/from_left.xml b/OnTime_Driver_live/app/src/main/res/anim/from_left.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/anim/from_right.xml b/OnTime_Driver_live/app/src/main/res/anim/from_right.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/anim/indicator_animator.xml b/OnTime_Driver_live/app/src/main/res/anim/indicator_animator.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/anim/slide_in_bottom.xml b/OnTime_Driver_live/app/src/main/res/anim/slide_in_bottom.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/anim/slide_out_bottom.xml b/OnTime_Driver_live/app/src/main/res/anim/slide_out_bottom.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/anim/to_left.xml b/OnTime_Driver_live/app/src/main/res/anim/to_left.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/anim/to_right.xml b/OnTime_Driver_live/app/src/main/res/anim/to_right.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/color/selector.xml b/OnTime_Driver_live/app/src/main/res/color/selector.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_back.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_camera.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_cancel.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_card.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_chat.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_destination.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_detailwallet.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_edit.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_editlist.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_email.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_gallery.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_gender.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_gender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_home.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_home_s.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_job.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_job.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_kalender.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_lock.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_logoutlist.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_mic.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_pesan.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_pesan_s.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_phone.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_pickup.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_price.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_price.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_privacy_policy.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_privacy_policy.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_privacylist.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_profil.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_profil_s.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_ratelist.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_send.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_sharelist.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_topup.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_transaksi.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_transaksi_s.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_user.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_vehicle.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_vehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_web.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_withdraw.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-hdpi/logo.png b/OnTime_Driver_live/app/src/main/res/drawable-hdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_back.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_camera.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_cancel.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_card.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_chat.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_destination.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_detailwallet.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_edit.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_editlist.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_email.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_gallery.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_gender.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_gender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_home.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_home_s.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_job.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_job.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_kalender.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_lock.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_logoutlist.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_mic.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_pesan.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_pesan_s.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_phone.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_pickup.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_price.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_price.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_privacy_policy.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_privacy_policy.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_privacylist.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_profil.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_profil_s.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_ratelist.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_send.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_sharelist.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_topup.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_transaksi.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_transaksi_s.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_user.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_vehicle.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_vehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_web.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_withdraw.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-mdpi/logo.png b/OnTime_Driver_live/app/src/main/res/drawable-mdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_back.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_camera.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_cancel.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_card.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_chat.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_destination.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_detailwallet.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_edit.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_editlist.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_email.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_gallery.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_gender.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_gender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_home.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_home_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_job.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_job.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_kalender.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_lock.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_logoutlist.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_mic.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_pesan.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_pesan_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_phone.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_pickup.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_price.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_price.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_privacy_policy.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_privacy_policy.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_privacylist.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_profil.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_profil_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_ratelist.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_send.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_sharelist.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_topup.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_transaksi.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_transaksi_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_user.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_vehicle.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_vehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_web.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_withdraw.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/logo.png b/OnTime_Driver_live/app/src/main/res/drawable-xhdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/atm.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/atm.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_back.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_camera.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_cancel.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_card.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_chat.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_destination.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_detailwallet.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_edit.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_editlist.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_email.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_gallery.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_gender.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_gender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_home.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_home_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_job.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_job.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_kalender.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_lock.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_logoutlist.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_mic.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_pesan.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_pesan_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_phone.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_pickup.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_price.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_price.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_privacy_policy.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_privacy_policy.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_privacylist.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_profil.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_profil_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_ratelist.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_send.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_sharelist.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_topup.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_transaksi.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_transaksi_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_user.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_vehicle.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_vehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_web.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_withdraw.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/logo.png b/OnTime_Driver_live/app/src/main/res/drawable-xxhdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_back.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_camera.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_cancel.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_card.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_chat.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_detailwallet.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_edit.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_editlist.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_email.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_gallery.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_gender.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_gender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_home.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_home_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_job.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_job.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_kalender.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_lock.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_logoutlist.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_mic.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_pesan.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_pesan_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_phone.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_price.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_price.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_privacy_policy.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_privacy_policy.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_privacylist.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_profil.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_profil_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_ratelist.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_send.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_sharelist.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_topup.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi_s.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_user.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_vehicle.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_vehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_web.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_withdraw.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/logo.png b/OnTime_Driver_live/app/src/main/res/drawable-xxxhdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/aboutshape.png b/OnTime_Driver_live/app/src/main/res/drawable/aboutshape.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/american_express.png b/OnTime_Driver_live/app/src/main/res/drawable/american_express.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/background_chat.png b/OnTime_Driver_live/app/src/main/res/drawable/background_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/background_chat_other.xml b/OnTime_Driver_live/app/src/main/res/drawable/background_chat_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/background_my_chat.xml b/OnTime_Driver_live/app/src/main/res/drawable/background_my_chat.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/backgroundabout.jpg b/OnTime_Driver_live/app/src/main/res/drawable/backgroundabout.jpg
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/backgroundabout2.png b/OnTime_Driver_live/app/src/main/res/drawable/backgroundabout2.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/backrouddrawable.xml b/OnTime_Driver_live/app/src/main/res/drawable/backrouddrawable.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/banktransfer.png b/OnTime_Driver_live/app/src/main/res/drawable/banktransfer.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/bg_border.xml b/OnTime_Driver_live/app/src/main/res/drawable/bg_border.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/btn_rect.xml b/OnTime_Driver_live/app/src/main/res/drawable/btn_rect.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/btn_rect_red.xml b/OnTime_Driver_live/app/src/main/res/drawable/btn_rect_red.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/btn_stroke.xml b/OnTime_Driver_live/app/src/main/res/drawable/btn_stroke.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/burst.png b/OnTime_Driver_live/app/src/main/res/drawable/burst.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/button_round_1.xml b/OnTime_Driver_live/app/src/main/res/drawable/button_round_1.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/button_round_2.xml b/OnTime_Driver_live/app/src/main/res/drawable/button_round_2.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/changepass.png b/OnTime_Driver_live/app/src/main/res/drawable/changepass.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/chip.png b/OnTime_Driver_live/app/src/main/res/drawable/chip.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/destination.png b/OnTime_Driver_live/app/src/main/res/drawable/destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/diners_club.png b/OnTime_Driver_live/app/src/main/res/drawable/diners_club.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/discover.png b/OnTime_Driver_live/app/src/main/res/drawable/discover.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/editvehicle.png b/OnTime_Driver_live/app/src/main/res/drawable/editvehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/fitur.png b/OnTime_Driver_live/app/src/main/res/drawable/fitur.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/ic_bank.xml b/OnTime_Driver_live/app/src/main/res/drawable/ic_bank.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/ic_content_copy_24.xml b/OnTime_Driver_live/app/src/main/res/drawable/ic_content_copy_24.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/ic_koin.xml b/OnTime_Driver_live/app/src/main/res/drawable/ic_koin.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/ic_not_send_message.png b/OnTime_Driver_live/app/src/main/res/drawable/ic_not_send_message.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/ic_pause.png b/OnTime_Driver_live/app/src/main/res/drawable/ic_pause.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/ic_play.png b/OnTime_Driver_live/app/src/main/res/drawable/ic_play.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/ic_playsound.png b/OnTime_Driver_live/app/src/main/res/drawable/ic_playsound.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/ic_star_filled.png b/OnTime_Driver_live/app/src/main/res/drawable/ic_star_filled.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/ic_star_half.png b/OnTime_Driver_live/app/src/main/res/drawable/ic_star_half.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/ic_starempty.png b/OnTime_Driver_live/app/src/main/res/drawable/ic_starempty.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/image_placeholder.png b/OnTime_Driver_live/app/src/main/res/drawable/image_placeholder.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/login.png b/OnTime_Driver_live/app/src/main/res/drawable/login.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/login_bg.png b/OnTime_Driver_live/app/src/main/res/drawable/login_bg.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/logo.png b/OnTime_Driver_live/app/src/main/res/drawable/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/logoflash.png b/OnTime_Driver_live/app/src/main/res/drawable/logoflash.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/lupapass.png b/OnTime_Driver_live/app/src/main/res/drawable/lupapass.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/map.png b/OnTime_Driver_live/app/src/main/res/drawable/map.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/midtrans.png b/OnTime_Driver_live/app/src/main/res/drawable/midtrans.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/neworder.png b/OnTime_Driver_live/app/src/main/res/drawable/neworder.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/nonselecteditem_dot.xml b/OnTime_Driver_live/app/src/main/res/drawable/nonselecteditem_dot.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/pickup.png b/OnTime_Driver_live/app/src/main/res/drawable/pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/round_edittext_background.xml b/OnTime_Driver_live/app/src/main/res/drawable/round_edittext_background.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/rounded_corners_button.xml b/OnTime_Driver_live/app/src/main/res/drawable/rounded_corners_button.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/rounded_corners_button_red.xml b/OnTime_Driver_live/app/src/main/res/drawable/rounded_corners_button_red.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/rounded_delip.xml b/OnTime_Driver_live/app/src/main/res/drawable/rounded_delip.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/selecteditem_dot.xml b/OnTime_Driver_live/app/src/main/res/drawable/selecteditem_dot.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/selector.xml b/OnTime_Driver_live/app/src/main/res/drawable/selector.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/slide_one.png b/OnTime_Driver_live/app/src/main/res/drawable/slide_one.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/slide_three.png b/OnTime_Driver_live/app/src/main/res/drawable/slide_three.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/slide_two.png b/OnTime_Driver_live/app/src/main/res/drawable/slide_two.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/underdevelopment.png b/OnTime_Driver_live/app/src/main/res/drawable/underdevelopment.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/verify.png b/OnTime_Driver_live/app/src/main/res/drawable/verify.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/withdraw.png b/OnTime_Driver_live/app/src/main/res/drawable/withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/drawable/word_map.png b/OnTime_Driver_live/app/src/main/res/drawable/word_map.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/font/montserrat_bold.ttf b/OnTime_Driver_live/app/src/main/res/font/montserrat_bold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/font/montserrat_medium.ttf b/OnTime_Driver_live/app/src/main/res/font/montserrat_medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/font/montserrat_regular.ttf b/OnTime_Driver_live/app/src/main/res/font/montserrat_regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/font/montserrat_semibold.ttf b/OnTime_Driver_live/app/src/main/res/font/montserrat_semibold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/font/neosans_pro_regular.ttf b/OnTime_Driver_live/app/src/main/res/font/neosans_pro_regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/font/neosanspro_medium.ttf b/OnTime_Driver_live/app/src/main/res/font/neosanspro_medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/font/questv_bold.otf b/OnTime_Driver_live/app/src/main/res/font/questv_bold.otf
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_changepassword.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_changepassword.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_chat.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_chat.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_confirm_wa.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_confirm_wa.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_detail_order.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_detail_order.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_editkendaraan.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_editkendaraan.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_editprofile.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_editprofile.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_intro.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_intro.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_login.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_login.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_lupapassword.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_lupapassword.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_main.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_new_order.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_new_order.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_privacy.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_privacy.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_register.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_register.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_splash.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_splash.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_topup.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_topup.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_wallet.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_wallet.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/activity_withdraw.xml b/OnTime_Driver_live/app/src/main/res/layout/activity_withdraw.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/dialog_aboutus.xml b/OnTime_Driver_live/app/src/main/res/layout/dialog_aboutus.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/dialog_bank.xml b/OnTime_Driver_live/app/src/main/res/layout/dialog_bank.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/fragment_enablelocation.xml b/OnTime_Driver_live/app/src/main/res/layout/fragment_enablelocation.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/fragment_fullimage.xml b/OnTime_Driver_live/app/src/main/res/layout/fragment_fullimage.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/fragment_home.xml b/OnTime_Driver_live/app/src/main/res/layout/fragment_home.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/fragment_playaudio.xml b/OnTime_Driver_live/app/src/main/res/layout/fragment_playaudio.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/fragment_profile.xml b/OnTime_Driver_live/app/src/main/res/layout/fragment_profile.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/fragment_recycle.xml b/OnTime_Driver_live/app/src/main/res/layout/fragment_recycle.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_bank.xml b/OnTime_Driver_live/app/src/main/res/layout/item_bank.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_chat_alert.xml b/OnTime_Driver_live/app/src/main/res/layout/item_chat_alert.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_chat_audio_other.xml b/OnTime_Driver_live/app/src/main/res/layout/item_chat_audio_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_chat_image_my.xml b/OnTime_Driver_live/app/src/main/res/layout/item_chat_image_my.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_chat_image_other.xml b/OnTime_Driver_live/app/src/main/res/layout/item_chat_image_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_chat_my.xml b/OnTime_Driver_live/app/src/main/res/layout/item_chat_my.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_chat_other.xml b/OnTime_Driver_live/app/src/main/res/layout/item_chat_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_chataudio.xml b/OnTime_Driver_live/app/src/main/res/layout/item_chataudio.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_message.xml b/OnTime_Driver_live/app/src/main/res/layout/item_message.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_order.xml b/OnTime_Driver_live/app/src/main/res/layout/item_order.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_pesanan.xml b/OnTime_Driver_live/app/src/main/res/layout/item_pesanan.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_petunjuk.xml b/OnTime_Driver_live/app/src/main/res/layout/item_petunjuk.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_slider_layout.xml b/OnTime_Driver_live/app/src/main/res/layout/item_slider_layout.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/item_wallet.xml b/OnTime_Driver_live/app/src/main/res/layout/item_wallet.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/sheet_doc_upload.xml b/OnTime_Driver_live/app/src/main/res/layout/sheet_doc_upload.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/sheet_list.xml b/OnTime_Driver_live/app/src/main/res/layout/sheet_list.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/sheet_upload.xml b/OnTime_Driver_live/app/src/main/res/layout/sheet_upload.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/shimerpromo.xml b/OnTime_Driver_live/app/src/main/res/layout/shimerpromo.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/shimerwallet.xml b/OnTime_Driver_live/app/src/main/res/layout/shimerwallet.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/spinner.xml b/OnTime_Driver_live/app/src/main/res/layout/spinner.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/layout/verifycode.xml b/OnTime_Driver_live/app/src/main/res/layout/verifycode.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/menu/navigation.xml b/OnTime_Driver_live/app/src/main/res/menu/navigation.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Driver_live/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Driver_live/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Driver_live/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Driver_live/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Driver_live/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/raw/notification.mp3 b/OnTime_Driver_live/app/src/main/res/raw/notification.mp3
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/raw/style_json.json b/OnTime_Driver_live/app/src/main/res/raw/style_json.json
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/raw/voice.mp3 b/OnTime_Driver_live/app/src/main/res/raw/voice.mp3
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/values/colors.xml b/OnTime_Driver_live/app/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/values/dimens.xml b/OnTime_Driver_live/app/src/main/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/values/ic_launcher_background.xml b/OnTime_Driver_live/app/src/main/res/values/ic_launcher_background.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/values/strings.xml b/OnTime_Driver_live/app/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/values/styles.xml b/OnTime_Driver_live/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/xml/file_paths.xml b/OnTime_Driver_live/app/src/main/res/xml/file_paths.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/app/src/main/res/xml/network_security_config.xml b/OnTime_Driver_live/app/src/main/res/xml/network_security_config.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/build.gradle b/OnTime_Driver_live/build.gradle
old mode 100644
new mode 100755
index 7b1e3d2..512079c
--- a/OnTime_Driver_live/build.gradle
+++ b/OnTime_Driver_live/build.gradle
@@ -4,7 +4,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
     dependencies {
         // Android Gradle Plugin compatible with Gradle 8.x and JDK 21
@@ -22,7 +21,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
         maven { url 'https://jitpack.io' }
     }
 }
diff --git a/OnTime_Driver_live/gradle.properties b/OnTime_Driver_live/gradle.properties
old mode 100644
new mode 100755
index 3c1d633..d420742
--- a/OnTime_Driver_live/gradle.properties
+++ b/OnTime_Driver_live/gradle.properties
@@ -11,6 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
+android.suppressUnsupportedCompileSdk=35
 org.gradle.jvmargs=-Xmx1024m \
  --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
  --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
diff --git a/OnTime_Driver_live/gradle/wrapper/gradle-wrapper.properties b/OnTime_Driver_live/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/gradlew.bat b/OnTime_Driver_live/gradlew.bat
old mode 100644
new mode 100755
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/LICENSE b/OnTime_Driver_live/lib/FragmentAnimations/LICENSE
new file mode 100755
index 0000000..e06d208
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/README.md b/OnTime_Driver_live/lib/FragmentAnimations/README.md
new file mode 100755
index 0000000..3af3459
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/README.md
@@ -0,0 +1,112 @@
+# FragmentAnimations
+
+[![Platform](https://img.shields.io/badge/platform-android-green.svg)](http://developer.android.com/index.html)
+<img src="https://img.shields.io/badge/license-Apache 2.0-green.svg?style=flat">
+[![API](https://img.shields.io/badge/API-4%2B-yellow.svg?style=flat)](https://android-arsenal.com/api?level=4)
+[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FragmentAnimations-green.svg?style=true)](https://android-arsenal.com/details/1/3526)
+
+Animation examples for `support.v4.Fragment` transition.
+
+These animations do not depends on any external libraries.
+
+[<img src="https://dply.me/h7azvd/button/large" alt="Try it on your device via DeployGate">](https://dply.me/h7azvd)
+
+## Usage Example
+
+In your `Fragment`, just code like this.
+
+```java
+@Override
+public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
+    return CubeAnimation.create(CubeAnimation.UP, enter, DURATION);
+}
+```
+
+See more example in [ExampleFragment.java](https://github.com/kakajika/FragmentAnimations/blob/master/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java)
+
+## Contents
+
+### Cube Animation
+
+[CubeAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java)
+
+![Cube](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/cube.gif)
+
+### Flip Animation
+
+[FlipAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java)
+
+![Flip](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/flip.gif)
+
+### Push/Pull Animation
+
+[PushPullAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java)
+
+![Push/Pull](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/pushpull.gif)
+
+### Sides Animation
+
+[SidesAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java)
+
+### Move Animation
+
+[MoveAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java)
+
+![Move](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/move.gif)
+
+## Combination
+
+You can use above Animations with another one.
+
+```java
+@Override
+public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
+    if (enter) {
+        return MoveAnimation.create(MoveAnimation.UP, enter, DURATION);
+    } else {
+        return CubeAnimation.create(CubeAnimation.UP, enter, DURATION);
+    }
+}
+```
+
+### Cube/Move Animation
+
+![Cube/Move](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/cubemove.gif)
+
+### Move/Cube Animation
+
+![Move/Cube](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/movecube.gif)
+
+### Push/Move Animation
+
+![Push/Move](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/pushmove.gif)
+
+### Move/Pull Animation
+
+![Move/Pull](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/movepull.gif)
+
+## Install
+
+This library is available in jcenter.
+
+```groovy
+dependencies {
+    compile 'com.labo.kaji:fragmentanimations:0.1.1'
+}
+```
+
+## License
+
+    Copyright 2015 kakajika
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/.gitignore b/OnTime_Driver_live/lib/FragmentAnimations/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/build.gradle b/OnTime_Driver_live/lib/FragmentAnimations/app/build.gradle
new file mode 100755
index 0000000..cbcb969
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'com.android.application'
+apply plugin: 'deploygate'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.1"
+
+    defaultConfig {
+        applicationId "com.labo.kaji.fragmentanimations"
+        minSdkVersion 7
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(':fragmentanimations')
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:24.1.1'
+    compile 'com.android.support:design:24.1.1'
+    compile 'com.android.support:support-v4:24.1.1'
+    compile 'com.jakewharton:butterknife:7.0.1'
+    compile 'com.deploygate:sdk:3.1'
+}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/proguard-rules.pro b/OnTime_Driver_live/lib/FragmentAnimations/app/proguard-rules.pro
new file mode 100755
index 0000000..664a4d6
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/kakajika/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java b/OnTime_Driver_live/lib/FragmentAnimations/app/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
new file mode 100755
index 0000000..bf9686e
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.labo.kaji.fragmentanimations;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..9f74823
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.labo.kaji.fragmentanimations.example"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:name=".App"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/App.java b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/App.java
new file mode 100755
index 0000000..9b0b992
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/App.java
@@ -0,0 +1,18 @@
+package com.labo.kaji.fragmentanimations.example;
+
+import android.app.Application;
+
+import com.deploygate.sdk.DeployGate;
+
+/**
+ * @author kakajika
+ * @since 2016/04/20
+ */
+public class App extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        DeployGate.install(this);
+    }
+}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java
new file mode 100755
index 0000000..e49b473
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java
@@ -0,0 +1,389 @@
+package com.labo.kaji.fragmentanimations.example;
+
+import android.annotation.SuppressLint;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.widget.TextView;
+
+import com.labo.kaji.fragmentanimations.CubeAnimation;
+import com.labo.kaji.fragmentanimations.FlipAnimation;
+import com.labo.kaji.fragmentanimations.MoveAnimation;
+import com.labo.kaji.fragmentanimations.PushPullAnimation;
+import com.labo.kaji.fragmentanimations.SidesAnimation;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * @author kakajika
+ * @since 2015/11/27
+ */
+public class ExampleFragment extends Fragment {
+
+    @IntDef({NONE, MOVE, CUBE, FLIP, PUSHPULL, SIDES, CUBEMOVE, MOVECUBE, PUSHMOVE, MOVEPULL, FLIPMOVE, MOVEFLIP, FLIPCUBE, CUBEFLIP})
+    public @interface AnimationStyle {}
+    public static final int NONE     = 0;
+    public static final int MOVE     = 1;
+    public static final int CUBE     = 2;
+    public static final int FLIP     = 3;
+    public static final int PUSHPULL = 4;
+    public static final int SIDES    = 5;
+    public static final int CUBEMOVE = 6;
+    public static final int MOVECUBE = 7;
+    public static final int PUSHMOVE = 8;
+    public static final int MOVEPULL = 9;
+    public static final int FLIPMOVE = 10;
+    public static final int MOVEFLIP = 11;
+    public static final int FLIPCUBE = 12;
+    public static final int CUBEFLIP = 13;
+
+    @IntDef({NODIR, UP, DOWN, LEFT, RIGHT})
+    public @interface AnimationDirection {}
+    public static final int NODIR = 0;
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    private static final long DURATION = 500;
+
+    @AnimationStyle
+    private static int sAnimationStyle = CUBE;
+
+    @Bind(R.id.textAnimationStyle)
+    TextView mTextAnimationStyle;
+
+    public static ExampleFragment newInstance(@AnimationDirection int direction) {
+        ExampleFragment f = new ExampleFragment();
+        f.setArguments(new Bundle());
+        f.getArguments().putInt("direction", direction);
+        return f;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.content_anim, container, false);
+        int color = Color.rgb((int) Math.floor(Math.random() * 128) + 64,
+                              (int) Math.floor(Math.random() * 128) + 64,
+                              (int) Math.floor(Math.random() * 128) + 64);
+        view.setBackgroundColor(color);
+        ButterKnife.bind(this, view);
+        setAnimationStyleText();
+        return view;
+    }
+
+    @Override
+    public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
+        switch (sAnimationStyle) {
+            case MOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return MoveAnimation.create(MoveAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case CUBE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return CubeAnimation.create(CubeAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case FLIP:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return FlipAnimation.create(FlipAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case PUSHPULL:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return PushPullAnimation.create(PushPullAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return PushPullAnimation.create(PushPullAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return PushPullAnimation.create(PushPullAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return PushPullAnimation.create(PushPullAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case SIDES:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return SidesAnimation.create(SidesAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return SidesAnimation.create(SidesAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return SidesAnimation.create(SidesAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return SidesAnimation.create(SidesAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case CUBEMOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case MOVECUBE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? CubeAnimation.create(CubeAnimation.UP, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case PUSHMOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? MoveAnimation.create(MoveAnimation.UP, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return enter ? MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return enter ? MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return enter ? MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case MOVEPULL:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.UP, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.DOWN, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.LEFT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.RIGHT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case FLIPMOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? MoveAnimation.create(MoveAnimation.UP, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return enter ? MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return enter ? MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return enter ? MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case MOVEFLIP:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? FlipAnimation.create(FlipAnimation.UP, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case FLIPCUBE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? CubeAnimation.create(CubeAnimation.UP, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return enter ? CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return enter ? CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return enter ? CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case CUBEFLIP:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? FlipAnimation.create(FlipAnimation.UP, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case NONE:
+                break;
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonUp)
+    void onButtonUp() {
+        getArguments().putInt("direction", UP);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(UP));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonDown)
+    void onButtonDown() {
+        getArguments().putInt("direction", DOWN);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(DOWN));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonLeft)
+    void onButtonLeft() {
+        getArguments().putInt("direction", LEFT);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(LEFT));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonRight)
+    void onButtonRight() {
+        getArguments().putInt("direction", RIGHT);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(RIGHT));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.textAnimationStyle)
+    public void switchAnimationStyle(View view) {
+        @AnimationStyle int[] styles;
+        styles = new int[]{MOVE, CUBE, FLIP, PUSHPULL, SIDES, CUBEMOVE, MOVECUBE, PUSHMOVE, MOVEPULL, FLIPMOVE, MOVEFLIP, FLIPCUBE, CUBEFLIP};
+        for (int i = 0; i<styles.length-1; ++i) {
+            if (styles[i] == sAnimationStyle) {
+                setAnimationStyle(styles[i+1]);
+                return;
+            }
+        }
+        setAnimationStyle(MOVE);
+    }
+
+    public void setAnimationStyle(@AnimationStyle int style) {
+        if (sAnimationStyle != style) {
+            sAnimationStyle = style;
+            setAnimationStyleText();
+            Snackbar.make(getView(), "Animation Style is Changed", Snackbar.LENGTH_SHORT).show();
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private void setAnimationStyleText() {
+        switch (sAnimationStyle) {
+            case NONE:
+                mTextAnimationStyle.setText("None");
+                break;
+            case MOVE:
+                mTextAnimationStyle.setText("Move");
+                break;
+            case CUBE:
+                mTextAnimationStyle.setText("Cube");
+                break;
+            case FLIP:
+                mTextAnimationStyle.setText("Flip");
+                break;
+            case PUSHPULL:
+                mTextAnimationStyle.setText("Push/Pull");
+                break;
+            case SIDES:
+                mTextAnimationStyle.setText("Sides");
+                break;
+            case CUBEMOVE:
+                mTextAnimationStyle.setText("Cube/Move");
+                break;
+            case MOVECUBE:
+                mTextAnimationStyle.setText("Move/Cube");
+                break;
+            case PUSHMOVE:
+                mTextAnimationStyle.setText("Push/Move");
+                break;
+            case MOVEPULL:
+                mTextAnimationStyle.setText("Move/Pull");
+                break;
+            case FLIPMOVE:
+                mTextAnimationStyle.setText("Flip/Move");
+                break;
+            case MOVEFLIP:
+                mTextAnimationStyle.setText("Move/Flip");
+                break;
+            case FLIPCUBE:
+                mTextAnimationStyle.setText("Flip/Cube");
+                break;
+            case CUBEFLIP:
+                mTextAnimationStyle.setText("Cube/Flip");
+                break;
+        }
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/MainActivity.java b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/MainActivity.java
new file mode 100755
index 0000000..a2e5ee8
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/MainActivity.java
@@ -0,0 +1,68 @@
+package com.labo.kaji.fragmentanimations.example;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import butterknife.ButterKnife;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ButterKnife.bind(this);
+
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(ExampleFragment.NODIR));
+        ft.commit();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        ExampleFragment f = (ExampleFragment)getSupportFragmentManager().findFragmentById(R.id.layout_main);
+        switch (id) {
+            case R.id.style_move:
+                f.setAnimationStyle(ExampleFragment.MOVE);
+                return true;
+            case R.id.style_cube:
+                f.setAnimationStyle(ExampleFragment.CUBE);
+                return true;
+            case R.id.style_flip:
+                f.setAnimationStyle(ExampleFragment.FLIP);
+                return true;
+            case R.id.style_pushpull:
+                f.setAnimationStyle(ExampleFragment.PUSHPULL);
+                return true;
+            case R.id.style_sides:
+                f.setAnimationStyle(ExampleFragment.SIDES);
+                return true;
+            case R.id.style_cubemove:
+                f.setAnimationStyle(ExampleFragment.CUBEMOVE);
+                return true;
+            case R.id.style_movecube:
+                f.setAnimationStyle(ExampleFragment.MOVECUBE);
+                return true;
+            case R.id.style_pushmove:
+                f.setAnimationStyle(ExampleFragment.PUSHMOVE);
+                return true;
+            case R.id.style_movepull:
+                f.setAnimationStyle(ExampleFragment.MOVEPULL);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_changestyle.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_changestyle.png
new file mode 100755
index 0000000..6807e6a
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_changestyle.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_down.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_down.png
new file mode 100755
index 0000000..0f2b97e
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_down.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_left.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_left.png
new file mode 100755
index 0000000..bf06ba6
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_left.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_right.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_right.png
new file mode 100755
index 0000000..ea1ecda
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_right.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_up.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_up.png
new file mode 100755
index 0000000..6474aa9
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_up.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_changestyle.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_changestyle.png
new file mode 100755
index 0000000..55c7711
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_changestyle.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_down.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_down.png
new file mode 100755
index 0000000..902eda7
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_down.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_left.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_left.png
new file mode 100755
index 0000000..bd2d183
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_left.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_right.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_right.png
new file mode 100755
index 0000000..2a962cf
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_right.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_up.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_up.png
new file mode 100755
index 0000000..dd1635c
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_up.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_changestyle.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_changestyle.png
new file mode 100755
index 0000000..90e017a
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_changestyle.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_down.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_down.png
new file mode 100755
index 0000000..49930b8
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_down.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_left.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_left.png
new file mode 100755
index 0000000..ee04399
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_left.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_right.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_right.png
new file mode 100755
index 0000000..b2d8d65
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_right.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_up.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_up.png
new file mode 100755
index 0000000..6c49170
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_up.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/layout/activity_main.xml b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..8132246
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".MainActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_main"/>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/layout/content_anim.xml b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/layout/content_anim.xml
new file mode 100755
index 0000000..53e29ec
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/layout/content_anim.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/textAnimationStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="8dp"
+        android:textColor="@android:color/white"
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonLeft"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left|center"
+        android:src="@drawable/ic_left"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonRight"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right|center"
+        android:src="@drawable/ic_right"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonUp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|center"
+        android:src="@drawable/ic_up"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonDown"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center"
+        android:src="@drawable/ic_down"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/layout/content_main.xml b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/layout/content_main.xml
new file mode 100755
index 0000000..e8f12a1
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/layout/content_main.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:background="#444"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".MainActivity"
+    tools:showIn="@layout/activity_main">
+
+    <FrameLayout
+        android:id="@+id/layout_main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="32dp"
+        android:layout_centerInParent="true"/>
+
+</RelativeLayout>
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/menu/menu_main.xml b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/menu/menu_main.xml
new file mode 100755
index 0000000..3df93f1
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/menu/menu_main.xml
@@ -0,0 +1,41 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".example.MainActivity">
+    <item
+        android:id="@+id/style_move"
+        android:title="Move"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_cube"
+        android:title="Cube"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_flip"
+        android:title="Flip"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_pushpull"
+        android:title="Push/Pull"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_sides"
+        android:title="Sides"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_cubemove"
+        android:title="Cube/Move"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_movecube"
+        android:title="Move/Cube"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_pushmove"
+        android:title="Push/Move"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_movepull"
+        android:title="Move/Pull"
+        app:showAsAction="never"/>
+</menu>
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..cde69bc
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..c133a0c
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..bfa42f0
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..324e72c
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..aee44e1
Binary files /dev/null and b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values-v21/styles.xml b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..251fb9f
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,9 @@
+<resources>>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values-w820dp/dimens.xml b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/colors.xml b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..3ab3e9c
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/dimens.xml b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..812cb7b
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/strings.xml b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..d1647aa
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">FragmentAnimations</string>
+    <string name="action_settings">Settings</string>
+</resources>
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/styles.xml b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..177cefc
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/main/res/values/styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
+
+</resources>
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/app/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java b/OnTime_Driver_live/lib/FragmentAnimations/app/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
new file mode 100755
index 0000000..a3f4fb7
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/app/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package com.labo.kaji.fragmentanimations;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/build.gradle b/OnTime_Driver_live/lib/FragmentAnimations/build.gradle
new file mode 100755
index 0000000..bef8f5c
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.novoda:bintray-release:0.3.4'
+        classpath 'com.deploygate:gradle:1.0.4'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/.gitignore b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/build.gradle b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/build.gradle
new file mode 100755
index 0000000..9a337d8
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'com.labo.kaji.fragmentanimations'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName "0.1.1"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.annotation:annotation:1.7.1'
+    testImplementation 'junit:junit:4.13.2'
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/proguard-rules.pro b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/proguard-rules.pro
new file mode 100755
index 0000000..664a4d6
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/kakajika/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
new file mode 100755
index 0000000..bf9686e
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.labo.kaji.fragmentanimations;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..94cbbcf
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java
new file mode 100755
index 0000000..95a0f12
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java
@@ -0,0 +1,107 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Cube Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class CubeAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull CubeAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalCubeAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalCubeAnimation(direction, enter, duration);
+        }
+    }
+
+    private CubeAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalCubeAnimation extends CubeAnimation {
+
+        private VerticalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == UP)) ? 0.0f : height;
+            mCameraZ = -height * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == DOWN) value *= -1.0f;
+            mRotationX = value * 90.0f;
+            mTranslationY = -value * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalCubeAnimation extends CubeAnimation {
+
+        private HorizontalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == LEFT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+            mCameraZ = -width * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == RIGHT) value *= -1.0f;
+            mRotationY = -value * 90.0f;
+            mTranslationX = -value * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java
new file mode 100755
index 0000000..0145dbe
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java
@@ -0,0 +1,123 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Flip Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class FlipAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull FlipAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalFlipAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalFlipAnimation(direction, enter, duration);
+        }
+    }
+
+    private FlipAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalFlipAnimation extends FlipAnimation {
+
+        public VerticalFlipAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == UP)) ? 0.0f : height;
+            mCameraZ = -height * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == DOWN) value *= -1.0f;
+            mRotationX = value * 180.0f;
+            mTranslationY = -value * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+
+            // Hide entering/exiting view before/after half point.
+            if (mEnter) {
+                mAlpha = interpolatedTime <= 0.5f ? 0.0f : 1.0f;
+            } else {
+                mAlpha = interpolatedTime <= 0.5f ? 1.0f : 0.0f;
+            }
+
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalFlipAnimation extends FlipAnimation {
+
+        public HorizontalFlipAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == LEFT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+            mCameraZ = -width * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == RIGHT) value *= -1.0f;
+            mRotationY = -value * 180.0f;
+            mTranslationX = -value * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+
+            // Hide entering/exiting view before/after half point.
+            if (mEnter) {
+                mAlpha = interpolatedTime <= 0.5f ? 0.0f : 1.0f;
+            } else {
+                mAlpha = interpolatedTime <= 0.5f ? 1.0f : 0.0f;
+            }
+
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java
new file mode 100755
index 0000000..311c67f
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java
@@ -0,0 +1,89 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Move Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class MoveAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull MoveAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalMoveAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalMoveAnimation(direction, enter, duration);
+        }
+    }
+
+    private MoveAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalMoveAnimation extends MoveAnimation {
+
+        private VerticalMoveAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == DOWN) value *= -1.0f;
+            mTranslationY = -value * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalMoveAnimation extends MoveAnimation {
+
+        private HorizontalMoveAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == RIGHT) value *= -1.0f;
+            mTranslationX = -value * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java
new file mode 100755
index 0000000..5110920
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java
@@ -0,0 +1,105 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Push/Pull Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class PushPullAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull PushPullAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalPushPullAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalPushPullAnimation(direction, enter, duration);
+        }
+    }
+
+    private PushPullAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalPushPullAnimation extends PushPullAnimation {
+
+        private VerticalPushPullAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == DOWN)) ? 0.0f : height;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == UP) value *= -1.0f;
+            mRotationX = value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalPushPullAnimation extends PushPullAnimation {
+
+        private HorizontalPushPullAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == RIGHT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == LEFT) value *= -1.0f;
+            mRotationY = -value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java
new file mode 100755
index 0000000..bacd95f
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java
@@ -0,0 +1,109 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Cube Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class SidesAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull SidesAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalCubeAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalCubeAnimation(direction, enter, duration);
+        }
+    }
+
+    private SidesAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+        setInterpolator(new AccelerateDecelerateInterpolator());
+    }
+
+    private static class VerticalCubeAnimation extends SidesAnimation {
+
+        private VerticalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == DOWN)) ? 0.0f : height;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == UP) value *= -1.0f;
+            mRotationX = value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+            mTranslationZ = (1.0f - mAlpha) * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalCubeAnimation extends SidesAnimation {
+
+        private HorizontalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == RIGHT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == LEFT) value *= -1.0f;
+            mRotationY = -value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+            mTranslationZ = (1.0f - mAlpha) * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/ViewPropertyAnimation.java b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/ViewPropertyAnimation.java
new file mode 100755
index 0000000..b999ced
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/ViewPropertyAnimation.java
@@ -0,0 +1,100 @@
+package com.labo.kaji.fragmentanimations;
+
+import android.graphics.Camera;
+import android.graphics.Matrix;
+import android.os.Build;
+import androidx.annotation.FloatRange;
+import android.view.animation.Animation;
+import android.view.animation.Transformation;
+
+/**
+ * @author kakajika
+ * @since 2015/11/27
+ */
+public class ViewPropertyAnimation extends Animation {
+
+    private final Camera mCamera = new Camera();
+    protected int mWidth  = 0;
+    protected int mHeight = 0;
+    protected float mAlpha = 1.0f;
+    protected float mPivotX = 0.0f;
+    protected float mPivotY = 0.0f;
+    protected float mScaleX = 1.0f;
+    protected float mScaleY = 1.0f;
+    protected float mRotationX = 0.0f;
+    protected float mRotationY = 0.0f;
+    protected float mRotationZ = 0.0f;
+    protected float mTranslationX = 0.0f;
+    protected float mTranslationY = 0.0f;
+    protected float mTranslationZ = 0.0f;
+    protected float mCameraX = 0.0f;
+    protected float mCameraY = 0.0f;
+    protected float mCameraZ = -8.0f;
+
+    private float mFromAlpha = -1.0f;
+    private float mToAlpha   = -1.0f;
+
+    public ViewPropertyAnimation fading(@FloatRange(from=0.0f,to=1.0f) float fromAlpha, @FloatRange(from=0.0f,to=1.0f) float toAlpha) {
+        mFromAlpha = fromAlpha;
+        mToAlpha = toAlpha;
+        return this;
+    }
+
+    @Override
+    public void initialize(int width, int height, int parentWidth, int parentHeight) {
+        super.initialize(width, height, parentWidth, parentHeight);
+        mWidth = width;
+        mHeight = height;
+    }
+
+    @Override
+    protected void applyTransformation(float interpolatedTime, Transformation t) {
+        super.applyTransformation(interpolatedTime, t);
+        if (mFromAlpha >= 0 && mToAlpha >= 0) {
+            mAlpha = mFromAlpha + (mToAlpha - mFromAlpha) * interpolatedTime;
+        }
+    }
+
+    protected void applyTransformation(Transformation t) {
+        final Matrix m = t.getMatrix();
+        final float w = mWidth;
+        final float h = mHeight;
+        final float pX = mPivotX;
+        final float pY = mPivotY;
+
+        final float rX = mRotationX;
+        final float rY = mRotationY;
+        final float rZ = mRotationZ;
+        if ((rX != 0) || (rY != 0) || (rZ != 0)) {
+            final Camera camera = mCamera;
+            camera.save();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1) {
+                camera.setLocation(mCameraX, mCameraY, mCameraZ);
+            }
+            if (mTranslationZ != 0) {
+                camera.translate(0, 0, mTranslationZ);
+            }
+            camera.rotateX(rX);
+            camera.rotateY(rY);
+            camera.rotateZ(-rZ);
+            camera.getMatrix(m);
+            camera.restore();
+            m.preTranslate(-pX, -pY);
+            m.postTranslate(pX, pY);
+        }
+
+        final float sX = mScaleX;
+        final float sY = mScaleY;
+        if ((sX != 1.0f) || (sY != 1.0f)) {
+            m.postScale(sX, sY);
+            final float sPX = -(pX / w) * ((sX * w) - w);
+            final float sPY = -(pY / h) * ((sY * h) - h);
+            m.postTranslate(sPX, sPY);
+        }
+
+        m.postTranslate(mTranslationX, mTranslationY);
+
+        t.setAlpha(mAlpha);
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
new file mode 100755
index 0000000..a3f4fb7
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/fragmentanimations/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package com.labo.kaji.fragmentanimations;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/gradle.properties b/OnTime_Driver_live/lib/FragmentAnimations/gradle.properties
new file mode 100755
index 0000000..1d3591c
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/gradle/wrapper/gradle-wrapper.properties b/OnTime_Driver_live/lib/FragmentAnimations/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..60eab91
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Apr 22 14:42:45 JST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/gradlew b/OnTime_Driver_live/lib/FragmentAnimations/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/gradlew.bat b/OnTime_Driver_live/lib/FragmentAnimations/gradlew.bat
new file mode 100755
index 0000000..aec9973
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_Driver_live/lib/FragmentAnimations/settings.gradle b/OnTime_Driver_live/lib/FragmentAnimations/settings.gradle
new file mode 100755
index 0000000..4288300
--- /dev/null
+++ b/OnTime_Driver_live/lib/FragmentAnimations/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':fragmentanimations'
diff --git a/OnTime_Driver_live/lib/PRDownloader/.gitignore b/OnTime_Driver_live/lib/PRDownloader/.gitignore
new file mode 100755
index 0000000..5bf645d
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/.gitignore
@@ -0,0 +1,10 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+/.idea
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/CONTRIBUTING.md b/OnTime_Driver_live/lib/PRDownloader/CONTRIBUTING.md
new file mode 100755
index 0000000..39e2777
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/CONTRIBUTING.md
@@ -0,0 +1,9 @@
+# Contributing
+
+1. Fork it!
+2. Checkout the development branch: `git checkout development`
+3. Create your feature branch: `git checkout -b my-new-feature`
+4. Add your changes to the index: `git add .`
+5. Commit your changes: `git commit -m 'Add some feature'`
+6. Push to the branch: `git push origin my-new-feature`
+7. Submit a pull request against the `development` branch
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/LICENSE b/OnTime_Driver_live/lib/PRDownloader/LICENSE
new file mode 100755
index 0000000..7a4a3ea
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/README.md b/OnTime_Driver_live/lib/PRDownloader/README.md
new file mode 100755
index 0000000..94c08d0
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/README.md
@@ -0,0 +1,190 @@
+<p align="center">
+<img alt="PRDownloader" src=https://raw.githubusercontent.com/amitshekhariitbhu/PRDownloader/master/assets/prdownloader.png />
+</p>
+
+# PRDownloader - A file downloader library for Android with pause and resume support
+
+## Sample Download
+<img src=https://raw.githubusercontent.com/amitshekhariitbhu/PRDownloader/master/assets/sample_download.png width=360 height=640 />
+
+### Overview of PRDownloader library
+* PRDownloader can be used to download any type of files like image, video, pdf, apk and etc.
+* This file downloader library supports pause and resume while downloading a file.
+* Supports large file download.
+* This downloader library has a simple interface to make download request.
+* We can check if the status of downloading with the given download Id.
+* PRDownloader gives callbacks for everything like onProgress, onCancel, onStart, onError and etc while downloading a file.
+* Supports proper request canceling.
+* Many requests can be made in parallel.
+* All types of customization are possible.
+
+## About me
+
+Hi, I am Amit Shekhar, Founder @ [Outcome School](https://outcomeschool.com) • IIT 2010-14 • I have taught and mentored many developers, and their efforts landed them high-paying tech jobs, helped many tech companies in solving their unique problems, and created many open-source libraries being used by top companies. I am passionate about sharing knowledge through open-source, blogs, and videos.
+
+### Follow Amit Shekhar
+
+- [X/Twitter](https://twitter.com/amitiitbhu)
+- [LinkedIn](https://www.linkedin.com/in/amit-shekhar-iitbhu)
+- [GitHub](https://github.com/amitshekhariitbhu)
+
+### Follow Outcome School
+
+- [YouTube](https://youtube.com/@OutcomeSchool)
+- [X/Twitter](https://x.com/outcome_school)
+- [LinkedIn](https://www.linkedin.com/company/outcomeschool)
+- [GitHub](http://github.com/OutcomeSchool)
+
+## I teach at Outcome School
+
+- AI and Machine Learning
+- Android
+
+Join Outcome School and get a high-paying tech job: [Outcome School](https://outcomeschool.com)
+
+## Using PRDownloader Library in your Android application
+
+Add this in your `settings.gradle`:
+```groovy
+maven { url 'https://jitpack.io' }
+```
+
+If you are using `settings.gradle.kts`, add the following:
+```kotlin
+maven { setUrl("https://jitpack.io") }
+```
+
+Add this in your `build.gradle`
+```groovy
+implementation 'com.github.amitshekhariitbhu:PRDownloader:1.0.2'
+```
+
+If you are using `build.gradle.kts`, add the following:
+```kotlin
+implementation("com.github.amitshekhariitbhu:PRDownloader:1.0.2")
+```
+
+Do not forget to add internet permission in manifest if already not present
+```xml
+<uses-permission android:name="android.permission.INTERNET" />
+```
+Then initialize it in onCreate() Method of application class :
+```java
+PRDownloader.initialize(getApplicationContext());
+```
+Initializing it with some customization
+```java
+// Enabling database for resume support even after the application is killed:
+PRDownloaderConfig config = PRDownloaderConfig.newBuilder()
+                .setDatabaseEnabled(true)
+                .build();
+PRDownloader.initialize(getApplicationContext(), config);
+
+// Setting timeout globally for the download network requests:
+PRDownloaderConfig config = PRDownloaderConfig.newBuilder()
+                .setReadTimeout(30_000)
+                .setConnectTimeout(30_000)
+                .build();
+PRDownloader.initialize(getApplicationContext(), config); 
+```
+
+### Make a download request
+```java
+int downloadId = PRDownloader.download(url, dirPath, fileName)
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                               
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                               
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                               
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                               
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                               
+                            }
+                        });            
+```
+
+### Pause a download request
+```java
+PRDownloader.pause(downloadId);
+```
+
+### Resume a download request
+```java
+PRDownloader.resume(downloadId);
+```
+
+### Cancel a download request
+```java
+// Cancel with the download id
+PRDownloader.cancel(downloadId);
+// The tag can be set to any request and then can be used to cancel the request
+PRDownloader.cancel(TAG);
+// Cancel all the requests
+PRDownloader.cancelAll();
+```
+
+### Status of a download request
+```java
+Status status = PRDownloader.getStatus(downloadId);
+```
+
+### Clean up resumed files if database enabled
+```java
+// Method to clean up temporary resumed files which is older than the given day
+PRDownloader.cleanUp(days);
+```
+### TODO
+* Integration with other libraries like OkHttp, RxJava
+* Test Cases
+* And of course many many features and bug fixes
+
+## [Outcome School Blog](https://outcomeschool.com/blog) - High-quality content to learn Android concepts.
+
+## If this library helps you in anyway, show your love :heart: by putting a :star: on this project :v:
+
+### License
+```
+   Copyright (C) 2024 Amit Shekhar
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+```
+
+### Contributing to PRDownloader
+All pull requests are welcome, make sure to follow the [contribution guidelines](CONTRIBUTING.md)
+when you submit pull request.
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/.gitignore b/OnTime_Driver_live/lib/PRDownloader/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/build.gradle b/OnTime_Driver_live/lib/PRDownloader/app/build.gradle
new file mode 100755
index 0000000..c33b492
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'com.android.application'
+
+android {
+    namespace 'com.sample'
+    defaultConfig {
+        applicationId "com.sample"
+        minSdkVersion 14
+        targetSdkVersion 35
+        compileSdk 35
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:1.0.7'
+    implementation project(':prdownloader')
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/proguard-rules.pro b/OnTime_Driver_live/lib/PRDownloader/app/proguard-rules.pro
new file mode 100755
index 0000000..f1b4245
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/androidTest/java/com/sample/ExampleInstrumentedTest.java b/OnTime_Driver_live/lib/PRDownloader/app/src/androidTest/java/com/sample/ExampleInstrumentedTest.java
new file mode 100755
index 0000000..0391c99
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/androidTest/java/com/sample/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.sample;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.sample", appContext.getPackageName());
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/PRDownloader/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..4863e94
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:name=".SampleApp"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/java/com/sample/MainActivity.java b/OnTime_Driver_live/lib/PRDownloader/app/src/main/java/com/sample/MainActivity.java
new file mode 100755
index 0000000..6320264
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/java/com/sample/MainActivity.java
@@ -0,0 +1,1461 @@
+package com.sample;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.downloader.Error;
+import com.downloader.OnCancelListener;
+import com.downloader.OnDownloadListener;
+import com.downloader.OnPauseListener;
+import com.downloader.OnProgressListener;
+import com.downloader.OnStartOrResumeListener;
+import com.downloader.PRDownloader;
+import com.downloader.Progress;
+import com.downloader.Status;
+import com.sample.utils.Utils;
+
+public class MainActivity extends AppCompatActivity {
+
+    private static String dirPath;
+
+    final String URL1 = "http://www.appsapk.com/downloading/latest/Facebook-119.0.0.23.70.apk";
+    final String URL2 = "http://www.appsapk.com/downloading/latest/WeChat-6.5.7.apk";
+    final String URL3 = "http://www.appsapk.com/downloading/latest/Instagram.apk";
+    final String URL4 = "http://www.appsapk.com/downloading/latest/Emoji%20Flashlight%20-%20Brightest%20Flashlight%202018-2.0.1.apk";
+    final String URL5 = "http://www.appsapk.com/downloading/latest/Screen%20Recorder-7.7.apk";
+    final String URL6 = "http://www.appsapk.com/downloading/latest/Call%20Recorder%20-%20Automatic%20Call%20Recorder-1.6.0.apk";
+    final String URL7 = "http://www.appsapk.com/downloading/latest/Sound%20Profile%20(+%20volume%20scheduler)-5.25.apk";
+    final String URL8 = "http://www.appsapk.com/downloading/latest/Evernote%20-%20stay%20organized.-7.9.7.apk";
+    final String URL9 = "http://www.appsapk.com/downloading/latest/UC-Browser.apk";
+    final String URL10 = "http://www.appsapk.com/downloading/latest/Barcode%20Scanner-1.2.apk";
+    final String URL11 = "http://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_640x360.m4v";
+    final String URL12 = "http://www2.sdfi.edu.cn/netclass/jiaoan/englit/download/Harry%20Potter%20and%20the%20Sorcerer's%20Stone.pdf";
+    final String URL13 = "https://media.giphy.com/media/Bk0CW5frw4qfS/giphy.gif";
+    final String URL14 = "http://techslides.com/demos/sample-videos/small.mp4";
+    final String URL15 = "http://www.sample-videos.com/video/mp4/720/big_buck_bunny_720p_10mb.mp4";
+
+    Button buttonOne, buttonTwo, buttonThree, buttonFour,
+            buttonFive, buttonSix, buttonSeven, buttonEight,
+            buttonNine, buttonTen, buttonEleven, buttonTwelve,
+            buttonThirteen, buttonFourteen, buttonFifteen,
+            buttonCancelOne, buttonCancelTwo, buttonCancelThree,
+            buttonCancelFour, buttonCancelFive, buttonCancelSix,
+            buttonCancelSeven, buttonCancelEight, buttonCancelNine,
+            buttonCancelTen, buttonCancelEleven, buttonCancelTwelve,
+            buttonCancelThirteen, buttonCancelFourteen, buttonCancelFifteen;
+
+    TextView textViewProgressOne, textViewProgressTwo, textViewProgressThree,
+            textViewProgressFour, textViewProgressFive, textViewProgressSix,
+            textViewProgressSeven, textViewProgressEight, textViewProgressNine,
+            textViewProgressTen, textViewProgressEleven, textViewProgressTwelve,
+            textViewProgressThirteen, textViewProgressFourteen, textViewProgressFifteen;
+
+    ProgressBar progressBarOne, progressBarTwo, progressBarThree,
+            progressBarFour, progressBarFive, progressBarSix,
+            progressBarSeven, progressBarEight, progressBarNine,
+            progressBarTen, progressBarEleven, progressBarTwelve,
+            progressBarThirteen, progressBarFourteen, progressBarFifteen;
+
+    int downloadIdOne, downloadIdTwo, downloadIdThree, downloadIdFour,
+            downloadIdFive, downloadIdSix, downloadIdSeven,
+            downloadIdEight, downloadIdNine, downloadIdTen,
+            downloadIdEleven, downloadIdTwelve, downloadIdThirteen,
+            downloadIdFourteen, downloadIdFifteen;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        dirPath = Utils.getRootDirPath(getApplicationContext());
+
+        init();
+
+        onClickListenerOne();
+        onClickListenerTwo();
+        onClickListenerThree();
+        onClickListenerFour();
+        onClickListenerFive();
+        onClickListenerSix();
+        onClickListenerSeven();
+        onClickListenerEight();
+        onClickListenerNine();
+        onClickListenerTen();
+        onClickListenerEleven();
+        onClickListenerTwelve();
+        onClickListenerThirteen();
+        onClickListenerFourteen();
+        onClickListenerFifteen();
+    }
+
+    private void init() {
+        buttonOne = findViewById(R.id.buttonOne);
+        buttonTwo = findViewById(R.id.buttonTwo);
+        buttonThree = findViewById(R.id.buttonThree);
+        buttonFour = findViewById(R.id.buttonFour);
+        buttonFive = findViewById(R.id.buttonFive);
+        buttonSix = findViewById(R.id.buttonSix);
+        buttonSeven = findViewById(R.id.buttonSeven);
+        buttonEight = findViewById(R.id.buttonEight);
+        buttonNine = findViewById(R.id.buttonNine);
+        buttonTen = findViewById(R.id.buttonTen);
+        buttonEleven = findViewById(R.id.buttonEleven);
+        buttonTwelve = findViewById(R.id.buttonTwelve);
+        buttonThirteen = findViewById(R.id.buttonThirteen);
+        buttonFourteen = findViewById(R.id.buttonFourteen);
+        buttonFifteen = findViewById(R.id.buttonFifteen);
+
+        buttonCancelOne = findViewById(R.id.buttonCancelOne);
+        buttonCancelTwo = findViewById(R.id.buttonCancelTwo);
+        buttonCancelThree = findViewById(R.id.buttonCancelThree);
+        buttonCancelFour = findViewById(R.id.buttonCancelFour);
+        buttonCancelFive = findViewById(R.id.buttonCancelFive);
+        buttonCancelSix = findViewById(R.id.buttonCancelSix);
+        buttonCancelSeven = findViewById(R.id.buttonCancelSeven);
+        buttonCancelEight = findViewById(R.id.buttonCancelEight);
+        buttonCancelNine = findViewById(R.id.buttonCancelNine);
+        buttonCancelTen = findViewById(R.id.buttonCancelTen);
+        buttonCancelEleven = findViewById(R.id.buttonCancelEleven);
+        buttonCancelTwelve = findViewById(R.id.buttonCancelTwelve);
+        buttonCancelThirteen = findViewById(R.id.buttonCancelThirteen);
+        buttonCancelFourteen = findViewById(R.id.buttonCancelFourteen);
+        buttonCancelFifteen = findViewById(R.id.buttonCancelFifteen);
+
+        textViewProgressOne = findViewById(R.id.textViewProgressOne);
+        textViewProgressTwo = findViewById(R.id.textViewProgressTwo);
+        textViewProgressThree = findViewById(R.id.textViewProgressThree);
+        textViewProgressFour = findViewById(R.id.textViewProgressFour);
+        textViewProgressFive = findViewById(R.id.textViewProgressFive);
+        textViewProgressSix = findViewById(R.id.textViewProgressSix);
+        textViewProgressSeven = findViewById(R.id.textViewProgressSeven);
+        textViewProgressEight = findViewById(R.id.textViewProgressEight);
+        textViewProgressNine = findViewById(R.id.textViewProgressNine);
+        textViewProgressTen = findViewById(R.id.textViewProgressTen);
+        textViewProgressEleven = findViewById(R.id.textViewProgressEleven);
+        textViewProgressTwelve = findViewById(R.id.textViewProgressTwelve);
+        textViewProgressThirteen = findViewById(R.id.textViewProgressThirteen);
+        textViewProgressFourteen = findViewById(R.id.textViewProgressFourteen);
+        textViewProgressFifteen = findViewById(R.id.textViewProgressFifteen);
+
+        progressBarOne = findViewById(R.id.progressBarOne);
+        progressBarTwo = findViewById(R.id.progressBarTwo);
+        progressBarThree = findViewById(R.id.progressBarThree);
+        progressBarFour = findViewById(R.id.progressBarFour);
+        progressBarFive = findViewById(R.id.progressBarFive);
+        progressBarSix = findViewById(R.id.progressBarSix);
+        progressBarSeven = findViewById(R.id.progressBarSeven);
+        progressBarEight = findViewById(R.id.progressBarEight);
+        progressBarNine = findViewById(R.id.progressBarNine);
+        progressBarTen = findViewById(R.id.progressBarTen);
+        progressBarEleven = findViewById(R.id.progressBarEleven);
+        progressBarTwelve = findViewById(R.id.progressBarTwelve);
+        progressBarThirteen = findViewById(R.id.progressBarThirteen);
+        progressBarFourteen = findViewById(R.id.progressBarFourteen);
+        progressBarFifteen = findViewById(R.id.progressBarFifteen);
+    }
+
+    public void onClickListenerOne() {
+        buttonOne.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdOne)) {
+                    PRDownloader.pause(downloadIdOne);
+                    return;
+                }
+
+                buttonOne.setEnabled(false);
+                progressBarOne.setIndeterminate(true);
+                progressBarOne.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdOne)) {
+                    PRDownloader.resume(downloadIdOne);
+                    return;
+                }
+
+                downloadIdOne = PRDownloader.download(URL1, dirPath, "facebook.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarOne.setIndeterminate(false);
+                                buttonOne.setEnabled(true);
+                                buttonOne.setText(R.string.pause);
+                                buttonCancelOne.setEnabled(true);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonOne.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                buttonOne.setText(R.string.start);
+                                buttonCancelOne.setEnabled(false);
+                                progressBarOne.setProgress(0);
+                                textViewProgressOne.setText("");
+                                downloadIdOne = 0;
+                                progressBarOne.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarOne.setProgress((int) progressPercent);
+                                textViewProgressOne.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                                progressBarOne.setIndeterminate(false);
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonOne.setEnabled(false);
+                                buttonCancelOne.setEnabled(false);
+                                buttonOne.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonOne.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "1", Toast.LENGTH_SHORT).show();
+                                textViewProgressOne.setText("");
+                                progressBarOne.setProgress(0);
+                                downloadIdOne = 0;
+                                buttonCancelOne.setEnabled(false);
+                                progressBarOne.setIndeterminate(false);
+                                buttonOne.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelOne.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdOne);
+            }
+        });
+    }
+
+    public void onClickListenerTwo() {
+        buttonTwo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdTwo)) {
+                    PRDownloader.pause(downloadIdTwo);
+                    return;
+                }
+
+                buttonTwo.setEnabled(false);
+                progressBarTwo.setIndeterminate(true);
+                progressBarTwo.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdTwo)) {
+                    PRDownloader.resume(downloadIdTwo);
+                    return;
+                }
+                downloadIdTwo = PRDownloader.download(URL2, dirPath, "wechat.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarTwo.setIndeterminate(false);
+                                buttonTwo.setEnabled(true);
+                                buttonTwo.setText(R.string.pause);
+                                buttonCancelTwo.setEnabled(true);
+                                buttonCancelTwo.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonTwo.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdTwo = 0;
+                                buttonTwo.setText(R.string.start);
+                                buttonCancelTwo.setEnabled(false);
+                                progressBarTwo.setProgress(0);
+                                textViewProgressTwo.setText("");
+                                progressBarTwo.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarTwo.setProgress((int) progressPercent);
+                                textViewProgressTwo.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonTwo.setEnabled(false);
+                                buttonCancelTwo.setEnabled(false);
+                                buttonTwo.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonTwo.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "2", Toast.LENGTH_SHORT).show();
+                                textViewProgressTwo.setText("");
+                                progressBarTwo.setProgress(0);
+                                downloadIdTwo = 0;
+                                buttonCancelTwo.setEnabled(false);
+                                progressBarTwo.setIndeterminate(false);
+                                buttonTwo.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelTwo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdTwo);
+            }
+        });
+    }
+
+    public void onClickListenerThree() {
+        buttonThree.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdThree)) {
+                    PRDownloader.pause(downloadIdThree);
+                    return;
+                }
+
+                buttonThree.setEnabled(false);
+                progressBarThree.setIndeterminate(true);
+                progressBarThree.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdThree)) {
+                    PRDownloader.resume(downloadIdThree);
+                    return;
+                }
+                downloadIdThree = PRDownloader.download(URL3, dirPath, "instagram.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarThree.setIndeterminate(false);
+                                buttonThree.setEnabled(true);
+                                buttonThree.setText(R.string.pause);
+                                buttonCancelThree.setEnabled(true);
+                                buttonCancelThree.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonThree.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdThree = 0;
+                                buttonThree.setText(R.string.start);
+                                buttonCancelThree.setEnabled(false);
+                                progressBarThree.setProgress(0);
+                                textViewProgressThree.setText("");
+                                progressBarThree.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarThree.setProgress((int) progressPercent);
+                                textViewProgressThree.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonThree.setEnabled(false);
+                                buttonCancelThree.setEnabled(false);
+                                buttonThree.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonThree.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "3", Toast.LENGTH_SHORT).show();
+                                textViewProgressThree.setText("");
+                                progressBarThree.setProgress(0);
+                                downloadIdThree = 0;
+                                buttonCancelThree.setEnabled(false);
+                                progressBarThree.setIndeterminate(false);
+                                buttonThree.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelThree.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdThree);
+            }
+        });
+    }
+
+    public void onClickListenerFour() {
+        buttonFour.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFour)) {
+                    PRDownloader.pause(downloadIdFour);
+                    return;
+                }
+
+                buttonFour.setEnabled(false);
+                progressBarFour.setIndeterminate(true);
+                progressBarFour.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFour)) {
+                    PRDownloader.resume(downloadIdFour);
+                    return;
+                }
+                downloadIdFour = PRDownloader.download(URL4, dirPath, "flashlight.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFour.setIndeterminate(false);
+                                buttonFour.setEnabled(true);
+                                buttonFour.setText(R.string.pause);
+                                buttonCancelFour.setEnabled(true);
+                                buttonCancelFour.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFour.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFour = 0;
+                                buttonFour.setText(R.string.start);
+                                buttonCancelFour.setEnabled(false);
+                                progressBarFour.setProgress(0);
+                                textViewProgressFour.setText("");
+                                progressBarFour.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFour.setProgress((int) progressPercent);
+                                textViewProgressFour.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFour.setEnabled(false);
+                                buttonCancelFour.setEnabled(false);
+                                buttonFour.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFour.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "4", Toast.LENGTH_SHORT).show();
+                                textViewProgressFour.setText("");
+                                progressBarFour.setProgress(0);
+                                downloadIdFour = 0;
+                                buttonCancelFour.setEnabled(false);
+                                progressBarFour.setIndeterminate(false);
+                                buttonFour.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFour.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFour);
+            }
+        });
+    }
+
+    public void onClickListenerFive() {
+        buttonFive.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFive)) {
+                    PRDownloader.pause(downloadIdFive);
+                    return;
+                }
+
+                buttonFive.setEnabled(false);
+                progressBarFive.setIndeterminate(true);
+                progressBarFive.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFive)) {
+                    PRDownloader.resume(downloadIdFive);
+                    return;
+                }
+                downloadIdFive = PRDownloader.download(URL5, dirPath, "screenrecorder.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFive.setIndeterminate(false);
+                                buttonFive.setEnabled(true);
+                                buttonFive.setText(R.string.pause);
+                                buttonCancelFive.setEnabled(true);
+                                buttonCancelFive.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFive.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFive = 0;
+                                buttonFive.setText(R.string.start);
+                                buttonCancelFive.setEnabled(false);
+                                progressBarFive.setProgress(0);
+                                textViewProgressFive.setText("");
+                                progressBarFive.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFive.setProgress((int) progressPercent);
+                                textViewProgressFive.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFive.setEnabled(false);
+                                buttonCancelFive.setEnabled(false);
+                                buttonFive.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFive.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "5", Toast.LENGTH_SHORT).show();
+                                textViewProgressFive.setText("");
+                                progressBarFive.setProgress(0);
+                                downloadIdFive = 0;
+                                buttonCancelFive.setEnabled(false);
+                                progressBarFive.setIndeterminate(false);
+                                buttonFive.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFive.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFive);
+            }
+        });
+
+    }
+
+    public void onClickListenerSix() {
+        buttonSix.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdSix)) {
+                    PRDownloader.pause(downloadIdSix);
+                    return;
+                }
+
+                buttonSix.setEnabled(false);
+                progressBarSix.setIndeterminate(true);
+                progressBarSix.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdSix)) {
+                    PRDownloader.resume(downloadIdSix);
+                    return;
+                }
+                downloadIdSix = PRDownloader.download(URL6, dirPath, "callrecorder.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarSix.setIndeterminate(false);
+                                buttonSix.setEnabled(true);
+                                buttonSix.setText(R.string.pause);
+                                buttonCancelSix.setEnabled(true);
+                                buttonCancelSix.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonSix.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdSix = 0;
+                                buttonSix.setText(R.string.start);
+                                buttonCancelSix.setEnabled(false);
+                                progressBarSix.setProgress(0);
+                                textViewProgressSix.setText("");
+                                progressBarSix.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarSix.setProgress((int) progressPercent);
+                                textViewProgressSix.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonSix.setEnabled(false);
+                                buttonCancelSix.setEnabled(false);
+                                buttonSix.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonSix.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "6", Toast.LENGTH_SHORT).show();
+                                textViewProgressSix.setText("");
+                                progressBarSix.setProgress(0);
+                                downloadIdSix = 0;
+                                buttonCancelSix.setEnabled(false);
+                                progressBarSix.setIndeterminate(false);
+                                buttonSix.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelSix.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdSix);
+            }
+        });
+
+    }
+
+    public void onClickListenerSeven() {
+        buttonSeven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdSeven)) {
+                    PRDownloader.pause(downloadIdSeven);
+                    return;
+                }
+
+                buttonSeven.setEnabled(false);
+                progressBarSeven.setIndeterminate(true);
+                progressBarSeven.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdSeven)) {
+                    PRDownloader.resume(downloadIdSeven);
+                    return;
+                }
+                downloadIdSeven = PRDownloader.download(URL7, dirPath, "soundprofile.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarSeven.setIndeterminate(false);
+                                buttonSeven.setEnabled(true);
+                                buttonSeven.setText(R.string.pause);
+                                buttonCancelSeven.setEnabled(true);
+                                buttonCancelSeven.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonSeven.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdSeven = 0;
+                                buttonSeven.setText(R.string.start);
+                                buttonCancelSeven.setEnabled(false);
+                                progressBarSeven.setProgress(0);
+                                textViewProgressSeven.setText("");
+                                progressBarSeven.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarSeven.setProgress((int) progressPercent);
+                                textViewProgressSeven.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonSeven.setEnabled(false);
+                                buttonCancelSeven.setEnabled(false);
+                                buttonSeven.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonSeven.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "7", Toast.LENGTH_SHORT).show();
+                                textViewProgressSeven.setText("");
+                                progressBarSeven.setProgress(0);
+                                downloadIdSeven = 0;
+                                buttonCancelSeven.setEnabled(false);
+                                progressBarSeven.setIndeterminate(false);
+                                buttonSeven.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelSeven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdSeven);
+            }
+        });
+
+    }
+
+    public void onClickListenerEight() {
+        buttonEight.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdEight)) {
+                    PRDownloader.pause(downloadIdEight);
+                    return;
+                }
+
+                buttonEight.setEnabled(false);
+                progressBarEight.setIndeterminate(true);
+                progressBarEight.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdEight)) {
+                    PRDownloader.resume(downloadIdEight);
+                    return;
+                }
+                downloadIdEight = PRDownloader.download(URL8, dirPath, "evernote.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarEight.setIndeterminate(false);
+                                buttonEight.setEnabled(true);
+                                buttonEight.setText(R.string.pause);
+                                buttonCancelEight.setEnabled(true);
+                                buttonCancelEight.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonEight.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdEight = 0;
+                                buttonEight.setText(R.string.start);
+                                buttonCancelEight.setEnabled(false);
+                                progressBarEight.setProgress(0);
+                                textViewProgressEight.setText("");
+                                progressBarEight.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarEight.setProgress((int) progressPercent);
+                                textViewProgressEight.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonEight.setEnabled(false);
+                                buttonCancelEight.setEnabled(false);
+                                buttonEight.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonEight.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "8", Toast.LENGTH_SHORT).show();
+                                textViewProgressEight.setText("");
+                                progressBarEight.setProgress(0);
+                                downloadIdEight = 0;
+                                buttonCancelEight.setEnabled(false);
+                                progressBarEight.setIndeterminate(false);
+                                buttonEight.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelEight.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdEight);
+            }
+        });
+    }
+
+    public void onClickListenerNine() {
+        buttonNine.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdNine)) {
+                    PRDownloader.pause(downloadIdNine);
+                    return;
+                }
+
+                buttonNine.setEnabled(false);
+                progressBarNine.setIndeterminate(true);
+                progressBarNine.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdNine)) {
+                    PRDownloader.resume(downloadIdNine);
+                    return;
+                }
+                downloadIdNine = PRDownloader.download(URL9, dirPath, "ucbrowser.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarNine.setIndeterminate(false);
+                                buttonNine.setEnabled(true);
+                                buttonNine.setText(R.string.pause);
+                                buttonCancelNine.setEnabled(true);
+                                buttonCancelNine.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonNine.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdNine = 0;
+                                buttonNine.setText(R.string.start);
+                                buttonCancelNine.setEnabled(false);
+                                progressBarNine.setProgress(0);
+                                textViewProgressNine.setText("");
+                                progressBarNine.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarNine.setProgress((int) progressPercent);
+                                textViewProgressNine.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonNine.setEnabled(false);
+                                buttonCancelNine.setEnabled(false);
+                                buttonNine.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonNine.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "9", Toast.LENGTH_SHORT).show();
+                                textViewProgressNine.setText("");
+                                progressBarNine.setProgress(0);
+                                downloadIdNine = 0;
+                                buttonCancelNine.setEnabled(false);
+                                progressBarNine.setIndeterminate(false);
+                                buttonNine.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelNine.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdNine);
+            }
+        });
+    }
+
+    public void onClickListenerTen() {
+        buttonTen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdTen)) {
+                    PRDownloader.pause(downloadIdTen);
+                    return;
+                }
+
+                buttonTen.setEnabled(false);
+                progressBarTen.setIndeterminate(true);
+                progressBarTen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdTen)) {
+                    PRDownloader.resume(downloadIdTen);
+                    return;
+                }
+                downloadIdTen = PRDownloader.download(URL10, dirPath, "barcodescanner.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarTen.setIndeterminate(false);
+                                buttonTen.setEnabled(true);
+                                buttonTen.setText(R.string.pause);
+                                buttonCancelTen.setEnabled(true);
+                                buttonCancelTen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonTen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdTen = 0;
+                                buttonTen.setText(R.string.start);
+                                buttonCancelTen.setEnabled(false);
+                                progressBarTen.setProgress(0);
+                                textViewProgressTen.setText("");
+                                progressBarTen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarTen.setProgress((int) progressPercent);
+                                textViewProgressTen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonTen.setEnabled(false);
+                                buttonCancelTen.setEnabled(false);
+                                buttonTen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonTen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "10", Toast.LENGTH_SHORT).show();
+                                textViewProgressTen.setText("");
+                                progressBarTen.setProgress(0);
+                                downloadIdTen = 0;
+                                buttonCancelTen.setEnabled(false);
+                                progressBarTen.setIndeterminate(false);
+                                buttonTen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelTen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdTen);
+            }
+        });
+    }
+
+    public void onClickListenerEleven() {
+        buttonEleven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdEleven)) {
+                    PRDownloader.pause(downloadIdEleven);
+                    return;
+                }
+
+                buttonEleven.setEnabled(false);
+                progressBarEleven.setIndeterminate(true);
+                progressBarEleven.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdEleven)) {
+                    PRDownloader.resume(downloadIdEleven);
+                    return;
+                }
+                downloadIdEleven = PRDownloader.download(URL11, dirPath, "BigBuckBunny.m4v")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarEleven.setIndeterminate(false);
+                                buttonEleven.setEnabled(true);
+                                buttonEleven.setText(R.string.pause);
+                                buttonCancelEleven.setEnabled(true);
+                                buttonCancelEleven.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonEleven.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdEleven = 0;
+                                buttonEleven.setText(R.string.start);
+                                buttonCancelEleven.setEnabled(false);
+                                progressBarEleven.setProgress(0);
+                                textViewProgressEleven.setText("");
+                                progressBarEleven.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarEleven.setProgress((int) progressPercent);
+                                textViewProgressEleven.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonEleven.setEnabled(false);
+                                buttonCancelEleven.setEnabled(false);
+                                buttonEleven.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonEleven.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "11", Toast.LENGTH_SHORT).show();
+                                textViewProgressEleven.setText("");
+                                progressBarEleven.setProgress(0);
+                                downloadIdEleven = 0;
+                                buttonCancelEleven.setEnabled(false);
+                                progressBarEleven.setIndeterminate(false);
+                                buttonEleven.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelEleven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdEleven);
+            }
+        });
+    }
+
+    public void onClickListenerTwelve() {
+        buttonTwelve.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdTwelve)) {
+                    PRDownloader.pause(downloadIdTwelve);
+                    return;
+                }
+
+                buttonTwelve.setEnabled(false);
+                progressBarTwelve.setIndeterminate(true);
+                progressBarTwelve.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdTwelve)) {
+                    PRDownloader.resume(downloadIdTwelve);
+                    return;
+                }
+                downloadIdTwelve = PRDownloader.download(URL12, dirPath, "harry-porter.pdf")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarTwelve.setIndeterminate(false);
+                                buttonTwelve.setEnabled(true);
+                                buttonTwelve.setText(R.string.pause);
+                                buttonCancelTwelve.setEnabled(true);
+                                buttonCancelTwelve.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonTwelve.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdTwelve = 0;
+                                buttonTwelve.setText(R.string.start);
+                                buttonCancelTwelve.setEnabled(false);
+                                progressBarTwelve.setProgress(0);
+                                textViewProgressTwelve.setText("");
+                                progressBarTwelve.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarTwelve.setProgress((int) progressPercent);
+                                textViewProgressTwelve.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonTwelve.setEnabled(false);
+                                buttonCancelTwelve.setEnabled(false);
+                                buttonTwelve.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonTwelve.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "12", Toast.LENGTH_SHORT).show();
+                                textViewProgressTwelve.setText("");
+                                progressBarTwelve.setProgress(0);
+                                downloadIdTwelve = 0;
+                                buttonCancelTwelve.setEnabled(false);
+                                progressBarTwelve.setIndeterminate(false);
+                                buttonTwelve.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelTwelve.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdTwelve);
+            }
+        });
+    }
+
+    public void onClickListenerThirteen() {
+        buttonThirteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdThirteen)) {
+                    PRDownloader.pause(downloadIdThirteen);
+                    return;
+                }
+
+                buttonThirteen.setEnabled(false);
+                progressBarThirteen.setIndeterminate(true);
+                progressBarThirteen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdThirteen)) {
+                    PRDownloader.resume(downloadIdThirteen);
+                    return;
+                }
+                downloadIdThirteen = PRDownloader.download(URL13, dirPath, "giphy.gif")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarThirteen.setIndeterminate(false);
+                                buttonThirteen.setEnabled(true);
+                                buttonThirteen.setText(R.string.pause);
+                                buttonCancelThirteen.setEnabled(true);
+                                buttonCancelThirteen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonThirteen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdThirteen = 0;
+                                buttonThirteen.setText(R.string.start);
+                                buttonCancelThirteen.setEnabled(false);
+                                progressBarThirteen.setProgress(0);
+                                textViewProgressThirteen.setText("");
+                                progressBarThirteen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarThirteen.setProgress((int) progressPercent);
+                                textViewProgressThirteen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonThirteen.setEnabled(false);
+                                buttonCancelThirteen.setEnabled(false);
+                                buttonThirteen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonThirteen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "13", Toast.LENGTH_SHORT).show();
+                                textViewProgressThirteen.setText("");
+                                progressBarThirteen.setProgress(0);
+                                downloadIdThirteen = 0;
+                                buttonCancelThirteen.setEnabled(false);
+                                progressBarThirteen.setIndeterminate(false);
+                                buttonThirteen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelThirteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdThirteen);
+            }
+        });
+
+    }
+
+    public void onClickListenerFourteen() {
+        buttonFourteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFourteen)) {
+                    PRDownloader.pause(downloadIdFourteen);
+                    return;
+                }
+
+                buttonFourteen.setEnabled(false);
+                progressBarFourteen.setIndeterminate(true);
+                progressBarFourteen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFourteen)) {
+                    PRDownloader.resume(downloadIdFourteen);
+                    return;
+                }
+                downloadIdFourteen = PRDownloader.download(URL14, dirPath, "small.mp4")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFourteen.setIndeterminate(false);
+                                buttonFourteen.setEnabled(true);
+                                buttonFourteen.setText(R.string.pause);
+                                buttonCancelFourteen.setEnabled(true);
+                                buttonCancelFourteen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFourteen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFourteen = 0;
+                                buttonFourteen.setText(R.string.start);
+                                buttonCancelFourteen.setEnabled(false);
+                                progressBarFourteen.setProgress(0);
+                                textViewProgressFourteen.setText("");
+                                progressBarFourteen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFourteen.setProgress((int) progressPercent);
+                                textViewProgressFourteen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFourteen.setEnabled(false);
+                                buttonCancelFourteen.setEnabled(false);
+                                buttonFourteen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFourteen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "14", Toast.LENGTH_SHORT).show();
+                                textViewProgressFourteen.setText("");
+                                progressBarFourteen.setProgress(0);
+                                downloadIdFourteen = 0;
+                                buttonCancelFourteen.setEnabled(false);
+                                progressBarFourteen.setIndeterminate(false);
+                                buttonFourteen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFourteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFourteen);
+            }
+        });
+
+    }
+
+    public void onClickListenerFifteen() {
+        buttonFifteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFifteen)) {
+                    PRDownloader.pause(downloadIdFifteen);
+                    return;
+                }
+
+                buttonFifteen.setEnabled(false);
+                progressBarFifteen.setIndeterminate(true);
+                progressBarFifteen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFifteen)) {
+                    PRDownloader.resume(downloadIdFifteen);
+                    return;
+                }
+                downloadIdFifteen = PRDownloader.download(URL15, dirPath, "big_buck_bunny_720p_10mb.mp4")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFifteen.setIndeterminate(false);
+                                buttonFifteen.setEnabled(true);
+                                buttonFifteen.setText(R.string.pause);
+                                buttonCancelFifteen.setEnabled(true);
+                                buttonCancelFifteen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFifteen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFifteen = 0;
+                                buttonFifteen.setText(R.string.start);
+                                buttonCancelFifteen.setEnabled(false);
+                                progressBarFifteen.setProgress(0);
+                                textViewProgressFifteen.setText("");
+                                progressBarFifteen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFifteen.setProgress((int) progressPercent);
+                                textViewProgressFifteen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFifteen.setEnabled(false);
+                                buttonCancelFifteen.setEnabled(false);
+                                buttonFifteen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFifteen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "15", Toast.LENGTH_SHORT).show();
+                                textViewProgressFifteen.setText("");
+                                progressBarFifteen.setProgress(0);
+                                downloadIdFifteen = 0;
+                                buttonCancelFifteen.setEnabled(false);
+                                progressBarFifteen.setIndeterminate(false);
+                                buttonFifteen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFifteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFifteen);
+            }
+        });
+    }
+
+}
+
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/java/com/sample/SampleApp.java b/OnTime_Driver_live/lib/PRDownloader/app/src/main/java/com/sample/SampleApp.java
new file mode 100755
index 0000000..986e34a
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/java/com/sample/SampleApp.java
@@ -0,0 +1,23 @@
+package com.sample;
+
+import android.app.Application;
+
+import com.downloader.PRDownloader;
+import com.downloader.PRDownloaderConfig;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class SampleApp extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        PRDownloaderConfig config = PRDownloaderConfig.newBuilder()
+                .setDatabaseEnabled(true)
+                .build();
+        PRDownloader.initialize(this, config);
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/java/com/sample/utils/Utils.java b/OnTime_Driver_live/lib/PRDownloader/app/src/main/java/com/sample/utils/Utils.java
new file mode 100755
index 0000000..0df9e2d
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/java/com/sample/utils/Utils.java
@@ -0,0 +1,38 @@
+package com.sample.utils;
+
+import android.content.Context;
+import android.os.Environment;
+import android.support.v4.content.ContextCompat;
+
+import java.io.File;
+import java.util.Locale;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public final class Utils {
+
+    private Utils() {
+        // no instance
+    }
+
+    public static String getRootDirPath(Context context) {
+        if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+            File file = ContextCompat.getExternalFilesDirs(context.getApplicationContext(),
+                    null)[0];
+            return file.getAbsolutePath();
+        } else {
+            return context.getApplicationContext().getFilesDir().getAbsolutePath();
+        }
+    }
+
+    public static String getProgressDisplayLine(long currentBytes, long totalBytes) {
+        return getBytesToMBString(currentBytes) + "/" + getBytesToMBString(totalBytes);
+    }
+
+    private static String getBytesToMBString(long bytes) {
+        return String.format(Locale.ENGLISH, "%.2fMb", bytes / (1024.00 * 1024.00));
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100755
index 0000000..c7bd21d
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/drawable/border_black.xml b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/drawable/border_black.xml
new file mode 100755
index 0000000..45c1dec
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/drawable/border_black.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp" />
+    <stroke android:width="1dp"
+        android:color="@android:color/background_dark"/>
+    <solid android:color="@android:color/transparent" />
+</shape>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/drawable/ic_launcher_background.xml b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100755
index 0000000..5c6729c
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/layout/activity_main.xml b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..ee8d470
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,765 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.sample.MainActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarOne"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarOne"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressOne"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelOne"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonOne"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarTwo"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarTwo"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressTwo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelTwo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonTwo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarThree"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarThree"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressThree"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelThree"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonThree"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFour"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFour"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFour"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFour"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFour"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFive"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFive"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFive"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFive"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFive"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarSix"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarSix"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressSix"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelSix"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonSix"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarSeven"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarSeven"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressSeven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelSeven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonSeven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarEight"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarEight"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressEight"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelEight"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonEight"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarNine"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarNine"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressNine"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelNine"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonNine"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarTen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarTen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressTen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelTen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonTen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarEleven"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarEleven"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressEleven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelEleven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonEleven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarTwelve"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarTwelve"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressTwelve"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelTwelve"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonTwelve"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarThirteen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarThirteen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressThirteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelThirteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonThirteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFourteen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFourteen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFourteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFourteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFourteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFifteen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFifteen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFifteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFifteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFifteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100755
index 0000000..eca70cf
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100755
index 0000000..eca70cf
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..a2f5908
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100755
index 0000000..1b52399
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..ff10afd
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100755
index 0000000..115a4c7
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..dcd3cd8
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100755
index 0000000..459ca60
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..8ca12fe
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100755
index 0000000..8e19b41
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..b824ebd
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100755
index 0000000..4c19a13
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/values/colors.xml b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..3ab3e9c
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/values/strings.xml b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..3e23c7c
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/values/strings.xml
@@ -0,0 +1,10 @@
+<resources>
+    <string name="app_name">PRDownloader</string>
+    <string name="some_error_occurred">Some error occurred</string>
+    <string name="start">start</string>
+    <string name="completed">completed</string>
+    <string name="pause">pause</string>
+    <string name="cancel">cancel</string>
+    <string name="resume">resume</string>
+    <string name="restart">restart</string>
+</resources>
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/values/styles.xml b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..5885930
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/OnTime_Driver_live/lib/PRDownloader/app/src/test/java/com/sample/ExampleUnitTest.java b/OnTime_Driver_live/lib/PRDownloader/app/src/test/java/com/sample/ExampleUnitTest.java
new file mode 100755
index 0000000..424a1ed
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/app/src/test/java/com/sample/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.sample;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/assets/prdownloader.png b/OnTime_Driver_live/lib/PRDownloader/assets/prdownloader.png
new file mode 100755
index 0000000..758a0e3
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/assets/prdownloader.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/assets/sample_download.png b/OnTime_Driver_live/lib/PRDownloader/assets/sample_download.png
new file mode 100755
index 0000000..23e23e2
Binary files /dev/null and b/OnTime_Driver_live/lib/PRDownloader/assets/sample_download.png differ
diff --git a/OnTime_Driver_live/lib/PRDownloader/build.gradle b/OnTime_Driver_live/lib/PRDownloader/build.gradle
new file mode 100755
index 0000000..0ad3aaf
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/build.gradle
@@ -0,0 +1,28 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+    repositories {
+        google()
+        jcenter()
+        maven { url 'https://jitpack.io' }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.7.3'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        maven { url 'https://jitpack.io' }
+    }
+}
+
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/gradle.properties b/OnTime_Driver_live/lib/PRDownloader/gradle.properties
new file mode 100755
index 0000000..e78e65c
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+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
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+android.useAndroidX=true
diff --git a/OnTime_Driver_live/lib/PRDownloader/gradle/wrapper/gradle-wrapper.properties b/OnTime_Driver_live/lib/PRDownloader/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..09523c0
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_Driver_live/lib/PRDownloader/gradlew b/OnTime_Driver_live/lib/PRDownloader/gradlew
new file mode 100755
index 0000000..f5feea6
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/gradlew
@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/OnTime_Driver_live/lib/PRDownloader/gradlew.bat b/OnTime_Driver_live/lib/PRDownloader/gradlew.bat
new file mode 100755
index 0000000..9b42019
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_Driver_live/lib/PRDownloader/jitpack.yml b/OnTime_Driver_live/lib/PRDownloader/jitpack.yml
new file mode 100755
index 0000000..1e41e00
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/.gitignore b/OnTime_Driver_live/lib/PRDownloader/prdownloader/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/build.gradle b/OnTime_Driver_live/lib/PRDownloader/prdownloader/build.gradle
new file mode 100755
index 0000000..fb30ca8
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/build.gradle
@@ -0,0 +1,28 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'com.downloader'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName "1.0.1"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/proguard-rules.pro b/OnTime_Driver_live/lib/PRDownloader/prdownloader/proguard-rules.pro
new file mode 100755
index 0000000..f1b4245
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/androidTest/java/com/downloader/ExampleInstrumentedTest.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/androidTest/java/com/downloader/ExampleInstrumentedTest.java
new file mode 100755
index 0000000..8afb62c
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/androidTest/java/com/downloader/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.downloader;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.downloader.test", appContext.getPackageName());
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Constants.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Constants.java
new file mode 100755
index 0000000..df5a59b
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Constants.java
@@ -0,0 +1,26 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public final class Constants {
+
+    private Constants() {
+        // no instance
+    }
+
+    public static final int UPDATE = 0x01;
+    public static final String RANGE = "Range";
+    public static final String ETAG = "ETag";
+    public static final String USER_AGENT = "User-Agent";
+    public static final String DEFAULT_USER_AGENT = "PRDownloader";
+
+    public static final int DEFAULT_READ_TIMEOUT_IN_MILLS = 20_000;
+    public static final int DEFAULT_CONNECT_TIMEOUT_IN_MILLS = 20_000;
+
+    public static final int HTTP_RANGE_NOT_SATISFIABLE = 416;
+    public static final int HTTP_TEMPORARY_REDIRECT = 307;
+    public static final int HTTP_PERMANENT_REDIRECT = 308;
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Error.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Error.java
new file mode 100755
index 0000000..15e20a6
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Error.java
@@ -0,0 +1,66 @@
+package com.downloader;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Error {
+
+    private boolean isServerError;
+    private boolean isConnectionError;
+    private String serverErrorMessage;
+    private Map<String, List<String>> headerFields;
+    private Throwable connectionException;
+    private int responseCode;
+
+    public boolean isServerError() {
+        return isServerError;
+    }
+
+    public void setServerError(boolean serverError) {
+        isServerError = serverError;
+    }
+
+    public boolean isConnectionError() {
+        return isConnectionError;
+    }
+
+    public void setConnectionError(boolean connectionError) {
+        isConnectionError = connectionError;
+    }
+
+    public void setServerErrorMessage(String serverErrorMessage) {
+        this.serverErrorMessage = serverErrorMessage;
+    }
+
+    public String getServerErrorMessage() {
+        return serverErrorMessage;
+    }
+
+    public void setHeaderFields(Map<String, List<String>> headerFields) {
+        this.headerFields = headerFields;
+    }
+
+    public Map<String, List<String>> getHeaderFields() {
+        return headerFields;
+    }
+
+    public void setConnectionException(Throwable connectionException) {
+        this.connectionException = connectionException;
+    }
+
+    public Throwable getConnectionException() {
+        return connectionException;
+    }
+
+    public void setResponseCode(int responseCode) {
+        this.responseCode = responseCode;
+    }
+
+    public int getResponseCode() {
+        return responseCode;
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnCancelListener.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnCancelListener.java
new file mode 100755
index 0000000..e9dd8c4
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnCancelListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 15/11/17.
+ */
+
+public interface OnCancelListener {
+
+    void onCancel();
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnDownloadListener.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnDownloadListener.java
new file mode 100755
index 0000000..c9e61de
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnDownloadListener.java
@@ -0,0 +1,13 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface OnDownloadListener {
+
+    void onDownloadComplete();
+
+    void onError(Error error);
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnPauseListener.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnPauseListener.java
new file mode 100755
index 0000000..72654fa
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnPauseListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface OnPauseListener {
+
+    void onPause();
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnProgressListener.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnProgressListener.java
new file mode 100755
index 0000000..751ceaf
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnProgressListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface OnProgressListener {
+
+    void onProgress(Progress progress);
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnStartOrResumeListener.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnStartOrResumeListener.java
new file mode 100755
index 0000000..6e07a84
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnStartOrResumeListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 15/11/17.
+ */
+
+public interface OnStartOrResumeListener {
+
+    void onStartOrResume();
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloader.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloader.java
new file mode 100755
index 0000000..8c972ad
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloader.java
@@ -0,0 +1,129 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 12/11/17.
+ */
+
+import android.content.Context;
+
+import com.downloader.core.Core;
+import com.downloader.internal.ComponentHolder;
+import com.downloader.internal.DownloadRequestQueue;
+import com.downloader.request.DownloadRequestBuilder;
+import com.downloader.utils.Utils;
+
+/**
+ * PRDownloader entry point.
+ * You must initialize this class before use. The simplest way is to just do
+ * {#code PRDownloader.initialize(context)}.
+ */
+public class PRDownloader {
+
+    /**
+     * private constructor to prevent instantiation of this class
+     */
+    private PRDownloader() {
+    }
+
+    /**
+     * Initializes PRDownloader with the default config.
+     *
+     * @param context The context
+     */
+    public static void initialize(Context context) {
+        initialize(context, PRDownloaderConfig.newBuilder().build());
+    }
+
+    /**
+     * Initializes PRDownloader with the custom config.
+     *
+     * @param context The context
+     * @param config  The PRDownloaderConfig
+     */
+    public static void initialize(Context context, PRDownloaderConfig config) {
+        ComponentHolder.getInstance().init(context, config);
+        DownloadRequestQueue.initialize();
+    }
+
+    /**
+     * Method to make download request
+     *
+     * @param url      The url on which request is to be made
+     * @param dirPath  The directory path on which file is to be saved
+     * @param fileName The file name with which file is to be saved
+     * @return the DownloadRequestBuilder
+     */
+    public static DownloadRequestBuilder download(String url, String dirPath, String fileName) {
+        return new DownloadRequestBuilder(url, dirPath, fileName);
+    }
+
+    /**
+     * Method to pause request with the given downloadId
+     *
+     * @param downloadId The downloadId with which request is to be paused
+     */
+    public static void pause(int downloadId) {
+        DownloadRequestQueue.getInstance().pause(downloadId);
+    }
+
+    /**
+     * Method to resume request with the given downloadId
+     *
+     * @param downloadId The downloadId with which request is to be resumed
+     */
+    public static void resume(int downloadId) {
+        DownloadRequestQueue.getInstance().resume(downloadId);
+    }
+
+    /**
+     * Method to cancel request with the given downloadId
+     *
+     * @param downloadId The downloadId with which request is to be cancelled
+     */
+    public static void cancel(int downloadId) {
+        DownloadRequestQueue.getInstance().cancel(downloadId);
+    }
+
+    /**
+     * Method to cancel requests with the given tag
+     *
+     * @param tag The tag with which requests are to be cancelled
+     */
+    public static void cancel(Object tag) {
+        DownloadRequestQueue.getInstance().cancel(tag);
+    }
+
+    /**
+     * Method to cancel all requests
+     */
+    public static void cancelAll() {
+        DownloadRequestQueue.getInstance().cancelAll();
+    }
+
+    /**
+     * Method to check the request with the given downloadId is running or not
+     *
+     * @param downloadId The downloadId with which request status is to be checked
+     * @return the running status
+     */
+    public static Status getStatus(int downloadId) {
+        return DownloadRequestQueue.getInstance().getStatus(downloadId);
+    }
+
+    /**
+     * Method to clean up temporary resumed files which is older than the given day
+     *
+     * @param days the days
+     */
+    public static void cleanUp(int days) {
+        Utils.deleteUnwantedModelsAndTempFiles(days);
+    }
+
+    /**
+     * Shuts PRDownloader down
+     */
+    public static void shutDown() {
+        Core.shutDown();
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloaderConfig.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloaderConfig.java
new file mode 100755
index 0000000..4a49c83
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloaderConfig.java
@@ -0,0 +1,107 @@
+package com.downloader;
+
+import com.downloader.httpclient.DefaultHttpClient;
+import com.downloader.httpclient.HttpClient;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class PRDownloaderConfig {
+
+    private int readTimeout;
+    private int connectTimeout;
+    private String userAgent;
+    private HttpClient httpClient;
+    private boolean databaseEnabled;
+
+    private PRDownloaderConfig(Builder builder) {
+        this.readTimeout = builder.readTimeout;
+        this.connectTimeout = builder.connectTimeout;
+        this.userAgent = builder.userAgent;
+        this.httpClient = builder.httpClient;
+        this.databaseEnabled = builder.databaseEnabled;
+    }
+
+    public int getReadTimeout() {
+        return readTimeout;
+    }
+
+    public void setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+    }
+
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    public void setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+    }
+
+    public String getUserAgent() {
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public HttpClient getHttpClient() {
+        return httpClient;
+    }
+
+    public void setHttpClient(HttpClient httpClient) {
+        this.httpClient = httpClient;
+    }
+
+    public boolean isDatabaseEnabled() {
+        return databaseEnabled;
+    }
+
+    public void setDatabaseEnabled(boolean databaseEnabled) {
+        this.databaseEnabled = databaseEnabled;
+    }
+
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+
+        int readTimeout = Constants.DEFAULT_READ_TIMEOUT_IN_MILLS;
+        int connectTimeout = Constants.DEFAULT_CONNECT_TIMEOUT_IN_MILLS;
+        String userAgent = Constants.DEFAULT_USER_AGENT;
+        HttpClient httpClient = new DefaultHttpClient();
+        boolean databaseEnabled = false;
+
+        public Builder setReadTimeout(int readTimeout) {
+            this.readTimeout = readTimeout;
+            return this;
+        }
+
+        public Builder setConnectTimeout(int connectTimeout) {
+            this.connectTimeout = connectTimeout;
+            return this;
+        }
+
+        public Builder setUserAgent(String userAgent) {
+            this.userAgent = userAgent;
+            return this;
+        }
+
+        public Builder setHttpClient(HttpClient httpClient) {
+            this.httpClient = httpClient;
+            return this;
+        }
+
+        public Builder setDatabaseEnabled(boolean databaseEnabled) {
+            this.databaseEnabled = databaseEnabled;
+            return this;
+        }
+
+        public PRDownloaderConfig build() {
+            return new PRDownloaderConfig(this);
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Priority.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Priority.java
new file mode 100755
index 0000000..f9f46e2
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Priority.java
@@ -0,0 +1,32 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+/**
+ * Priority levels recognized by the request server.
+ */
+public enum Priority {
+
+    /**
+     * Lowest priority level. Used for prefetches of data.
+     */
+    LOW,
+
+    /**
+     * Medium priority level. Used for warming of data that might soon get visible.
+     */
+    MEDIUM,
+
+    /**
+     * Highest priority level. Used for data that are currently visible on screen.
+     */
+    HIGH,
+
+    /**
+     * Highest priority level. Used for data that are required instantly(mainly for emergency).
+     */
+    IMMEDIATE
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Progress.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Progress.java
new file mode 100755
index 0000000..b06db5a
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Progress.java
@@ -0,0 +1,26 @@
+package com.downloader;
+
+import java.io.Serializable;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Progress implements Serializable {
+
+    public long currentBytes;
+    public long totalBytes;
+
+    public Progress(long currentBytes, long totalBytes) {
+        this.currentBytes = currentBytes;
+        this.totalBytes = totalBytes;
+    }
+
+    @Override
+    public String toString() {
+        return "Progress{" +
+                "currentBytes=" + currentBytes +
+                ", totalBytes=" + totalBytes +
+                '}';
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Response.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Response.java
new file mode 100755
index 0000000..fd0f076
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Response.java
@@ -0,0 +1,46 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Response {
+
+    private Error error;
+    private boolean isSuccessful;
+    private boolean isPaused;
+    private boolean isCancelled;
+
+    public Error getError() {
+        return error;
+    }
+
+    public void setError(Error error) {
+        this.error = error;
+    }
+
+    public boolean isSuccessful() {
+        return isSuccessful;
+    }
+
+    public void setSuccessful(boolean successful) {
+        isSuccessful = successful;
+    }
+
+    public boolean isPaused() {
+        return isPaused;
+    }
+
+    public void setPaused(boolean paused) {
+        isPaused = paused;
+    }
+
+    public boolean isCancelled() {
+        return isCancelled;
+    }
+
+    public void setCancelled(boolean cancelled) {
+        isCancelled = cancelled;
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Status.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Status.java
new file mode 100755
index 0000000..cc6575c
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Status.java
@@ -0,0 +1,23 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 15/11/17.
+ */
+
+public enum Status {
+
+    QUEUED,
+
+    RUNNING,
+
+    PAUSED,
+
+    COMPLETED,
+
+    CANCELLED,
+
+    FAILED,
+
+    UNKNOWN
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/Core.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/Core.java
new file mode 100755
index 0000000..1d6e049
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/Core.java
@@ -0,0 +1,36 @@
+package com.downloader.core;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Core {
+
+    private static Core instance = null;
+    private final ExecutorSupplier executorSupplier;
+
+    private Core() {
+        this.executorSupplier = new DefaultExecutorSupplier();
+    }
+
+    public static Core getInstance() {
+        if (instance == null) {
+            synchronized (Core.class) {
+                if (instance == null) {
+                    instance = new Core();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public ExecutorSupplier getExecutorSupplier() {
+        return executorSupplier;
+    }
+
+    public static void shutDown() {
+        if (instance != null) {
+            instance = null;
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DefaultExecutorSupplier.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DefaultExecutorSupplier.java
new file mode 100755
index 0000000..4a8a26e
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DefaultExecutorSupplier.java
@@ -0,0 +1,41 @@
+package com.downloader.core;
+
+import android.os.Process;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DefaultExecutorSupplier implements ExecutorSupplier {
+
+    private static final int DEFAULT_MAX_NUM_THREADS = 2 * Runtime.getRuntime().availableProcessors() + 1;
+    private final DownloadExecutor networkExecutor;
+    private final Executor backgroundExecutor;
+    private final Executor mainThreadExecutor;
+
+    DefaultExecutorSupplier() {
+        ThreadFactory backgroundPriorityThreadFactory = new PriorityThreadFactory(Process.THREAD_PRIORITY_BACKGROUND);
+        networkExecutor = new DownloadExecutor(DEFAULT_MAX_NUM_THREADS, backgroundPriorityThreadFactory);
+        backgroundExecutor = Executors.newSingleThreadExecutor();
+        mainThreadExecutor = new MainThreadExecutor();
+    }
+
+    @Override
+    public DownloadExecutor forDownloadTasks() {
+        return networkExecutor;
+    }
+
+    @Override
+    public Executor forBackgroundTasks() {
+        return backgroundExecutor;
+    }
+
+    @Override
+    public Executor forMainThreadTasks() {
+        return mainThreadExecutor;
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadExecutor.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadExecutor.java
new file mode 100755
index 0000000..fa659b8
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadExecutor.java
@@ -0,0 +1,27 @@
+package com.downloader.core;
+
+import com.downloader.internal.DownloadRunnable;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadExecutor extends ThreadPoolExecutor {
+
+    DownloadExecutor(int maxNumThreads, ThreadFactory threadFactory) {
+        super(maxNumThreads, maxNumThreads, 0, TimeUnit.MILLISECONDS, new PriorityBlockingQueue<Runnable>(), threadFactory);
+    }
+
+    @Override
+    public Future<?> submit(Runnable task) {
+        DownloadFutureTask futureTask = new DownloadFutureTask((DownloadRunnable) task);
+        execute(futureTask);
+        return futureTask;
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadFutureTask.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadFutureTask.java
new file mode 100755
index 0000000..d2f4b06
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadFutureTask.java
@@ -0,0 +1,27 @@
+package com.downloader.core;
+
+import com.downloader.Priority;
+import com.downloader.internal.DownloadRunnable;
+
+import java.util.concurrent.FutureTask;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadFutureTask extends FutureTask<DownloadRunnable> implements Comparable<DownloadFutureTask> {
+
+    private final DownloadRunnable runnable;
+
+    DownloadFutureTask(DownloadRunnable downloadRunnable) {
+        super(downloadRunnable, null);
+        this.runnable = downloadRunnable;
+    }
+
+    @Override
+    public int compareTo(DownloadFutureTask other) {
+        Priority p1 = runnable.priority;
+        Priority p2 = other.runnable.priority;
+        return (p1 == p2 ? runnable.sequence - other.runnable.sequence : p2.ordinal() - p1.ordinal());
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/ExecutorSupplier.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/ExecutorSupplier.java
new file mode 100755
index 0000000..34f75ac
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/ExecutorSupplier.java
@@ -0,0 +1,17 @@
+package com.downloader.core;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface ExecutorSupplier {
+
+    DownloadExecutor forDownloadTasks();
+
+    Executor forBackgroundTasks();
+
+    Executor forMainThreadTasks();
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/MainThreadExecutor.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/MainThreadExecutor.java
new file mode 100755
index 0000000..af6df63
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/MainThreadExecutor.java
@@ -0,0 +1,20 @@
+package com.downloader.core;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class MainThreadExecutor implements Executor {
+
+    private final Handler handler = new Handler(Looper.getMainLooper());
+
+    @Override
+    public void execute(Runnable runnable) {
+        handler.post(runnable);
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/PriorityThreadFactory.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/PriorityThreadFactory.java
new file mode 100755
index 0000000..a305ebc
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/PriorityThreadFactory.java
@@ -0,0 +1,34 @@
+package com.downloader.core;
+
+import android.os.Process;
+
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class PriorityThreadFactory implements ThreadFactory {
+
+    private final int mThreadPriority;
+
+    PriorityThreadFactory(int threadPriority) {
+        mThreadPriority = threadPriority;
+    }
+
+    @Override
+    public Thread newThread(final Runnable runnable) {
+        Runnable wrapperRunnable = new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Process.setThreadPriority(mThreadPriority);
+                } catch (Throwable ignored) {
+
+                }
+                runnable.run();
+            }
+        };
+        return new Thread(wrapperRunnable);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/AppDbHelper.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/AppDbHelper.java
new file mode 100755
index 0000000..9955e70
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/AppDbHelper.java
@@ -0,0 +1,154 @@
+package com.downloader.database;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class AppDbHelper implements DbHelper {
+
+    public static final String TABLE_NAME = "prdownloader";
+    private final SQLiteDatabase db;
+
+    public AppDbHelper(Context context) {
+        DatabaseOpenHelper databaseOpenHelper = new DatabaseOpenHelper(context);
+        db = databaseOpenHelper.getWritableDatabase();
+    }
+
+    @Override
+    public DownloadModel find(int id) {
+        Cursor cursor = null;
+        DownloadModel model = null;
+        try {
+            cursor = db.rawQuery("SELECT * FROM " + TABLE_NAME + " WHERE " +
+                    DownloadModel.ID + " = " + id, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                model = new DownloadModel();
+                model.setId(id);
+                model.setUrl(cursor.getString(cursor.getColumnIndex(DownloadModel.URL)));
+                model.setETag(cursor.getString(cursor.getColumnIndex(DownloadModel.ETAG)));
+                model.setDirPath(cursor.getString(cursor.getColumnIndex(DownloadModel.DIR_PATH)));
+                model.setFileName(cursor.getString(cursor.getColumnIndex(DownloadModel.FILE_NAME)));
+                model.setTotalBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.TOTAL_BYTES)));
+                model.setDownloadedBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.DOWNLOADED_BYTES)));
+                model.setLastModifiedAt(cursor.getLong(cursor.getColumnIndex(DownloadModel.LAST_MODIFIED_AT)));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        return model;
+    }
+
+    @Override
+    public void insert(DownloadModel model) {
+        try {
+            ContentValues values = new ContentValues();
+            values.put(DownloadModel.ID, model.getId());
+            values.put(DownloadModel.URL, model.getUrl());
+            values.put(DownloadModel.ETAG, model.getETag());
+            values.put(DownloadModel.DIR_PATH, model.getDirPath());
+            values.put(DownloadModel.FILE_NAME, model.getFileName());
+            values.put(DownloadModel.TOTAL_BYTES, model.getTotalBytes());
+            values.put(DownloadModel.DOWNLOADED_BYTES, model.getDownloadedBytes());
+            values.put(DownloadModel.LAST_MODIFIED_AT, model.getLastModifiedAt());
+            db.insert(TABLE_NAME, null, values);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void update(DownloadModel model) {
+        try {
+            ContentValues values = new ContentValues();
+            values.put(DownloadModel.URL, model.getUrl());
+            values.put(DownloadModel.ETAG, model.getETag());
+            values.put(DownloadModel.DIR_PATH, model.getDirPath());
+            values.put(DownloadModel.FILE_NAME, model.getFileName());
+            values.put(DownloadModel.TOTAL_BYTES, model.getTotalBytes());
+            values.put(DownloadModel.DOWNLOADED_BYTES, model.getDownloadedBytes());
+            values.put(DownloadModel.LAST_MODIFIED_AT, model.getLastModifiedAt());
+            db.update(TABLE_NAME, values, DownloadModel.ID + " = ? ",
+                    new String[]{String.valueOf(model.getId())});
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void updateProgress(int id, long downloadedBytes, long lastModifiedAt) {
+        try {
+            ContentValues values = new ContentValues();
+            values.put(DownloadModel.DOWNLOADED_BYTES, downloadedBytes);
+            values.put(DownloadModel.LAST_MODIFIED_AT, lastModifiedAt);
+            db.update(TABLE_NAME, values, DownloadModel.ID + " = ? ",
+                    new String[]{String.valueOf(id)});
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void remove(int id) {
+        try {
+            db.execSQL("DELETE FROM " + TABLE_NAME + " WHERE " +
+                    DownloadModel.ID + " = " + id);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public List<DownloadModel> getUnwantedModels(int days) {
+        List<DownloadModel> models = new ArrayList<>();
+        Cursor cursor = null;
+        try {
+            final long daysInMillis = days * 24 * 60 * 60 * 1000L;
+            final long beforeTimeInMillis = System.currentTimeMillis() - daysInMillis;
+            cursor = db.rawQuery("SELECT * FROM " + TABLE_NAME + " WHERE " +
+                    DownloadModel.LAST_MODIFIED_AT + " <= " + beforeTimeInMillis, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                do {
+                    DownloadModel model = new DownloadModel();
+                    model.setId(cursor.getInt(cursor.getColumnIndex(DownloadModel.ID)));
+                    model.setUrl(cursor.getString(cursor.getColumnIndex(DownloadModel.URL)));
+                    model.setETag(cursor.getString(cursor.getColumnIndex(DownloadModel.ETAG)));
+                    model.setDirPath(cursor.getString(cursor.getColumnIndex(DownloadModel.DIR_PATH)));
+                    model.setFileName(cursor.getString(cursor.getColumnIndex(DownloadModel.FILE_NAME)));
+                    model.setTotalBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.TOTAL_BYTES)));
+                    model.setDownloadedBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.DOWNLOADED_BYTES)));
+                    model.setLastModifiedAt(cursor.getLong(cursor.getColumnIndex(DownloadModel.LAST_MODIFIED_AT)));
+
+                    models.add(model);
+                } while (cursor.moveToNext());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        return models;
+    }
+
+    @Override
+    public void clear() {
+        try {
+            db.delete(TABLE_NAME, null, null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DatabaseOpenHelper.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DatabaseOpenHelper.java
new file mode 100755
index 0000000..5d44943
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DatabaseOpenHelper.java
@@ -0,0 +1,40 @@
+package com.downloader.database;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class DatabaseOpenHelper extends SQLiteOpenHelper {
+
+    private static final String DATABASE_NAME = "prdownloader.db";
+    private static final int DATABASE_VERSION = 1;
+
+    DatabaseOpenHelper(Context context) {
+        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL("CREATE TABLE IF NOT EXISTS " +
+                AppDbHelper.TABLE_NAME + "( " +
+                DownloadModel.ID + " INTEGER PRIMARY KEY, " +
+                DownloadModel.URL + " VARCHAR, " +
+                DownloadModel.ETAG + " VARCHAR, " +
+                DownloadModel.DIR_PATH + " VARCHAR, " +
+                DownloadModel.FILE_NAME + " VARCHAR, " +
+                DownloadModel.TOTAL_BYTES + " INTEGER, " +
+                DownloadModel.DOWNLOADED_BYTES + " INTEGER, " +
+                DownloadModel.LAST_MODIFIED_AT + " INTEGER " +
+                ")");
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int i, int i1) {
+
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DbHelper.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DbHelper.java
new file mode 100755
index 0000000..2b69d26
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DbHelper.java
@@ -0,0 +1,25 @@
+package com.downloader.database;
+
+import java.util.List;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public interface DbHelper {
+
+    DownloadModel find(int id);
+
+    void insert(DownloadModel model);
+
+    void update(DownloadModel model);
+
+    void updateProgress(int id, long downloadedBytes, long lastModifiedAt);
+
+    void remove(int id);
+
+    List<DownloadModel> getUnwantedModels(int days);
+
+    void clear();
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DownloadModel.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DownloadModel.java
new file mode 100755
index 0000000..ccffab0
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DownloadModel.java
@@ -0,0 +1,91 @@
+package com.downloader.database;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class DownloadModel {
+
+    static final String ID = "id";
+    static final String URL = "url";
+    static final String ETAG = "etag";
+    static final String DIR_PATH = "dir_path";
+    static final String FILE_NAME = "file_name";
+    static final String TOTAL_BYTES = "total_bytes";
+    static final String DOWNLOADED_BYTES = "downloaded_bytes";
+    static final String LAST_MODIFIED_AT = "last_modified_at";
+
+    private int id;
+    private String url;
+    private String eTag;
+    private String dirPath;
+    private String fileName;
+    private long totalBytes;
+    private long downloadedBytes;
+    private long lastModifiedAt;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getETag() {
+        return eTag;
+    }
+
+    public void setETag(String eTag) {
+        this.eTag = eTag;
+    }
+
+    public String getDirPath() {
+        return dirPath;
+    }
+
+    public void setDirPath(String dirPath) {
+        this.dirPath = dirPath;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public long getTotalBytes() {
+        return totalBytes;
+    }
+
+    public void setTotalBytes(long totalBytes) {
+        this.totalBytes = totalBytes;
+    }
+
+    public long getDownloadedBytes() {
+        return downloadedBytes;
+    }
+
+    public void setDownloadedBytes(long downloadedBytes) {
+        this.downloadedBytes = downloadedBytes;
+    }
+
+    public long getLastModifiedAt() {
+        return lastModifiedAt;
+    }
+
+    public void setLastModifiedAt(long lastModifiedAt) {
+        this.lastModifiedAt = lastModifiedAt;
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/NoOpsDbHelper.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/NoOpsDbHelper.java
new file mode 100755
index 0000000..23150a8
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/NoOpsDbHelper.java
@@ -0,0 +1,49 @@
+package com.downloader.database;
+
+import java.util.List;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class NoOpsDbHelper implements DbHelper {
+
+    public NoOpsDbHelper() {
+
+    }
+
+    @Override
+    public DownloadModel find(int id) {
+        return null;
+    }
+
+    @Override
+    public void insert(DownloadModel model) {
+
+    }
+
+    @Override
+    public void update(DownloadModel model) {
+
+    }
+
+    @Override
+    public void updateProgress(int id, long downloadedBytes, long lastModifiedAt) {
+
+    }
+
+    @Override
+    public void remove(int id) {
+
+    }
+
+    @Override
+    public List<DownloadModel> getUnwantedModels(int days) {
+        return null;
+    }
+
+    @Override
+    public void clear() {
+
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/handler/ProgressHandler.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/handler/ProgressHandler.java
new file mode 100755
index 0000000..dceab0f
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/handler/ProgressHandler.java
@@ -0,0 +1,38 @@
+package com.downloader.handler;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+import com.downloader.Constants;
+import com.downloader.Progress;
+import com.downloader.OnProgressListener;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class ProgressHandler extends Handler {
+
+    private final OnProgressListener listener;
+
+    public ProgressHandler(OnProgressListener listener) {
+        super(Looper.getMainLooper());
+        this.listener = listener;
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+        switch (msg.what) {
+            case Constants.UPDATE:
+                if (listener != null) {
+                    final Progress progress = (Progress) msg.obj;
+                    listener.onProgress(progress);
+                }
+                break;
+            default:
+                super.handleMessage(msg);
+                break;
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/DefaultHttpClient.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/DefaultHttpClient.java
new file mode 100755
index 0000000..22bbd9a
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/DefaultHttpClient.java
@@ -0,0 +1,111 @@
+package com.downloader.httpclient;
+
+import com.downloader.Constants;
+import com.downloader.request.DownloadRequest;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DefaultHttpClient implements HttpClient {
+
+    private URLConnection connection;
+
+    public DefaultHttpClient() {
+
+    }
+
+    @SuppressWarnings("CloneDoesntCallSuperClone")
+    @Override
+    public HttpClient clone() {
+        return new DefaultHttpClient();
+    }
+
+    @Override
+    public void connect(DownloadRequest request) throws IOException {
+        connection = new URL(request.getUrl()).openConnection();
+        connection.setReadTimeout(request.getReadTimeout());
+        connection.setConnectTimeout(request.getConnectTimeout());
+        final String range = String.format(Locale.ENGLISH,
+                "bytes=%d-", request.getDownloadedBytes());
+        connection.addRequestProperty(Constants.RANGE, range);
+        connection.addRequestProperty(Constants.USER_AGENT, request.getUserAgent());
+        addHeaders(request);
+        connection.connect();
+    }
+
+    @Override
+    public int getResponseCode() throws IOException {
+        int responseCode = 0;
+        if (connection instanceof HttpURLConnection) {
+            responseCode = ((HttpURLConnection) connection).getResponseCode();
+        }
+        return responseCode;
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return connection.getInputStream();
+    }
+
+    @Override
+    public long getContentLength() {
+        String length = connection.getHeaderField("Content-Length");
+        try {
+            return Long.parseLong(length);
+        } catch (NumberFormatException e) {
+            return -1;
+        }
+    }
+
+    @Override
+    public String getResponseHeader(String name) {
+        return connection.getHeaderField(name);
+    }
+
+    @Override
+    public void close() {
+        // no operation
+    }
+
+    @Override
+    public Map<String, List<String>> getHeaderFields() {
+        return connection.getHeaderFields();
+    }
+
+    @Override
+    public InputStream getErrorStream() {
+        if (connection instanceof HttpURLConnection) {
+            return ((HttpURLConnection) connection).getErrorStream();
+        }
+        return null;
+    }
+
+    private void addHeaders(DownloadRequest request) {
+        final HashMap<String, List<String>> headers = request.getHeaders();
+        if (headers != null) {
+            Set<Map.Entry<String, List<String>>> entries = headers.entrySet();
+            for (Map.Entry<String, List<String>> entry : entries) {
+                String name = entry.getKey();
+                List<String> list = entry.getValue();
+                if (list != null) {
+                    for (String value : list) {
+                        connection.addRequestProperty(name, value);
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/HttpClient.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/HttpClient.java
new file mode 100755
index 0000000..ca9d790
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/HttpClient.java
@@ -0,0 +1,34 @@
+package com.downloader.httpclient;
+
+import com.downloader.request.DownloadRequest;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface HttpClient extends Cloneable {
+
+    HttpClient clone();
+
+    void connect(DownloadRequest request) throws IOException;
+
+    int getResponseCode() throws IOException;
+
+    InputStream getInputStream() throws IOException;
+
+    long getContentLength();
+
+    String getResponseHeader(String name);
+
+    void close();
+
+    Map<String, List<String>> getHeaderFields();
+
+    InputStream getErrorStream() throws IOException;
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/ComponentHolder.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/ComponentHolder.java
new file mode 100755
index 0000000..88ede5c
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/ComponentHolder.java
@@ -0,0 +1,97 @@
+package com.downloader.internal;
+
+import android.content.Context;
+
+import com.downloader.Constants;
+import com.downloader.PRDownloader;
+import com.downloader.PRDownloaderConfig;
+import com.downloader.database.AppDbHelper;
+import com.downloader.database.DbHelper;
+import com.downloader.database.NoOpsDbHelper;
+import com.downloader.httpclient.DefaultHttpClient;
+import com.downloader.httpclient.HttpClient;
+
+/**
+ * Created by amitshekhar on 14/11/17.
+ */
+
+public class ComponentHolder {
+
+    private final static ComponentHolder INSTANCE = new ComponentHolder();
+    private int readTimeout;
+    private int connectTimeout;
+    private String userAgent;
+    private HttpClient httpClient;
+    private DbHelper dbHelper;
+
+    public static ComponentHolder getInstance() {
+        return INSTANCE;
+    }
+
+    public void init(Context context, PRDownloaderConfig config) {
+        this.readTimeout = config.getReadTimeout();
+        this.connectTimeout = config.getConnectTimeout();
+        this.userAgent = config.getUserAgent();
+        this.httpClient = config.getHttpClient();
+        this.dbHelper = config.isDatabaseEnabled() ? new AppDbHelper(context) : new NoOpsDbHelper();
+        if (config.isDatabaseEnabled()) {
+            PRDownloader.cleanUp(30);
+        }
+    }
+
+    public int getReadTimeout() {
+        if (readTimeout == 0) {
+            synchronized (ComponentHolder.class) {
+                if (readTimeout == 0) {
+                    readTimeout = Constants.DEFAULT_READ_TIMEOUT_IN_MILLS;
+                }
+            }
+        }
+        return readTimeout;
+    }
+
+    public int getConnectTimeout() {
+        if (connectTimeout == 0) {
+            synchronized (ComponentHolder.class) {
+                if (connectTimeout == 0) {
+                    connectTimeout = Constants.DEFAULT_CONNECT_TIMEOUT_IN_MILLS;
+                }
+            }
+        }
+        return connectTimeout;
+    }
+
+    public String getUserAgent() {
+        if (userAgent == null) {
+            synchronized (ComponentHolder.class) {
+                if (userAgent == null) {
+                    userAgent = Constants.DEFAULT_USER_AGENT;
+                }
+            }
+        }
+        return userAgent;
+    }
+
+    public DbHelper getDbHelper() {
+        if (dbHelper == null) {
+            synchronized (ComponentHolder.class) {
+                if (dbHelper == null) {
+                    dbHelper = new NoOpsDbHelper();
+                }
+            }
+        }
+        return dbHelper;
+    }
+
+    public HttpClient getHttpClient() {
+        if (httpClient == null) {
+            synchronized (ComponentHolder.class) {
+                if (httpClient == null) {
+                    httpClient = new DefaultHttpClient();
+                }
+            }
+        }
+        return httpClient.clone();
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRequestQueue.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRequestQueue.java
new file mode 100755
index 0000000..513f71a
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRequestQueue.java
@@ -0,0 +1,118 @@
+package com.downloader.internal;
+
+import com.downloader.Status;
+import com.downloader.core.Core;
+import com.downloader.request.DownloadRequest;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRequestQueue {
+
+    private static DownloadRequestQueue instance;
+    private final Map<Integer, DownloadRequest> currentRequestMap;
+    private final AtomicInteger sequenceGenerator;
+
+    private DownloadRequestQueue() {
+        currentRequestMap = new ConcurrentHashMap<>();
+        sequenceGenerator = new AtomicInteger();
+    }
+
+    public static void initialize() {
+        getInstance();
+    }
+
+    public static DownloadRequestQueue getInstance() {
+        if (instance == null) {
+            synchronized (DownloadRequestQueue.class) {
+                if (instance == null) {
+                    instance = new DownloadRequestQueue();
+                }
+            }
+        }
+        return instance;
+    }
+
+    private int getSequenceNumber() {
+        return sequenceGenerator.incrementAndGet();
+    }
+
+    public void pause(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        if (request != null) {
+            request.setStatus(Status.PAUSED);
+        }
+    }
+
+    public void resume(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        if (request != null) {
+            request.setStatus(Status.QUEUED);
+            request.setFuture(Core.getInstance()
+                    .getExecutorSupplier()
+                    .forDownloadTasks()
+                    .submit(new DownloadRunnable(request)));
+        }
+    }
+
+    private void cancelAndRemoveFromMap(DownloadRequest request) {
+        if (request != null) {
+            request.cancel();
+            currentRequestMap.remove(request.getDownloadId());
+        }
+    }
+
+    public void cancel(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        cancelAndRemoveFromMap(request);
+    }
+
+    public void cancel(Object tag) {
+        for (Map.Entry<Integer, DownloadRequest> currentRequestMapEntry : currentRequestMap.entrySet()) {
+            DownloadRequest request = currentRequestMapEntry.getValue();
+            if (request.getTag() instanceof String && tag instanceof String) {
+                final String tempRequestTag = (String) request.getTag();
+                final String tempTag = (String) tag;
+                if (tempRequestTag.equals(tempTag)) {
+                    cancelAndRemoveFromMap(request);
+                }
+            } else if (request.getTag().equals(tag)) {
+                cancelAndRemoveFromMap(request);
+            }
+        }
+    }
+
+    public void cancelAll() {
+        for (Map.Entry<Integer, DownloadRequest> currentRequestMapEntry : currentRequestMap.entrySet()) {
+            DownloadRequest request = currentRequestMapEntry.getValue();
+            cancelAndRemoveFromMap(request);
+        }
+    }
+
+    public Status getStatus(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        if (request != null) {
+            return request.getStatus();
+        }
+        return Status.UNKNOWN;
+    }
+
+    public void addRequest(DownloadRequest request) {
+        currentRequestMap.put(request.getDownloadId(), request);
+        request.setStatus(Status.QUEUED);
+        request.setSequenceNumber(getSequenceNumber());
+        request.setFuture(Core.getInstance()
+                .getExecutorSupplier()
+                .forDownloadTasks()
+                .submit(new DownloadRunnable(request)));
+    }
+
+    public void finish(DownloadRequest request) {
+        currentRequestMap.remove(request.getDownloadId());
+    }
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRunnable.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRunnable.java
new file mode 100755
index 0000000..26d11d7
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRunnable.java
@@ -0,0 +1,41 @@
+package com.downloader.internal;
+
+import com.downloader.Error;
+import com.downloader.Priority;
+import com.downloader.Response;
+import com.downloader.Status;
+import com.downloader.request.DownloadRequest;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRunnable implements Runnable {
+
+    public final Priority priority;
+    public final int sequence;
+    public final DownloadRequest request;
+
+    DownloadRunnable(DownloadRequest request) {
+        this.request = request;
+        this.priority = request.getPriority();
+        this.sequence = request.getSequenceNumber();
+    }
+
+    @Override
+    public void run() {
+        request.setStatus(Status.RUNNING);
+        DownloadTask downloadTask = DownloadTask.create(request);
+        Response response = downloadTask.run();
+        if (response.isSuccessful()) {
+            request.deliverSuccess();
+        } else if (response.isPaused()) {
+            request.deliverPauseEvent();
+        } else if (response.getError() != null) {
+            request.deliverError(response.getError());
+        } else if (!response.isCancelled()) {
+            request.deliverError(new Error());
+        }
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadTask.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadTask.java
new file mode 100755
index 0000000..3702ba8
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadTask.java
@@ -0,0 +1,390 @@
+package com.downloader.internal;
+
+import com.downloader.Constants;
+import com.downloader.Error;
+import com.downloader.Progress;
+import com.downloader.Response;
+import com.downloader.Status;
+import com.downloader.database.DownloadModel;
+import com.downloader.handler.ProgressHandler;
+import com.downloader.httpclient.HttpClient;
+import com.downloader.internal.stream.FileDownloadOutputStream;
+import com.downloader.internal.stream.FileDownloadRandomAccessFile;
+import com.downloader.request.DownloadRequest;
+import com.downloader.utils.Utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadTask {
+
+    private static final int BUFFER_SIZE = 1024 * 4;
+    private static final long TIME_GAP_FOR_SYNC = 2000;
+    private static final long MIN_BYTES_FOR_SYNC = 65536;
+    private final DownloadRequest request;
+    private ProgressHandler progressHandler;
+    private long lastSyncTime;
+    private long lastSyncBytes;
+    private InputStream inputStream;
+    private FileDownloadOutputStream outputStream;
+    private HttpClient httpClient;
+    private long totalBytes;
+    private int responseCode;
+    private String eTag;
+    private boolean isResumeSupported;
+    private String tempPath;
+
+    private DownloadTask(DownloadRequest request) {
+        this.request = request;
+    }
+
+    static DownloadTask create(DownloadRequest request) {
+        return new DownloadTask(request);
+    }
+
+    Response run() {
+
+        Response response = new Response();
+
+        if (request.getStatus() == Status.CANCELLED) {
+            response.setCancelled(true);
+            return response;
+        } else if (request.getStatus() == Status.PAUSED) {
+            response.setPaused(true);
+            return response;
+        }
+
+        try {
+
+            if (request.getOnProgressListener() != null) {
+                progressHandler = new ProgressHandler(request.getOnProgressListener());
+            }
+
+            tempPath = Utils.getTempPath(request.getDirPath(), request.getFileName());
+
+            File file = new File(tempPath);
+
+            DownloadModel model = getDownloadModelIfAlreadyPresentInDatabase();
+
+            if (model != null) {
+                if (file.exists()) {
+                    request.setTotalBytes(model.getTotalBytes());
+                    request.setDownloadedBytes(model.getDownloadedBytes());
+                } else {
+                    removeNoMoreNeededModelFromDatabase();
+                    request.setDownloadedBytes(0);
+                    request.setTotalBytes(0);
+                    model = null;
+                }
+            }
+
+            httpClient = ComponentHolder.getInstance().getHttpClient();
+
+            httpClient.connect(request);
+
+            if (request.getStatus() == Status.CANCELLED) {
+                response.setCancelled(true);
+                return response;
+            } else if (request.getStatus() == Status.PAUSED) {
+                response.setPaused(true);
+                return response;
+            }
+
+            httpClient = Utils.getRedirectedConnectionIfAny(httpClient, request);
+
+            responseCode = httpClient.getResponseCode();
+
+            eTag = httpClient.getResponseHeader(Constants.ETAG);
+
+            if (checkIfFreshStartRequiredAndStart(model)) {
+                model = null;
+            }
+
+            if (!isSuccessful()) {
+                Error error = new Error();
+                error.setServerError(true);
+                error.setServerErrorMessage(convertStreamToString(httpClient.getErrorStream()));
+                error.setHeaderFields(httpClient.getHeaderFields());
+                error.setResponseCode(responseCode);
+                response.setError(error);
+                return response;
+            }
+
+            setResumeSupportedOrNot();
+
+            totalBytes = request.getTotalBytes();
+
+            if (!isResumeSupported) {
+                deleteTempFile();
+            }
+
+            if (totalBytes == 0) {
+                totalBytes = httpClient.getContentLength();
+                request.setTotalBytes(totalBytes);
+            }
+
+            if (isResumeSupported && model == null) {
+                createAndInsertNewModel();
+            }
+
+            if (request.getStatus() == Status.CANCELLED) {
+                response.setCancelled(true);
+                return response;
+            } else if (request.getStatus() == Status.PAUSED) {
+                response.setPaused(true);
+                return response;
+            }
+
+            request.deliverStartEvent();
+
+            inputStream = httpClient.getInputStream();
+
+            byte[] buff = new byte[BUFFER_SIZE];
+
+            if (!file.exists()) {
+                if (file.getParentFile() != null && !file.getParentFile().exists()) {
+                    if (file.getParentFile().mkdirs()) {
+                        //noinspection ResultOfMethodCallIgnored
+                        file.createNewFile();
+                    }
+                } else {
+                    //noinspection ResultOfMethodCallIgnored
+                    file.createNewFile();
+                }
+            }
+
+            this.outputStream = FileDownloadRandomAccessFile.create(file);
+
+            if (isResumeSupported && request.getDownloadedBytes() != 0) {
+                outputStream.seek(request.getDownloadedBytes());
+            }
+
+            if (request.getStatus() == Status.CANCELLED) {
+                response.setCancelled(true);
+                return response;
+            } else if (request.getStatus() == Status.PAUSED) {
+                response.setPaused(true);
+                return response;
+            }
+
+            do {
+
+                final int byteCount = inputStream.read(buff, 0, BUFFER_SIZE);
+
+                if (byteCount == -1) {
+                    break;
+                }
+
+                outputStream.write(buff, 0, byteCount);
+
+                request.setDownloadedBytes(request.getDownloadedBytes() + byteCount);
+
+                sendProgress();
+
+                syncIfRequired(outputStream);
+
+                if (request.getStatus() == Status.CANCELLED) {
+                    response.setCancelled(true);
+                    return response;
+                } else if (request.getStatus() == Status.PAUSED) {
+                    sync(outputStream);
+                    response.setPaused(true);
+                    return response;
+                }
+
+            } while (true);
+
+            final String path = Utils.getPath(request.getDirPath(), request.getFileName());
+
+            Utils.renameFileName(tempPath, path);
+
+            response.setSuccessful(true);
+
+            if (isResumeSupported) {
+                removeNoMoreNeededModelFromDatabase();
+            }
+
+        } catch (IOException | IllegalAccessException e) {
+            if (!isResumeSupported) {
+                deleteTempFile();
+            }
+            Error error = new Error();
+            error.setConnectionError(true);
+            error.setConnectionException(e);
+            response.setError(error);
+        } finally {
+            closeAllSafely(outputStream);
+        }
+
+        return response;
+    }
+
+    private void deleteTempFile() {
+        File file = new File(tempPath);
+        if (file.exists()) {
+            //noinspection ResultOfMethodCallIgnored
+            file.delete();
+        }
+    }
+
+    private boolean isSuccessful() {
+        return responseCode >= HttpURLConnection.HTTP_OK
+                && responseCode < HttpURLConnection.HTTP_MULT_CHOICE;
+    }
+
+    private void setResumeSupportedOrNot() {
+        isResumeSupported = (responseCode == HttpURLConnection.HTTP_PARTIAL);
+    }
+
+    private boolean checkIfFreshStartRequiredAndStart(DownloadModel model) throws IOException,
+            IllegalAccessException {
+        if (responseCode == Constants.HTTP_RANGE_NOT_SATISFIABLE || isETagChanged(model)) {
+            if (model != null) {
+                removeNoMoreNeededModelFromDatabase();
+            }
+            deleteTempFile();
+            request.setDownloadedBytes(0);
+            request.setTotalBytes(0);
+            httpClient = ComponentHolder.getInstance().getHttpClient();
+            httpClient.connect(request);
+            httpClient = Utils.getRedirectedConnectionIfAny(httpClient, request);
+            responseCode = httpClient.getResponseCode();
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isETagChanged(DownloadModel model) {
+        return !(eTag == null || model == null || model.getETag() == null)
+                && !model.getETag().equals(eTag);
+    }
+
+    private DownloadModel getDownloadModelIfAlreadyPresentInDatabase() {
+        return ComponentHolder.getInstance().getDbHelper().find(request.getDownloadId());
+    }
+
+    private void createAndInsertNewModel() {
+        DownloadModel model = new DownloadModel();
+        model.setId(request.getDownloadId());
+        model.setUrl(request.getUrl());
+        model.setETag(eTag);
+        model.setDirPath(request.getDirPath());
+        model.setFileName(request.getFileName());
+        model.setDownloadedBytes(request.getDownloadedBytes());
+        model.setTotalBytes(totalBytes);
+        model.setLastModifiedAt(System.currentTimeMillis());
+        ComponentHolder.getInstance().getDbHelper().insert(model);
+    }
+
+    private void removeNoMoreNeededModelFromDatabase() {
+        ComponentHolder.getInstance().getDbHelper().remove(request.getDownloadId());
+    }
+
+    private void sendProgress() {
+        if (request.getStatus() != Status.CANCELLED) {
+            if (progressHandler != null) {
+                progressHandler
+                        .obtainMessage(Constants.UPDATE,
+                                new Progress(request.getDownloadedBytes(),
+                                        totalBytes)).sendToTarget();
+            }
+        }
+    }
+
+    private void syncIfRequired(FileDownloadOutputStream outputStream) {
+        final long currentBytes = request.getDownloadedBytes();
+        final long currentTime = System.currentTimeMillis();
+        final long bytesDelta = currentBytes - lastSyncBytes;
+        final long timeDelta = currentTime - lastSyncTime;
+        if (bytesDelta > MIN_BYTES_FOR_SYNC && timeDelta > TIME_GAP_FOR_SYNC) {
+            sync(outputStream);
+            lastSyncBytes = currentBytes;
+            lastSyncTime = currentTime;
+        }
+    }
+
+    private void sync(FileDownloadOutputStream outputStream) {
+        boolean success;
+        try {
+            outputStream.flushAndSync();
+            success = true;
+        } catch (IOException e) {
+            success = false;
+            e.printStackTrace();
+        }
+        if (success && isResumeSupported) {
+            ComponentHolder.getInstance().getDbHelper()
+                    .updateProgress(request.getDownloadId(),
+                            request.getDownloadedBytes(),
+                            System.currentTimeMillis());
+        }
+
+    }
+
+    private void closeAllSafely(FileDownloadOutputStream outputStream) {
+        if (httpClient != null) {
+            try {
+                httpClient.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        if (inputStream != null) {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        try {
+            if (outputStream != null) {
+                try {
+                    sync(outputStream);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } finally {
+            if (outputStream != null)
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+        }
+    }
+
+    private String convertStreamToString(InputStream stream) {
+        StringBuilder stringBuilder = new StringBuilder();
+        if (stream != null) {
+            String line;
+            BufferedReader bufferedReader = null;
+            try {
+                bufferedReader = new BufferedReader(new InputStreamReader(stream));
+                while ((line = bufferedReader.readLine()) != null) {
+                    stringBuilder.append(line);
+                }
+            } catch (IOException ignored) {
+
+            } finally {
+                try {
+                    if (bufferedReader != null) {
+                        bufferedReader.close();
+                    }
+                } catch (NullPointerException | IOException ignored) {
+
+                }
+            }
+        }
+        return stringBuilder.toString();
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/SynchronousCall.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/SynchronousCall.java
new file mode 100755
index 0000000..008e4ec
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/SynchronousCall.java
@@ -0,0 +1,19 @@
+package com.downloader.internal;
+
+import com.downloader.Response;
+import com.downloader.request.DownloadRequest;
+
+public class SynchronousCall {
+
+    public final DownloadRequest request;
+
+    public SynchronousCall(DownloadRequest request) {
+        this.request = request;
+    }
+
+    public Response execute() {
+        DownloadTask downloadTask = DownloadTask.create(request);
+        return downloadTask.run();
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadOutputStream.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadOutputStream.java
new file mode 100755
index 0000000..1d080dd
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadOutputStream.java
@@ -0,0 +1,38 @@
+package com.downloader.internal.stream;
+
+
+import java.io.IOException;
+
+public interface FileDownloadOutputStream {
+
+    /**
+     * Writes <code>len</code> bytes from the specified byte array
+     * starting at offset <code>off</code> to this file.
+     */
+    void write(byte b[], int off, int len) throws IOException;
+
+    /**
+     * Flush all buffer to system and force all system buffers to synchronize with the underlying
+     * device.
+     */
+    void flushAndSync() throws IOException;
+
+    /**
+     * Closes this output stream and releases any system resources associated with this stream. The
+     * general contract of <code>close</code> is that it closes the output stream. A closed stream
+     * cannot perform output operations and cannot be reopened.
+     */
+    void close() throws IOException;
+
+    /**
+     * Sets the file-pointer offset, measured from the beginning of this file, at which the next
+     * read or write occurs.  The offset may be set beyond the end of the file.
+     */
+    void seek(long offset) throws IOException, IllegalAccessException;
+
+    /**
+     * Sets the length of this file.
+     */
+    void setLength(final long newLength) throws IOException, IllegalAccessException;
+
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadRandomAccessFile.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadRandomAccessFile.java
new file mode 100755
index 0000000..b0ebf7a
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadRandomAccessFile.java
@@ -0,0 +1,53 @@
+package com.downloader.internal.stream;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+public class FileDownloadRandomAccessFile implements FileDownloadOutputStream {
+
+    private final BufferedOutputStream out;
+    private final FileDescriptor fd;
+    private final RandomAccessFile randomAccess;
+
+    private FileDownloadRandomAccessFile(File file) throws IOException {
+        randomAccess = new RandomAccessFile(file, "rw");
+        fd = randomAccess.getFD();
+        out = new BufferedOutputStream(new FileOutputStream(randomAccess.getFD()));
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        out.write(b, off, len);
+    }
+
+    @Override
+    public void flushAndSync() throws IOException {
+        out.flush();
+        fd.sync();
+    }
+
+    @Override
+    public void close() throws IOException {
+        out.close();
+        randomAccess.close();
+    }
+
+    @Override
+    public void seek(long offset) throws IOException {
+        randomAccess.seek(offset);
+    }
+
+    @Override
+    public void setLength(long totalBytes) throws IOException {
+        randomAccess.setLength(totalBytes);
+    }
+
+    public static FileDownloadOutputStream create(File file) throws IOException {
+        return new FileDownloadRandomAccessFile(file);
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequest.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequest.java
new file mode 100755
index 0000000..04abfcf
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequest.java
@@ -0,0 +1,319 @@
+package com.downloader.request;
+
+import com.downloader.Error;
+import com.downloader.OnCancelListener;
+import com.downloader.OnDownloadListener;
+import com.downloader.OnPauseListener;
+import com.downloader.OnProgressListener;
+import com.downloader.OnStartOrResumeListener;
+import com.downloader.Priority;
+import com.downloader.Response;
+import com.downloader.Status;
+import com.downloader.core.Core;
+import com.downloader.internal.ComponentHolder;
+import com.downloader.internal.DownloadRequestQueue;
+import com.downloader.internal.SynchronousCall;
+import com.downloader.utils.Utils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.Future;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRequest {
+
+    private Priority priority;
+    private Object tag;
+    private String url;
+    private String dirPath;
+    private String fileName;
+    private int sequenceNumber;
+    private Future future;
+    private long downloadedBytes;
+    private long totalBytes;
+    private int readTimeout;
+    private int connectTimeout;
+    private String userAgent;
+    private OnProgressListener onProgressListener;
+    private OnDownloadListener onDownloadListener;
+    private OnStartOrResumeListener onStartOrResumeListener;
+    private OnPauseListener onPauseListener;
+    private OnCancelListener onCancelListener;
+    private int downloadId;
+    private HashMap<String, List<String>> headerMap;
+    private Status status;
+
+    DownloadRequest(DownloadRequestBuilder builder) {
+        this.url = builder.url;
+        this.dirPath = builder.dirPath;
+        this.fileName = builder.fileName;
+        this.headerMap = builder.headerMap;
+        this.priority = builder.priority;
+        this.tag = builder.tag;
+        this.readTimeout =
+                builder.readTimeout != 0 ?
+                        builder.readTimeout :
+                        getReadTimeoutFromConfig();
+        this.connectTimeout =
+                builder.connectTimeout != 0 ?
+                        builder.connectTimeout :
+                        getConnectTimeoutFromConfig();
+        this.userAgent = builder.userAgent;
+    }
+
+    public Priority getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Priority priority) {
+        this.priority = priority;
+    }
+
+    public Object getTag() {
+        return tag;
+    }
+
+    public void setTag(Object tag) {
+        this.tag = tag;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getDirPath() {
+        return dirPath;
+    }
+
+    public void setDirPath(String dirPath) {
+        this.dirPath = dirPath;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public int getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+    public void setSequenceNumber(int sequenceNumber) {
+        this.sequenceNumber = sequenceNumber;
+    }
+
+    public HashMap<String, List<String>> getHeaders() {
+        return headerMap;
+    }
+
+    public Future getFuture() {
+        return future;
+    }
+
+    public void setFuture(Future future) {
+        this.future = future;
+    }
+
+    public long getDownloadedBytes() {
+        return downloadedBytes;
+    }
+
+    public void setDownloadedBytes(long downloadedBytes) {
+        this.downloadedBytes = downloadedBytes;
+    }
+
+    public long getTotalBytes() {
+        return totalBytes;
+    }
+
+    public void setTotalBytes(long totalBytes) {
+        this.totalBytes = totalBytes;
+    }
+
+    public int getReadTimeout() {
+        return readTimeout;
+    }
+
+    public void setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+    }
+
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    public void setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+    }
+
+    public String getUserAgent() {
+        if (userAgent == null) {
+            userAgent = ComponentHolder.getInstance().getUserAgent();
+        }
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public int getDownloadId() {
+        return downloadId;
+    }
+
+    public void setDownloadId(int downloadId) {
+        this.downloadId = downloadId;
+    }
+
+    public Status getStatus() {
+        return status;
+    }
+
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+    public OnProgressListener getOnProgressListener() {
+        return onProgressListener;
+    }
+
+    public DownloadRequest setOnStartOrResumeListener(OnStartOrResumeListener onStartOrResumeListener) {
+        this.onStartOrResumeListener = onStartOrResumeListener;
+        return this;
+    }
+
+    public DownloadRequest setOnProgressListener(OnProgressListener onProgressListener) {
+        this.onProgressListener = onProgressListener;
+        return this;
+    }
+
+    public DownloadRequest setOnPauseListener(OnPauseListener onPauseListener) {
+        this.onPauseListener = onPauseListener;
+        return this;
+    }
+
+    public DownloadRequest setOnCancelListener(OnCancelListener onCancelListener) {
+        this.onCancelListener = onCancelListener;
+        return this;
+    }
+
+    public int start(OnDownloadListener onDownloadListener) {
+        this.onDownloadListener = onDownloadListener;
+        downloadId = Utils.getUniqueId(url, dirPath, fileName);
+        DownloadRequestQueue.getInstance().addRequest(this);
+        return downloadId;
+    }
+
+    public Response executeSync() {
+        downloadId = Utils.getUniqueId(url, dirPath, fileName);
+        return new SynchronousCall(this).execute();
+    }
+
+    public void deliverError(final Error error) {
+        if (status != Status.CANCELLED) {
+            setStatus(Status.FAILED);
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onDownloadListener != null) {
+                                onDownloadListener.onError(error);
+                            }
+                            finish();
+                        }
+                    });
+        }
+    }
+
+    public void deliverSuccess() {
+        if (status != Status.CANCELLED) {
+            setStatus(Status.COMPLETED);
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onDownloadListener != null) {
+                                onDownloadListener.onDownloadComplete();
+                            }
+                            finish();
+                        }
+                    });
+        }
+    }
+
+    public void deliverStartEvent() {
+        if (status != Status.CANCELLED) {
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onStartOrResumeListener != null) {
+                                onStartOrResumeListener.onStartOrResume();
+                            }
+                        }
+                    });
+        }
+    }
+
+    public void deliverPauseEvent() {
+        if (status != Status.CANCELLED) {
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onPauseListener != null) {
+                                onPauseListener.onPause();
+                            }
+                        }
+                    });
+        }
+    }
+
+    private void deliverCancelEvent() {
+        Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                .execute(new Runnable() {
+                    public void run() {
+                        if (onCancelListener != null) {
+                            onCancelListener.onCancel();
+                        }
+                    }
+                });
+    }
+
+    public void cancel() {
+        status = Status.CANCELLED;
+        if (future != null) {
+            future.cancel(true);
+        }
+        deliverCancelEvent();
+        Utils.deleteTempFileAndDatabaseEntryInBackground(Utils.getTempPath(dirPath, fileName), downloadId);
+    }
+
+    private void finish() {
+        destroy();
+        DownloadRequestQueue.getInstance().finish(this);
+    }
+
+    private void destroy() {
+        this.onProgressListener = null;
+        this.onDownloadListener = null;
+        this.onStartOrResumeListener = null;
+        this.onPauseListener = null;
+        this.onCancelListener = null;
+    }
+
+    private int getReadTimeoutFromConfig() {
+        return ComponentHolder.getInstance().getReadTimeout();
+    }
+
+    private int getConnectTimeoutFromConfig() {
+        return ComponentHolder.getInstance().getConnectTimeout();
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequestBuilder.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequestBuilder.java
new file mode 100755
index 0000000..67d5dff
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequestBuilder.java
@@ -0,0 +1,81 @@
+package com.downloader.request;
+
+import com.downloader.Priority;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRequestBuilder implements RequestBuilder {
+
+    String url;
+    String dirPath;
+    String fileName;
+    Priority priority = Priority.MEDIUM;
+    Object tag;
+    int readTimeout;
+    int connectTimeout;
+    String userAgent;
+    HashMap<String, List<String>> headerMap;
+
+    public DownloadRequestBuilder(String url, String dirPath, String fileName) {
+        this.url = url;
+        this.dirPath = dirPath;
+        this.fileName = fileName;
+    }
+
+    @Override
+    public DownloadRequestBuilder setHeader(String name, String value) {
+        if (headerMap == null) {
+            headerMap = new HashMap<>();
+        }
+        List<String> list = headerMap.get(name);
+        if (list == null) {
+            list = new ArrayList<>();
+            headerMap.put(name, list);
+        }
+        if (!list.contains(value)) {
+            list.add(value);
+        }
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setPriority(Priority priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setTag(Object tag) {
+        this.tag = tag;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+        return this;
+    }
+
+    public DownloadRequest build() {
+        return new DownloadRequest(this);
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/RequestBuilder.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/RequestBuilder.java
new file mode 100755
index 0000000..f1919d5
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/RequestBuilder.java
@@ -0,0 +1,23 @@
+package com.downloader.request;
+
+import com.downloader.Priority;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface RequestBuilder {
+
+    RequestBuilder setHeader(String name, String value);
+
+    RequestBuilder setPriority(Priority priority);
+
+    RequestBuilder setTag(Object tag);
+
+    RequestBuilder setReadTimeout(int readTimeout);
+
+    RequestBuilder setConnectTimeout(int connectTimeout);
+
+    RequestBuilder setUserAgent(String userAgent);
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/utils/Utils.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/utils/Utils.java
new file mode 100755
index 0000000..6c0633f
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/utils/Utils.java
@@ -0,0 +1,157 @@
+package com.downloader.utils;
+
+import com.downloader.Constants;
+import com.downloader.core.Core;
+import com.downloader.database.DownloadModel;
+import com.downloader.httpclient.HttpClient;
+import com.downloader.internal.ComponentHolder;
+import com.downloader.request.DownloadRequest;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public final class Utils {
+
+    private final static int MAX_REDIRECTION = 10;
+
+    private Utils() {
+        // no instance
+    }
+
+    public static String getPath(String dirPath, String fileName) {
+        return dirPath + File.separator + fileName;
+    }
+
+    public static String getTempPath(String dirPath, String fileName) {
+        return getPath(dirPath, fileName) + ".temp";
+    }
+
+    public static void renameFileName(String oldPath, String newPath) throws IOException {
+        final File oldFile = new File(oldPath);
+        try {
+            final File newFile = new File(newPath);
+            if (newFile.exists()) {
+                if (!newFile.delete()) {
+                    throw new IOException("Deletion Failed");
+                }
+            }
+            if (!oldFile.renameTo(newFile)) {
+                throw new IOException("Rename Failed");
+            }
+        } finally {
+            if (oldFile.exists()) {
+                //noinspection ResultOfMethodCallIgnored
+                oldFile.delete();
+            }
+        }
+    }
+
+    public static void deleteTempFileAndDatabaseEntryInBackground(final String path, final int downloadId) {
+        Core.getInstance().getExecutorSupplier().forBackgroundTasks()
+                .execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        ComponentHolder.getInstance().getDbHelper().remove(downloadId);
+                        File file = new File(path);
+                        if (file.exists()) {
+                            //noinspection ResultOfMethodCallIgnored
+                            file.delete();
+                        }
+                    }
+                });
+    }
+
+    public static void deleteUnwantedModelsAndTempFiles(final int days) {
+        Core.getInstance().getExecutorSupplier().forBackgroundTasks()
+                .execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        List<DownloadModel> models = ComponentHolder.getInstance()
+                                .getDbHelper()
+                                .getUnwantedModels(days);
+                        if (models != null) {
+                            for (DownloadModel model : models) {
+                                final String tempPath = getTempPath(model.getDirPath(), model.getFileName());
+                                ComponentHolder.getInstance().getDbHelper().remove(model.getId());
+                                File file = new File(tempPath);
+                                if (file.exists()) {
+                                    //noinspection ResultOfMethodCallIgnored
+                                    file.delete();
+                                }
+                            }
+                        }
+                    }
+                });
+    }
+
+    public static int getUniqueId(String url, String dirPath, String fileName) {
+
+        String string = url + File.separator + dirPath + File.separator + fileName;
+
+        byte[] hash;
+
+        try {
+            hash = MessageDigest.getInstance("MD5").digest(string.getBytes("UTF-8"));
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("NoSuchAlgorithmException", e);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("UnsupportedEncodingException", e);
+        }
+
+        StringBuilder hex = new StringBuilder(hash.length * 2);
+
+        for (byte b : hash) {
+            if ((b & 0xFF) < 0x10) hex.append("0");
+            hex.append(Integer.toHexString(b & 0xFF));
+        }
+
+        return hex.toString().hashCode();
+
+    }
+
+    public static HttpClient getRedirectedConnectionIfAny(HttpClient httpClient,
+                                                          DownloadRequest request)
+            throws IOException, IllegalAccessException {
+        int redirectTimes = 0;
+        int code = httpClient.getResponseCode();
+        String location = httpClient.getResponseHeader("Location");
+
+        while (isRedirection(code)) {
+            if (location == null) {
+                throw new IllegalAccessException("Location is null");
+            }
+            httpClient.close();
+
+            request.setUrl(location);
+            httpClient = ComponentHolder.getInstance().getHttpClient();
+            httpClient.connect(request);
+            code = httpClient.getResponseCode();
+            location = httpClient.getResponseHeader("Location");
+            redirectTimes++;
+            if (redirectTimes >= MAX_REDIRECTION) {
+                throw new IllegalAccessException("Max redirection done");
+            }
+        }
+
+        return httpClient;
+    }
+
+    private static boolean isRedirection(int code) {
+        return code == HttpURLConnection.HTTP_MOVED_PERM
+                || code == HttpURLConnection.HTTP_MOVED_TEMP
+                || code == HttpURLConnection.HTTP_SEE_OTHER
+                || code == HttpURLConnection.HTTP_MULT_CHOICE
+                || code == Constants.HTTP_TEMPORARY_REDIRECT
+                || code == Constants.HTTP_PERMANENT_REDIRECT;
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/res/values/strings.xml b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/res/values/strings.xml
new file mode 100755
index 0000000..e672d7b
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">downloader</string>
+</resources>
diff --git a/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/test/java/com/downloader/ExampleUnitTest.java b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/test/java/com/downloader/ExampleUnitTest.java
new file mode 100755
index 0000000..49f38ab
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/prdownloader/src/test/java/com/downloader/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.downloader;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/PRDownloader/settings.gradle b/OnTime_Driver_live/lib/PRDownloader/settings.gradle
new file mode 100755
index 0000000..85308ca
--- /dev/null
+++ b/OnTime_Driver_live/lib/PRDownloader/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':prdownloader'
diff --git a/OnTime_Driver_live/lib/README.md b/OnTime_Driver_live/lib/README.md
new file mode 100755
index 0000000..f158674
--- /dev/null
+++ b/OnTime_Driver_live/lib/README.md
@@ -0,0 +1,15 @@
+# Local libraries (not shared)
+
+These modules are **included only in this app**. They are not shared with other OnTime apps (User, Merchant). Each app has its own copy under its own `lib/` folder.
+
+## Modules
+
+| Module | Path | Description |
+|--------|------|-------------|
+| rating-view | `RatingView/rating-view` | Rating bar widget |
+| textdrawable | `TextDrawable/library` | Text-based drawables |
+| prdownloader | `PRDownloader/prdownloader` | File downloader |
+| liboverscroll | `overscroll-decor/liboverscroll` | Overscroll effects |
+| fragmentanimations | `FragmentAnimations/fragmentanimations` | Fragment transition animations |
+
+All libs use **compileSdk 33**, **targetSdk 33**, **minSdk 21**, and AndroidX.
diff --git a/OnTime_Driver_live/lib/RatingView/.gitignore b/OnTime_Driver_live/lib/RatingView/.gitignore
new file mode 100755
index 0000000..c6cbe56
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
diff --git a/OnTime_Driver_live/lib/RatingView/LICENSE b/OnTime_Driver_live/lib/RatingView/LICENSE
new file mode 100755
index 0000000..2bb9ad2
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/LICENSE
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/RatingView/README.md b/OnTime_Driver_live/lib/RatingView/README.md
new file mode 100755
index 0000000..166e28d
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/README.md
@@ -0,0 +1,29 @@
+# RatingView
+[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-RatingView-green.svg?style=true)](https://android-arsenal.com/details/1/3770)
+
+Simple android widget that can replace standard inconvenient RatingBar in your app.
+
+![Screenshot](https://googledrive.com/host/0Bwz1_b9mA7XYbC1EQ28xaHVwcGc/ratingview2.jpg)
+##Description
+The default Android `RatingBar` widget hardly can satisfy developers' needs. It's a pain to customize it at all. This simple view can take a huge advantage of setting and scaling drawables for rating view easily.
+##Usage
+You can download this library with the following line in your `app` module `build.gradle`:
+```gradle
+compile 'com.github.ornolfr:rating-view:0.1.2@aar'
+```    
+##Example
+Declare `RatingView` in your XML with `app` attributes:
+```xml
+<com.github.ornolfr.ratingview.RatingView
+	android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:drawable_empty="@drawable/ic_star_empty"
+    app:drawable_filled="@drawable/ic_star_filled"
+    app:drawable_half="@drawable/ic_star_half"
+    app:drawable_margin="4dp"
+    app:drawable_size="24dp"
+    app:is_indicator="false"
+    app:max_count="5"
+    app:rating="3.5" />
+```
+And use it through `RatingView` instance in your code. Goog luck!
diff --git a/OnTime_Driver_live/lib/RatingView/app/.gitignore b/OnTime_Driver_live/lib/RatingView/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Driver_live/lib/RatingView/app/build.gradle b/OnTime_Driver_live/lib/RatingView/app/build.gradle
new file mode 100755
index 0000000..2b321d4
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/app/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
+
+    defaultConfig {
+        applicationId "com.github.ornolfr.ratingview"
+        minSdkVersion 15
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile project(':rating-view')
+}
diff --git a/OnTime_Driver_live/lib/RatingView/app/proguard-rules.pro b/OnTime_Driver_live/lib/RatingView/app/proguard-rules.pro
new file mode 100755
index 0000000..4ed9620
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\Roman\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/RatingView/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..41609b2
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/app/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.github.ornolfr.ratingview_sample">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name="com.github.ornolfr.ratingview_sample.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/java/com/github/ornolfr/ratingview_sample/MainActivity.java b/OnTime_Driver_live/lib/RatingView/app/src/main/java/com/github/ornolfr/ratingview_sample/MainActivity.java
new file mode 100755
index 0000000..fd3a122
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/app/src/main/java/com/github/ornolfr/ratingview_sample/MainActivity.java
@@ -0,0 +1,55 @@
+package com.github.ornolfr.ratingview_sample;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.github.ornolfr.ratingview.RatingView;
+
+import java.util.Random;
+
+public class MainActivity extends AppCompatActivity implements View.OnClickListener {
+
+    private RatingView ratingView;
+
+    private Button buttonRating, buttonIndicator;
+
+    private Random random = new Random();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        ratingView = (RatingView) findViewById(R.id.ratingView);
+
+        buttonIndicator = (Button) findViewById(R.id.buttonIndicator);
+        buttonRating = (Button) findViewById(R.id.buttonRating);
+
+        buttonIndicator.setOnClickListener(this);
+        buttonRating.setOnClickListener(this);
+
+        ratingView.setOnRatingChangedListener(new RatingView.OnRatingChangedListener() {
+            @Override
+            public void onRatingChange(float oldRating, float newRating) {
+                Toast.makeText(MainActivity.this, "Old rating = " + oldRating + "; New rating = " + newRating, Toast.LENGTH_SHORT).show();
+            }
+        });
+
+    }
+
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.buttonIndicator:
+                ratingView.setIsIndicator(!ratingView.isIndicator());
+                break;
+            case R.id.buttonRating:
+                ratingView.setRating(random.nextFloat() * ratingView.getMaxCount());
+                break;
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/res/layout/activity_main.xml b/OnTime_Driver_live/lib/RatingView/app/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..837ed43
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.github.ornolfr.ratingview_sample.MainActivity">
+
+    <com.github.ornolfr.ratingview.RatingView
+        android:id="@+id/ratingView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:max_count="5"
+        android:foregroundGravity="bottom"
+        android:layout_marginBottom="16dp" />
+
+    <Button
+        android:id="@+id/buttonRating"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:text="Change rating!" />
+
+    <Button
+        android:id="@+id/buttonIndicator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:text="Make indicator!" />
+
+    <View
+        android:layout_width="24dp"
+        android:padding="8dp"
+        android:layout_height="24dp" />
+
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..cde69bc
Binary files /dev/null and b/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..c133a0c
Binary files /dev/null and b/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..bfa42f0
Binary files /dev/null and b/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..324e72c
Binary files /dev/null and b/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..aee44e1
Binary files /dev/null and b/OnTime_Driver_live/lib/RatingView/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/res/values-w820dp/dimens.xml b/OnTime_Driver_live/lib/RatingView/app/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/colors.xml b/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..3ab3e9c
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/dimens.xml b/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..47c8224
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/strings.xml b/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..608d04b
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">RatingView-Sample</string>
+</resources>
diff --git a/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/styles.xml b/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..5885930
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/OnTime_Driver_live/lib/RatingView/build.gradle b/OnTime_Driver_live/lib/RatingView/build.gradle
new file mode 100755
index 0000000..66c8924
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/build.gradle
@@ -0,0 +1,24 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/OnTime_Driver_live/lib/RatingView/gradle.properties b/OnTime_Driver_live/lib/RatingView/gradle.properties
new file mode 100755
index 0000000..1d3591c
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/RatingView/gradle/wrapper/gradle-wrapper.properties b/OnTime_Driver_live/lib/RatingView/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..122a0dc
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/OnTime_Driver_live/lib/RatingView/gradlew b/OnTime_Driver_live/lib/RatingView/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_Driver_live/lib/RatingView/gradlew.bat b/OnTime_Driver_live/lib/RatingView/gradlew.bat
new file mode 100755
index 0000000..8a0b282
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_Driver_live/lib/RatingView/rating-view/.gitignore b/OnTime_Driver_live/lib/RatingView/rating-view/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/rating-view/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Driver_live/lib/RatingView/rating-view/build.gradle b/OnTime_Driver_live/lib/RatingView/rating-view/build.gradle
new file mode 100755
index 0000000..60f3141
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/rating-view/build.gradle
@@ -0,0 +1,49 @@
+apply plugin: 'com.android.library'
+ext {
+    bintrayRepo = 'maven'
+    bintrayName = 'rating-view'
+
+    publishedGroupId = 'com.github.ornolfr'
+    libraryName = 'RatingView'
+    artifact = 'rating-view'
+
+    libraryDescription = 'Simple android widget that can replace standard inconvenient RatingBar in your app.'
+
+    siteUrl = 'https://github.com/Ornolfr/RatingView'
+    gitUrl = 'https://github.com/Ornolfr/RatingView.git'
+
+    libraryVersion = '0.1.2'
+
+    developerId = 'ornolfr'
+    developerName = 'Roman Samoylenko'
+    developerEmail = 'ornolfr1@gmail.com'
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
+android {
+    compileSdk 33
+    namespace 'com.github.ornolfr.ratingview'
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+}
+
+// Publishing scripts removed; library used as local project dependency
diff --git a/OnTime_Driver_live/lib/RatingView/rating-view/proguard-rules.pro b/OnTime_Driver_live/lib/RatingView/rating-view/proguard-rules.pro
new file mode 100755
index 0000000..4ed9620
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/rating-view/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\Roman\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Driver_live/lib/RatingView/rating-view/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..3840020
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.github.ornolfr.ratingview">
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true">
+
+    </application>
+
+</manifest>
diff --git a/OnTime_Driver_live/lib/RatingView/rating-view/src/main/java/com/github/ornolfr/ratingview/RatingView.java b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/java/com/github/ornolfr/ratingview/RatingView.java
new file mode 100755
index 0000000..5f8a095
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/java/com/github/ornolfr/ratingview/RatingView.java
@@ -0,0 +1,334 @@
+package com.github.ornolfr.ratingview;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.MotionEvent;
+import android.view.View;
+
+
+/**
+ * Created by Ornolfr on 10.06.2016.
+ */
+public class RatingView extends View implements View.OnTouchListener {
+
+    //Default values
+    private static final boolean DEFAULT_IS_INDICATOR = false;
+
+    private static final float DEFAULT_RATING = 3.5f;
+
+    private static final int DEFAULT_MAX_COUNT = 5;
+
+    private static final int DEFAULT_DRAWABLE_SIZE_IN_DP = 32;
+
+    private static final int DEFAULT_DRAWABLE_MARGIN_IN_DP = 4;
+
+    private OnRatingChangedListener mListener;
+
+    //Bitmaps for your rating drawables
+    private Bitmap mDrawableEmpty, mDrawableHalf, mDrawableFilled;
+
+    //For drawing view
+    private Rect mRect = new Rect();
+
+    //Boolean field: if true - user cannot affect the view
+    private boolean mIsIndicator;
+
+    //Float field: displayed rating, 0 <= mRating <= mMaxCount
+    private float mRating;
+
+    //Integer field: max drawables count and rating as well
+    private int mMaxCount;
+
+    //Integer field: drawable size
+    private int mDrawableSize;
+
+    //Integer field: inner margin between drawables
+    private int mDrawableMargin;
+
+    /**
+     * This interface will return rating value before changing it and after
+     */
+    public interface OnRatingChangedListener {
+        void onRatingChange(float oldRating, float newRating);
+    }
+
+
+    public RatingView(Context context) {
+        super(context);
+        init(null, 0, 0);
+    }
+
+    public RatingView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs, 0, 0);
+    }
+
+    public RatingView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(attrs, defStyleAttr, 0);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public RatingView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(attrs, defStyleAttr, defStyleRes);
+    }
+
+    private void init(AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        TypedArray a = getContext().obtainStyledAttributes
+                (attrs, R.styleable.RatingView, defStyleAttr, defStyleRes);
+
+        mDrawableMargin = (int) a.getDimension(R.styleable.RatingView_drawable_margin,
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_DRAWABLE_MARGIN_IN_DP, getResources().getDisplayMetrics()));
+
+        mDrawableSize = (int) a.getDimension(R.styleable.RatingView_drawable_size,
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_DRAWABLE_SIZE_IN_DP, getResources().getDisplayMetrics()));
+
+        if (mDrawableSize < 0)
+            throw new IllegalArgumentException("Drawable size < 0");
+
+        mMaxCount = a.getInteger(R.styleable.RatingView_max_count, DEFAULT_MAX_COUNT);
+
+        if (mMaxCount < 1)
+            throw new IllegalArgumentException("Max count < 1");
+
+        mRating = a.getFloat(R.styleable.RatingView_rating, DEFAULT_RATING);
+
+        mIsIndicator = a.getBoolean(R.styleable.RatingView_is_indicator, DEFAULT_IS_INDICATOR);
+
+        mDrawableEmpty = BitmapFactory.decodeResource(getContext().getResources(),
+                a.getResourceId(R.styleable.RatingView_drawable_empty, R.drawable.ic_star_empty));
+
+        mDrawableHalf = BitmapFactory.decodeResource(getContext().getResources(),
+                a.getResourceId(R.styleable.RatingView_drawable_half, R.drawable.ic_star_half));
+
+        mDrawableFilled = BitmapFactory.decodeResource(getContext().getResources(),
+                a.getResourceId(R.styleable.RatingView_drawable_filled, R.drawable.ic_star_filled));
+
+        a.recycle();
+
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(resolveSize((mDrawableSize * mMaxCount) + (mDrawableMargin * (mMaxCount - 1))/* + getPaddingLeft() + getPaddingRight()*/, widthMeasureSpec),
+                resolveSize(mDrawableSize, heightMeasureSpec)/* + getPaddingBottom() + getPaddingTop()*/);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (!mIsIndicator)
+            setOnTouchListener(this);
+//        canvas.translate(getPaddingLeft(), getPaddingTop());
+        if (mDrawableFilled != null && mDrawableHalf != null && mDrawableEmpty != null) {
+            //set view size
+            mRect.set(0, 0, mDrawableSize, mDrawableSize);
+
+            int fullDrawablesCount = (int) mRating;
+            int emptyDrawablesCount = mMaxCount - Math.round(mRating);
+
+            if (mRating - fullDrawablesCount >= 0.75f)
+                fullDrawablesCount++;
+
+            //drawing full drawables
+            for (int i = 0; i < fullDrawablesCount; i++) {
+                canvas.drawBitmap(mDrawableFilled, null, mRect, null);
+                mRect.offset(mDrawableSize + mDrawableMargin, 0);
+            }
+
+            //drawing half drawable if needed
+            if (mRating - fullDrawablesCount >= 0.25f && mRating - fullDrawablesCount < 0.75f) {
+                canvas.drawBitmap(mDrawableHalf, null, mRect, null);
+                mRect.offset(mDrawableSize + mDrawableMargin, 0);
+            }
+
+            //drawing empty drawables
+            for (int i = 0; i < emptyDrawablesCount; i++) {
+                canvas.drawBitmap(mDrawableEmpty, null, mRect, null);
+                mRect.offset(mDrawableSize + mDrawableMargin, 0);
+            }
+
+        }
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        switch (event.getActionMasked()) {
+            case MotionEvent.ACTION_DOWN:
+                return true;
+            case MotionEvent.ACTION_UP:
+                setRating(Math.round(event.getX() / getWidth() * mMaxCount + 0.5));
+                return false;
+            default: //do nothing
+                break;
+        }
+        return super.onTouchEvent(event);
+    }
+
+    /**
+     * Sets OnRatingChangedListener on this view, which will give you old and new rating.
+     *
+     * @param listener your listener
+     */
+    public void setOnRatingChangedListener(OnRatingChangedListener listener) {
+        mListener = listener;
+    }
+
+    /**
+     * Sets whether rating view is isIndicator or not
+     *
+     * @param isIndicator boolean, true - user can't interact the view
+     */
+    public void setIsIndicator(boolean isIndicator) {
+        mIsIndicator = isIndicator;
+        setOnTouchListener(mIsIndicator ? null : this);
+    }
+
+    /**
+     * Sets the rating of this view
+     *
+     * @param rating custom rating
+     */
+    public void setRating(float rating) {
+        float newRating = rating;
+        if (newRating < 0) {
+            newRating = 0;
+        } else if (newRating > mMaxCount) {
+            newRating = mMaxCount;
+        }
+        if (mListener != null)
+            mListener.onRatingChange(mRating, newRating);
+        mRating = newRating;
+        invalidate();
+    }
+
+    /**
+     * Sets empty drawable
+     *
+     * @param drawableEmpty bitmap of your drawable
+     */
+    public void setDrawableEmpty(Bitmap drawableEmpty) {
+        this.mDrawableEmpty = drawableEmpty;
+        invalidate();
+    }
+
+    /**
+     * Sets half drawable
+     *
+     * @param drawableHalf bitmap of your drawable
+     */
+    public void setDrawableHalf(Bitmap drawableHalf) {
+        this.mDrawableHalf = drawableHalf;
+        invalidate();
+    }
+
+    /**
+     * Sets filled drawable
+     *
+     * @param drawableFilled bitmap of your drawable
+     */
+    public void setDrawableFilled(Bitmap drawableFilled) {
+        this.mDrawableFilled = drawableFilled;
+        invalidate();
+    }
+
+    /**
+     * @return is it indicator or not
+     */
+    public boolean isIndicator() {
+        return mIsIndicator;
+    }
+
+    /**
+     * @return current rating
+     */
+    public float getRating() {
+        return mRating;
+    }
+
+    /**
+     * @return current max count
+     */
+    public int getMaxCount() {
+        return mMaxCount;
+    }
+
+    /**
+     * @return drawable size in px
+     */
+    public int getDrawableSize() {
+        return mDrawableSize;
+    }
+
+    /**
+     * @return drawable margin in px
+     */
+    public int getDrawableMargin() {
+        return mDrawableMargin;
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        SavedState savedState = new SavedState(superState);
+        savedState.mRating = mRating;
+        savedState.mIndicator = mIsIndicator;
+        return savedState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state instanceof SavedState) {
+            SavedState savedState = (SavedState) state;
+            super.onRestoreInstanceState(savedState.getSuperState());
+            mRating = savedState.mRating;
+            mIsIndicator = savedState.mIndicator;
+        } else {
+            super.onRestoreInstanceState(state);
+        }
+    }
+
+    static class SavedState extends BaseSavedState {
+
+        float mRating;
+        boolean mIndicator;
+
+        SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        private SavedState(Parcel in) {
+            super(in);
+            this.mRating = in.readFloat();
+            this.mIndicator = in.readInt() == 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel out, int flags) {
+            super.writeToParcel(out, flags);
+            out.writeFloat(this.mRating);
+            out.writeInt(this.mIndicator ? 1 : 0);
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_empty.png b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_empty.png
new file mode 100755
index 0000000..5caaccf
Binary files /dev/null and b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_empty.png differ
diff --git a/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_filled.png b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_filled.png
new file mode 100755
index 0000000..382f673
Binary files /dev/null and b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_filled.png differ
diff --git a/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_half.png b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_half.png
new file mode 100755
index 0000000..d95aaac
Binary files /dev/null and b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_half.png differ
diff --git a/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/values/attrs_rating_view.xml b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/values/attrs_rating_view.xml
new file mode 100755
index 0000000..aabfcd9
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/values/attrs_rating_view.xml
@@ -0,0 +1,12 @@
+<resources>
+    <declare-styleable name="RatingView">
+        <attr name="drawable_margin" format="dimension" />
+        <attr name="drawable_size" format="dimension"/>
+        <attr name="max_count" format="integer" />
+        <attr name="rating" format="float" />
+        <attr name="is_indicator" format="boolean" />
+        <attr name="drawable_empty" format="reference" />
+        <attr name="drawable_filled" format="reference" />
+        <attr name="drawable_half" format="reference" />
+    </declare-styleable>
+</resources>
diff --git a/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/values/strings.xml b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/values/strings.xml
new file mode 100755
index 0000000..eb16c6d
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/rating-view/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">RatingView</string>
+</resources>
diff --git a/OnTime_Driver_live/lib/RatingView/settings.gradle b/OnTime_Driver_live/lib/RatingView/settings.gradle
new file mode 100755
index 0000000..36f3078
--- /dev/null
+++ b/OnTime_Driver_live/lib/RatingView/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':rating-view'
diff --git a/OnTime_Driver_live/lib/TextDrawable/.gitignore b/OnTime_Driver_live/lib/TextDrawable/.gitignore
new file mode 100755
index 0000000..bba431a
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/.gitignore
@@ -0,0 +1,32 @@
+#built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
+
+# Eclipse project files
+.classpath
+.project
+
+# Android Studio
+.idea
+#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
+.gradle
+build/
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/TextDrawable/LICENSE b/OnTime_Driver_live/lib/TextDrawable/LICENSE
new file mode 100755
index 0000000..f864661
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Amulya Khare
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/OnTime_Driver_live/lib/TextDrawable/README.md b/OnTime_Driver_live/lib/TextDrawable/README.md
new file mode 100755
index 0000000..631c708
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/README.md
@@ -0,0 +1,133 @@
+###TextDrawable 
+This light-weight library provides images with letter/text like the Gmail app. It extends the `Drawable` class thus can be used with existing/custom/network `ImageView` classes. Also included is a [fluent interface](http://en.wikipedia.org/wiki/Fluent_interface) for creating drawables and a customizable `ColorGenerator`.
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen1-material.png" width="350"/>
+<img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen2-material.png" width="350"/>
+</p>
+
+###How to use
+
+#### Import with Gradle:
+
+```groovy
+repositories{
+    maven {
+        url 'http://dl.bintray.com/amulyakhare/maven'
+    }
+}
+
+dependencies {
+    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+}
+```
+
+####1. Create simple tile:
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen3.png"/>
+</p>
+
+```xml
+<ImageView android:layout_width="60dp"
+	       android:layout_height="60dp"
+	       android:id="@+id/image_view"/>
+```
+**Note:** Specify width/height for the `ImageView` and the `drawable` will auto-scale to fit the size.
+```java
+TextDrawable drawable = TextDrawable.builder()
+                .buildRect("A", Color.RED);
+
+ImageView image = (ImageView) findViewById(R.id.image_view);
+image.setImageDrawable(drawable);
+```
+
+####2. Create rounded corner or circular tiles:
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen6.png"/>
+</p>
+
+```java
+TextDrawable drawable1 = TextDrawable.builder()
+                .buildRoundRect("A", Color.RED, 10); // radius in px
+
+TextDrawable drawable2 = TextDrawable.builder()
+                .buildRound("A", Color.RED);
+```
+
+####3. Add border:
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen5.png"/>
+</p>
+
+```java
+TextDrawable drawable = TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(4) /* thickness in px */
+                .endConfig()
+                .buildRoundRect("A", Color.RED, 10);
+```
+
+####4. Modify font style:
+
+```java
+TextDrawable drawable = TextDrawable.builder()
+                .beginConfig()
+	                .textColor(Color.BLACK)
+                    .useFont(Typeface.DEFAULT)
+                    .fontSize(30) /* size in px */
+                    .bold()
+                    .toUpperCase()
+                .endConfig()
+                .buildRect("a", Color.RED)
+```
+
+####5. Built-in color generator:
+
+```java
+ColorGenerator generator = ColorGenerator.MATERIAL; // or use DEFAULT
+// generate random color
+int color1 = generator.getRandomColor();
+// generate color based on a key (same key returns the same color), useful for list/grid views
+int color2 = generator.getColor("user@gmail.com")
+
+// declare the builder object once.
+TextDrawable.IBuilder builder = TextDrawable.builder()
+				.beginConfig()
+					.withBorder(4)
+				.endConfig()
+				.rect();
+
+// reuse the builder specs to create multiple drawables
+TextDrawable ic1 = builder.build("A", color1);
+TextDrawable ic2 = builder.build("B", color2);
+``` 
+
+####6. Specify the width / height:
+
+```xml
+<ImageView android:layout_width="wrap_content"
+	       android:layout_height="wrap_content"
+	       android:id="@+id/image_view"/>
+```
+**Note:**  The `ImageView` could use `wrap_content` width/height. You could set the width/height of the `drawable` using code.
+
+```java
+TextDrawable drawable = TextDrawable.builder()
+				.beginConfig()
+					.width(60)  // width in px
+					.height(60) // height in px
+				.endConfig()
+                .buildRect("A", Color.RED);
+
+ImageView image = (ImageView) findViewById(R.id.image_view);
+image.setImageDrawable(drawable);
+```
+
+####7. Other features:
+
+1. Mix-match with other drawables. Use it in conjunction with `LayerDrawable`, `InsetDrawable`, `AnimationDrawable`, `TransitionDrawable` etc.
+
+2. Compatible with other views (not just `ImageView`). Use it as background drawable, compound drawable for `TextView`, `Button` etc.
+
+3. Use multiple letters or `unicode` characters to create interesting tiles. 
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen7.png" width="350"/></p>
diff --git a/OnTime_Driver_live/lib/TextDrawable/build.gradle b/OnTime_Driver_live/lib/TextDrawable/build.gradle
new file mode 100755
index 0000000..3a8a17e
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/build.gradle
@@ -0,0 +1,18 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.0'
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/OnTime_Driver_live/lib/TextDrawable/gradle.properties b/OnTime_Driver_live/lib/TextDrawable/gradle.properties
new file mode 100755
index 0000000..5d08ba7
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Settings specified in this file will override any Gradle settings
+# configured through the IDE.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/TextDrawable/gradle/wrapper/gradle-wrapper.properties b/OnTime_Driver_live/lib/TextDrawable/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..ffc5028
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Mar 02 14:59:31 WIB 2026
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_Driver_live/lib/TextDrawable/gradlew b/OnTime_Driver_live/lib/TextDrawable/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_Driver_live/lib/TextDrawable/gradlew.bat b/OnTime_Driver_live/lib/TextDrawable/gradlew.bat
new file mode 100755
index 0000000..aec9973
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_Driver_live/lib/TextDrawable/library/.gitignore b/OnTime_Driver_live/lib/TextDrawable/library/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/library/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Driver_live/lib/TextDrawable/library/build.gradle b/OnTime_Driver_live/lib/TextDrawable/library/build.gradle
new file mode 100755
index 0000000..c3d6237
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/library/build.gradle
@@ -0,0 +1,39 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'com.amulyakhare.textdrawable'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 2
+        versionName "1.1"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/main/java'
+        }
+        resources {
+            srcDir 'src/main/res'
+        }
+    }
+}
+
+task sourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from sourceSets.main.java, sourceSets.main.resources
+}
diff --git a/OnTime_Driver_live/lib/TextDrawable/library/proguard-rules.pro b/OnTime_Driver_live/lib/TextDrawable/library/proguard-rules.pro
new file mode 100755
index 0000000..38b532c
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/library/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/gardev/android/adt-bundle-linux/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Driver_live/lib/TextDrawable/library/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/TextDrawable/library/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..a4307de
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/library/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest package="com.amulyakhare.textdrawable">
+    <application/>
+</manifest>
diff --git a/OnTime_Driver_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java b/OnTime_Driver_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java
new file mode 100755
index 0000000..db42f8b
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java
@@ -0,0 +1,316 @@
+package com.amulyakhare.textdrawable;
+
+import android.graphics.*;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.OvalShape;
+import android.graphics.drawable.shapes.RectShape;
+import android.graphics.drawable.shapes.RoundRectShape;
+
+/**
+ * @author amulya
+ * @datetime 14 Oct 2014, 3:53 PM
+ */
+public class TextDrawable extends ShapeDrawable {
+
+    private final Paint textPaint;
+    private final Paint borderPaint;
+    private static final float SHADE_FACTOR = 0.9f;
+    private final String text;
+    private final int color;
+    private final RectShape shape;
+    private final int height;
+    private final int width;
+    private final int fontSize;
+    private final float radius;
+    private final int borderThickness;
+
+    private TextDrawable(Builder builder) {
+        super(builder.shape);
+
+        // shape properties
+        shape = builder.shape;
+        height = builder.height;
+        width = builder.width;
+        radius = builder.radius;
+
+        // text and color
+        text = builder.toUpperCase ? builder.text.toUpperCase() : builder.text;
+        color = builder.color;
+
+        // text paint settings
+        fontSize = builder.fontSize;
+        textPaint = new Paint();
+        textPaint.setColor(builder.textColor);
+        textPaint.setAntiAlias(true);
+        textPaint.setFakeBoldText(builder.isBold);
+        textPaint.setStyle(Paint.Style.FILL);
+        textPaint.setTypeface(builder.font);
+        textPaint.setTextAlign(Paint.Align.CENTER);
+        textPaint.setStrokeWidth(builder.borderThickness);
+
+        // border paint settings
+        borderThickness = builder.borderThickness;
+        borderPaint = new Paint();
+        borderPaint.setColor(getDarkerShade(color));
+        borderPaint.setStyle(Paint.Style.STROKE);
+        borderPaint.setStrokeWidth(borderThickness);
+
+        // drawable paint color
+        Paint paint = getPaint();
+        paint.setColor(color);
+
+    }
+
+    private int getDarkerShade(int color) {
+        return Color.rgb((int)(SHADE_FACTOR * Color.red(color)),
+                (int)(SHADE_FACTOR * Color.green(color)),
+                (int)(SHADE_FACTOR * Color.blue(color)));
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
+        Rect r = getBounds();
+
+
+        // draw border
+        if (borderThickness > 0) {
+            drawBorder(canvas);
+        }
+
+        int count = canvas.save();
+        canvas.translate(r.left, r.top);
+
+        // draw text
+        int width = this.width < 0 ? r.width() : this.width;
+        int height = this.height < 0 ? r.height() : this.height;
+        int fontSize = this.fontSize < 0 ? (Math.min(width, height) / 2) : this.fontSize;
+        textPaint.setTextSize(fontSize);
+        canvas.drawText(text, width / 2, height / 2 - ((textPaint.descent() + textPaint.ascent()) / 2), textPaint);
+
+        canvas.restoreToCount(count);
+
+    }
+
+    private void drawBorder(Canvas canvas) {
+        RectF rect = new RectF(getBounds());
+        rect.inset(borderThickness/2, borderThickness/2);
+
+        if (shape instanceof OvalShape) {
+            canvas.drawOval(rect, borderPaint);
+        }
+        else if (shape instanceof RoundRectShape) {
+            canvas.drawRoundRect(rect, radius, radius, borderPaint);
+        }
+        else {
+            canvas.drawRect(rect, borderPaint);
+        }
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        textPaint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter cf) {
+        textPaint.setColorFilter(cf);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return width;
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return height;
+    }
+
+    public static IShapeBuilder builder() {
+        return new Builder();
+    }
+
+    public static class Builder implements IConfigBuilder, IShapeBuilder, IBuilder {
+
+        private String text;
+
+        private int color;
+
+        private int borderThickness;
+
+        private int width;
+
+        private int height;
+
+        private Typeface font;
+
+        private RectShape shape;
+
+        public int textColor;
+
+        private int fontSize;
+
+        private boolean isBold;
+
+        private boolean toUpperCase;
+
+        public float radius;
+
+        private Builder() {
+            text = "";
+            color = Color.GRAY;
+            textColor = Color.WHITE;
+            borderThickness = 0;
+            width = -1;
+            height = -1;
+            shape = new RectShape();
+            font = Typeface.create("sans-serif-light", Typeface.NORMAL);
+            fontSize = -1;
+            isBold = false;
+            toUpperCase = false;
+        }
+
+        public IConfigBuilder width(int width) {
+            this.width = width;
+            return this;
+        }
+
+        public IConfigBuilder height(int height) {
+            this.height = height;
+            return this;
+        }
+
+        public IConfigBuilder textColor(int color) {
+            this.textColor = color;
+            return this;
+        }
+
+        public IConfigBuilder withBorder(int thickness) {
+            this.borderThickness = thickness;
+            return this;
+        }
+
+        public IConfigBuilder useFont(Typeface font) {
+            this.font = font;
+            return this;
+        }
+
+        public IConfigBuilder fontSize(int size) {
+            this.fontSize = size;
+            return this;
+        }
+
+        public IConfigBuilder bold() {
+            this.isBold = true;
+            return this;
+        }
+
+        public IConfigBuilder toUpperCase() {
+            this.toUpperCase = true;
+            return this;
+        }
+
+        @Override
+        public IConfigBuilder beginConfig() {
+            return this;
+        }
+
+        @Override
+        public IShapeBuilder endConfig() {
+            return this;
+        }
+
+        @Override
+        public IBuilder rect() {
+            this.shape = new RectShape();
+            return this;
+        }
+
+        @Override
+        public IBuilder round() {
+            this.shape = new OvalShape();
+            return this;
+        }
+
+        @Override
+        public IBuilder roundRect(int radius) {
+            this.radius = radius;
+            float[] radii = {radius, radius, radius, radius, radius, radius, radius, radius};
+            this.shape = new RoundRectShape(radii, null, null);
+            return this;
+        }
+
+        @Override
+        public TextDrawable buildRect(String text, int color) {
+            rect();
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable buildRoundRect(String text, int color, int radius) {
+            roundRect(radius);
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable buildRound(String text, int color) {
+            round();
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable build(String text, int color) {
+            this.color = color;
+            this.text = text;
+            return new TextDrawable(this);
+        }
+    }
+
+    public interface IConfigBuilder {
+        public IConfigBuilder width(int width);
+
+        public IConfigBuilder height(int height);
+
+        public IConfigBuilder textColor(int color);
+
+        public IConfigBuilder withBorder(int thickness);
+
+        public IConfigBuilder useFont(Typeface font);
+
+        public IConfigBuilder fontSize(int size);
+
+        public IConfigBuilder bold();
+
+        public IConfigBuilder toUpperCase();
+
+        public IShapeBuilder endConfig();
+    }
+
+    public static interface IBuilder {
+
+        public TextDrawable build(String text, int color);
+    }
+
+    public static interface IShapeBuilder {
+
+        public IConfigBuilder beginConfig();
+
+        public IBuilder rect();
+
+        public IBuilder round();
+
+        public IBuilder roundRect(int radius);
+
+        public TextDrawable buildRect(String text, int color);
+
+        public TextDrawable buildRoundRect(String text, int color, int radius);
+
+        public TextDrawable buildRound(String text, int color);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java b/OnTime_Driver_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java
new file mode 100755
index 0000000..198c18f
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java
@@ -0,0 +1,69 @@
+package com.amulyakhare.textdrawable.util;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * @author amulya
+ * @datetime 14 Oct 2014, 5:20 PM
+ */
+public class ColorGenerator {
+
+    public static ColorGenerator DEFAULT;
+
+    public static ColorGenerator MATERIAL;
+
+    static {
+        DEFAULT = create(Arrays.asList(
+                0xfff16364,
+                0xfff58559,
+                0xfff9a43e,
+                0xffe4c62e,
+                0xff67bf74,
+                0xff59a2be,
+                0xff2093cd,
+                0xffad62a7,
+                0xff805781
+        ));
+        MATERIAL = create(Arrays.asList(
+                0xffe57373,
+                0xfff06292,
+                0xffba68c8,
+                0xff9575cd,
+                0xff7986cb,
+                0xff64b5f6,
+                0xff4fc3f7,
+                0xff4dd0e1,
+                0xff4db6ac,
+                0xff81c784,
+                0xffaed581,
+                0xffff8a65,
+                0xffd4e157,
+                0xffffd54f,
+                0xffffb74d,
+                0xffa1887f,
+                0xff90a4ae
+        ));
+    }
+
+    private final List<Integer> mColors;
+    private final Random mRandom;
+
+    public static ColorGenerator create(List<Integer> colorList) {
+        return new ColorGenerator(colorList);
+    }
+
+    private ColorGenerator(List<Integer> colorList) {
+        mColors = colorList;
+        mRandom = new Random(System.currentTimeMillis());
+    }
+
+    public int getRandomColor() {
+        return mColors.get(mRandom.nextInt(mColors.size()));
+    }
+
+    public int getColor(Object key) {
+        return mColors.get(Math.abs(key.hashCode()) % mColors.size());
+    }
+}
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/.gitignore b/OnTime_Driver_live/lib/TextDrawable/sample/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/build.gradle b/OnTime_Driver_live/lib/TextDrawable/sample/build.gradle
new file mode 100755
index 0000000..85e0728
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.1"
+
+    defaultConfig {
+        applicationId "com.amulyakhare.td"
+        minSdkVersion 10
+        targetSdkVersion 21
+        versionCode 2
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(':library')
+    compile 'com.android.support:appcompat-v7:21.0.3'
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/proguard-rules.pro b/OnTime_Driver_live/lib/TextDrawable/sample/proguard-rules.pro
new file mode 100755
index 0000000..38b532c
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/gardev/android/adt-bundle-linux/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..3f1ab69
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.amulyakhare.td" >
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.amulyakhare.td.sample.MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.amulyakhare.td.sample.ListActivity"
+            android:label="@string/title_activity_check_box" >
+        </activity>
+    </application>
+
+</manifest>
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/ListActivity.java b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/ListActivity.java
new file mode 100755
index 0000000..f9832d7
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/ListActivity.java
@@ -0,0 +1,193 @@
+package com.amulyakhare.td.sample;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.amulyakhare.td.R;
+import com.amulyakhare.td.sample.sample.DrawableProvider;
+import com.amulyakhare.textdrawable.TextDrawable;
+import com.amulyakhare.textdrawable.util.ColorGenerator;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ListActivity extends ActionBarActivity {
+
+    private static final int HIGHLIGHT_COLOR = 0x999be6ff;
+
+    // list of data items
+    private List<ListData> mDataList = Arrays.asList(
+            new ListData("Iron Man"),
+            new ListData("Captain America"),
+            new ListData("James Bond"),
+            new ListData("Harry Potter"),
+            new ListData("Sherlock Holmes"),
+            new ListData("Black Widow"),
+            new ListData("Hawk Eye"),
+            new ListData("Iron Man"),
+            new ListData("Guava"),
+            new ListData("Tomato"),
+            new ListData("Pineapple"),
+            new ListData("Strawberry"),
+            new ListData("Watermelon"),
+            new ListData("Pears"),
+            new ListData("Kiwi"),
+            new ListData("Plums")
+    );
+
+    // declare the color generator and drawable builder
+    private ColorGenerator mColorGenerator = ColorGenerator.MATERIAL;
+    private TextDrawable.IBuilder mDrawableBuilder;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_list);
+
+        Intent intent = getIntent();
+        int type = intent.getIntExtra(MainActivity.TYPE, DrawableProvider.SAMPLE_RECT);
+
+        // initialize the builder based on the "TYPE"
+        switch (type) {
+            case DrawableProvider.SAMPLE_RECT:
+                mDrawableBuilder = TextDrawable.builder()
+                        .rect();
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT:
+                mDrawableBuilder = TextDrawable.builder()
+                        .roundRect(10);
+                break;
+            case DrawableProvider.SAMPLE_ROUND:
+                mDrawableBuilder = TextDrawable.builder()
+                        .round();
+                break;
+            case DrawableProvider.SAMPLE_RECT_BORDER:
+                mDrawableBuilder = TextDrawable.builder()
+                        .beginConfig()
+                            .withBorder(4)
+                        .endConfig()
+                        .rect();
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT_BORDER:
+                mDrawableBuilder = TextDrawable.builder()
+                        .beginConfig()
+                            .withBorder(4)
+                        .endConfig()
+                        .roundRect(10);
+                break;
+            case DrawableProvider.SAMPLE_ROUND_BORDER:
+                mDrawableBuilder = TextDrawable.builder()
+                        .beginConfig()
+                            .withBorder(4)
+                        .endConfig()
+                        .round();
+                break;
+        }
+
+        // init the list view and its adapter
+        ListView listView = (ListView) findViewById(R.id.listView);
+        listView.setAdapter(new SampleAdapter());
+    }
+
+    private class SampleAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return mDataList.size();
+        }
+
+        @Override
+        public ListData getItem(int position) {
+            return mDataList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(final int position, View convertView, ViewGroup parent) {
+            final ViewHolder holder;
+            if (convertView == null) {
+                convertView = View.inflate(ListActivity.this, R.layout.list_item_layout, null);
+                holder = new ViewHolder(convertView);
+                convertView.setTag(holder);
+            } else {
+                holder = (ViewHolder) convertView.getTag();
+            }
+
+            ListData item = getItem(position);
+
+            // provide support for selected state
+            updateCheckedState(holder, item);
+            holder.imageView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    // when the image is clicked, update the selected state
+                    ListData data = getItem(position);
+                    data.setChecked(!data.isChecked);
+                    updateCheckedState(holder, data);
+                }
+            });
+            holder.textView.setText(item.data);
+
+            return convertView;
+        }
+
+        private void updateCheckedState(ViewHolder holder, ListData item) {
+            if (item.isChecked) {
+                holder.imageView.setImageDrawable(mDrawableBuilder.build(" ", 0xff616161));
+                holder.view.setBackgroundColor(HIGHLIGHT_COLOR);
+                holder.checkIcon.setVisibility(View.VISIBLE);
+            }
+            else {
+                TextDrawable drawable = mDrawableBuilder.build(String.valueOf(item.data.charAt(0)), mColorGenerator.getColor(item.data));
+                holder.imageView.setImageDrawable(drawable);
+                holder.view.setBackgroundColor(Color.TRANSPARENT);
+                holder.checkIcon.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    private static class ViewHolder {
+
+        private View view;
+
+        private ImageView imageView;
+
+        private TextView textView;
+
+        private ImageView checkIcon;
+
+        private ViewHolder(View view) {
+            this.view = view;
+            imageView = (ImageView) view.findViewById(R.id.imageView);
+            textView = (TextView) view.findViewById(R.id.textView);
+            checkIcon = (ImageView) view.findViewById(R.id.check_icon);
+        }
+    }
+
+    private static class ListData {
+
+        private String data;
+
+        private boolean isChecked;
+
+        public ListData(String data) {
+            this.data = data;
+        }
+
+        public void setChecked(boolean isChecked) {
+            this.isChecked = isChecked;
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/MainActivity.java b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/MainActivity.java
new file mode 100755
index 0000000..fd2ca43
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/MainActivity.java
@@ -0,0 +1,119 @@
+package com.amulyakhare.td.sample;
+
+import android.content.Intent;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.*;
+
+import com.amulyakhare.td.R;
+import com.amulyakhare.td.sample.sample.DataItem;
+import com.amulyakhare.td.sample.sample.DataSource;
+
+public class MainActivity extends ActionBarActivity implements AdapterView.OnItemClickListener {
+
+    public static final String TYPE = "TYPE";
+    private DataSource mDataSource;
+    private ListView mListView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        mListView = (ListView) findViewById(R.id.listView);
+        mDataSource = new DataSource(this);
+        mListView.setAdapter(new SampleAdapter());
+        mListView.setOnItemClickListener(this);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        DataItem item = (DataItem) mListView.getItemAtPosition(position);
+
+        // if navigation is supported, open the next activity
+        if (item.getNavigationInfo() != DataSource.NO_NAVIGATION) {
+            Intent intent = new Intent(this, ListActivity.class);
+            intent.putExtra(TYPE, item.getNavigationInfo());
+            startActivity(intent);
+        }
+    }
+
+    private class SampleAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return mDataSource.getCount();
+        }
+
+        @Override
+        public DataItem getItem(int position) {
+            return mDataSource.getItem(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder holder;
+            if (convertView == null) {
+                convertView = View.inflate(MainActivity.this, R.layout.list_item_layout, null);
+                holder = new ViewHolder(convertView);
+                convertView.setTag(holder);
+            } else {
+                holder = (ViewHolder) convertView.getTag();
+            }
+
+            DataItem item = getItem(position);
+
+            final Drawable drawable = item.getDrawable();
+            holder.imageView.setImageDrawable(drawable);
+            holder.textView.setText(item.getLabel());
+
+            // if navigation is supported, show the ">" navigation icon
+            if (item.getNavigationInfo() != DataSource.NO_NAVIGATION) {
+                holder.textView.setCompoundDrawablesWithIntrinsicBounds(null,
+                        null,
+                        getResources().getDrawable(R.drawable.ic_action_next_item),
+                        null);
+            }
+            else {
+                holder.textView.setCompoundDrawablesWithIntrinsicBounds(null,
+                        null,
+                        null,
+                        null);
+            }
+
+            // fix for animation not playing for some below 4.4 devices
+            if (drawable instanceof AnimationDrawable) {
+                holder.imageView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        ((AnimationDrawable) drawable).stop();
+                        ((AnimationDrawable) drawable).start();
+                    }
+                });
+            }
+
+            return convertView;
+        }
+    }
+
+    private static class ViewHolder {
+
+        private ImageView imageView;
+
+        private TextView textView;
+
+        private ViewHolder(View view) {
+            imageView = (ImageView) view.findViewById(R.id.imageView);
+            textView = (TextView) view.findViewById(R.id.textView);
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataItem.java b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataItem.java
new file mode 100755
index 0000000..30b247d
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataItem.java
@@ -0,0 +1,34 @@
+package com.amulyakhare.td.sample.sample;
+
+import android.graphics.drawable.Drawable;
+
+/**
+ * @author amulya
+ * @datetime 17 Oct 2014, 3:50 PM
+ */
+public class DataItem {
+
+    private String label;
+
+    private Drawable drawable;
+
+    private int navigationInfo;
+
+    public DataItem(String label, Drawable drawable, int navigationInfo) {
+        this.label = label;
+        this.drawable = drawable;
+        this.navigationInfo = navigationInfo;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public Drawable getDrawable() {
+        return drawable;
+    }
+
+    public int getNavigationInfo() {
+        return navigationInfo;
+    }
+}
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataSource.java b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataSource.java
new file mode 100755
index 0000000..8180a84
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataSource.java
@@ -0,0 +1,99 @@
+package com.amulyakhare.td.sample.sample;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import java.util.ArrayList;
+
+/**
+ * @author amulya
+ * @datetime 17 Oct 2014, 3:49 PM
+ */
+public class DataSource {
+
+    public static final int NO_NAVIGATION = -1;
+
+    private ArrayList<DataItem> mDataSource;
+    private DrawableProvider mProvider;
+
+    public DataSource(Context context) {
+        mProvider = new DrawableProvider(context);
+        mDataSource = new ArrayList<DataItem>();
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_RECT));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND_RECT));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_RECT_BORDER));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND_RECT_BORDER));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND_BORDER));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_MULTIPLE_LETTERS));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_FONT));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_SIZE));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ANIMATION));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_MISC));
+    }
+
+    public int getCount() {
+        return mDataSource.size();
+    }
+
+    public DataItem getItem(int position) {
+        return mDataSource.get(position);
+    }
+
+    private DataItem itemFromType(int type) {
+        String label = null;
+        Drawable drawable = null;
+        switch (type) {
+            case DrawableProvider.SAMPLE_RECT:
+                label = "Rectangle with Text";
+                drawable = mProvider.getRect("A");
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT:
+                label = "Round Corner with Text";
+                drawable = mProvider.getRoundRect("B");
+                break;
+            case DrawableProvider.SAMPLE_ROUND:
+                label = "Round with Text";
+                drawable = mProvider.getRound("C");
+                break;
+            case DrawableProvider.SAMPLE_RECT_BORDER:
+                label = "Rectangle with Border";
+                drawable = mProvider.getRectWithBorder("D");
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT_BORDER:
+                label = "Round Corner with Border";
+                drawable = mProvider.getRoundRectWithBorder("E");
+                break;
+            case DrawableProvider.SAMPLE_ROUND_BORDER:
+                label = "Round with Border";
+                drawable = mProvider.getRoundWithBorder("F");
+                break;
+            case DrawableProvider.SAMPLE_MULTIPLE_LETTERS:
+                label = "Support multiple letters";
+                drawable = mProvider.getRectWithMultiLetter();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_FONT:
+                label = "Support variable font styles";
+                drawable = mProvider.getRoundWithCustomFont();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_SIZE:
+                label = "Support for custom size";
+                drawable = mProvider.getRectWithCustomSize();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_ANIMATION:
+                label = "Support for animations";
+                drawable = mProvider.getRectWithAnimation();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_MISC:
+                label = "Miscellaneous";
+                drawable =  mProvider.getRect("\u03c0");
+                type = NO_NAVIGATION;
+                break;
+        }
+        return new DataItem(label, drawable, type);
+    }
+}
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DrawableProvider.java b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DrawableProvider.java
new file mode 100755
index 0000000..e183b11
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DrawableProvider.java
@@ -0,0 +1,146 @@
+package com.amulyakhare.td.sample.sample;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.InsetDrawable;
+import android.graphics.drawable.LayerDrawable;
+import android.util.TypedValue;
+
+import com.amulyakhare.textdrawable.TextDrawable;
+import com.amulyakhare.textdrawable.util.ColorGenerator;
+
+/**
+ * @author amulya
+ * @datetime 17 Oct 2014, 4:02 PM
+ */
+public class DrawableProvider {
+
+    public static final int SAMPLE_RECT = 1;
+    public static final int SAMPLE_ROUND_RECT = 2;
+    public static final int SAMPLE_ROUND = 3;
+    public static final int SAMPLE_RECT_BORDER = 4;
+    public static final int SAMPLE_ROUND_RECT_BORDER = 5;
+    public static final int SAMPLE_ROUND_BORDER = 6;
+    public static final int SAMPLE_MULTIPLE_LETTERS = 7;
+    public static final int SAMPLE_FONT = 8;
+    public static final int SAMPLE_SIZE = 9;
+    public static final int SAMPLE_ANIMATION = 10;
+    public static final int SAMPLE_MISC = 11;
+
+    private final ColorGenerator mGenerator;
+    private final Context mContext;
+
+    public DrawableProvider(Context context) {
+        mGenerator = ColorGenerator.DEFAULT;
+        mContext = context;
+    }
+
+    public TextDrawable getRect(String text) {
+        return TextDrawable.builder()
+                .buildRect(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRound(String text) {
+        return TextDrawable.builder()
+                .buildRound(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundRect(String text) {
+        return TextDrawable.builder()
+                .buildRoundRect(text, mGenerator.getColor(text), toPx(10));
+    }
+
+    public TextDrawable getRectWithBorder(String text) {
+        return TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(toPx(2))
+                .endConfig()
+                .buildRect(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundWithBorder(String text) {
+        return TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(toPx(2))
+                .endConfig()
+                .buildRound(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundRectWithBorder(String text) {
+        return TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(toPx(2))
+                .endConfig()
+                .buildRoundRect(text, mGenerator.getColor(text), toPx(10));
+    }
+
+    public TextDrawable getRectWithMultiLetter() {
+        String text = "AK";
+        return TextDrawable.builder()
+                .beginConfig()
+                    .fontSize(toPx(20))
+                    .toUpperCase()
+                .endConfig()
+                .buildRect(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundWithCustomFont() {
+        String text = "Bold";
+        return TextDrawable.builder()
+                .beginConfig()
+                    .useFont(Typeface.DEFAULT)
+                    .fontSize(toPx(15))
+                    .textColor(0xfff58559)
+                    .bold()
+                .endConfig()
+                .buildRect(text, Color.DKGRAY /*toPx(5)*/);
+    }
+
+    public Drawable getRectWithCustomSize() {
+        String leftText = "I";
+        String rightText = "J";
+
+        TextDrawable.IBuilder builder = TextDrawable.builder()
+                .beginConfig()
+                    .width(toPx(29))
+                    .withBorder(toPx(2))
+                .endConfig()
+                .rect();
+
+        TextDrawable left = builder
+                .build(leftText, mGenerator.getColor(leftText));
+
+        TextDrawable right = builder
+                .build(rightText, mGenerator.getColor(rightText));
+
+        Drawable[] layerList = {
+                new InsetDrawable(left, 0, 0, toPx(31), 0),
+                new InsetDrawable(right, toPx(31), 0, 0, 0)
+        };
+        return new LayerDrawable(layerList);
+    }
+
+    public Drawable getRectWithAnimation() {
+        TextDrawable.IBuilder builder = TextDrawable.builder()
+                .rect();
+
+        AnimationDrawable animationDrawable = new AnimationDrawable();
+        for (int i = 10; i > 0; i--) {
+            TextDrawable frame = builder.build(String.valueOf(i), mGenerator.getRandomColor());
+            animationDrawable.addFrame(frame, 1200);
+        }
+        animationDrawable.setOneShot(false);
+        animationDrawable.start();
+
+        return animationDrawable;
+    }
+
+    public int toPx(int dp) {
+        Resources resources = mContext.getResources();
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, resources.getDisplayMetrics());
+    }
+}
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_alpha.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_alpha.png
new file mode 100755
index 0000000..8fc3239
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_alpha.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm.9.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm.9.png
new file mode 100755
index 0000000..7cf7352
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm.9.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm1.9.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm1.9.png
new file mode 100755
index 0000000..7d2fcc0
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm1.9.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_action_next_item.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_action_next_item.png
new file mode 100755
index 0000000..67f1482
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_action_next_item.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_launcher.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100755
index 0000000..96a442e
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-ldpi/check_sm.9.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-ldpi/check_sm.9.png
new file mode 100755
index 0000000..1dbf4f7
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-ldpi/check_sm.9.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/check_sm.9.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/check_sm.9.png
new file mode 100755
index 0000000..d44d02c
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/check_sm.9.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_action_next_item.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_action_next_item.png
new file mode 100755
index 0000000..47365a3
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_action_next_item.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_launcher.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100755
index 0000000..359047d
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/check_sm.9.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/check_sm.9.png
new file mode 100755
index 0000000..9981a75
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/check_sm.9.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_action_next_item.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_action_next_item.png
new file mode 100755
index 0000000..5f30474
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_action_next_item.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_launcher.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..71c6d76
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/check_sm.9.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/check_sm.9.png
new file mode 100755
index 0000000..8766797
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/check_sm.9.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_action_next_item.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_action_next_item.png
new file mode 100755
index 0000000..51479d8
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_action_next_item.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_launcher.png b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..4df1894
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/activity_check_box.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/activity_check_box.xml
new file mode 100755
index 0000000..cd5a02c
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/activity_check_box.xml
@@ -0,0 +1,16 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.amulyakhare.td.sample.ListActivity">
+
+    <ImageButton
+        android:id="@+id/imageButton"
+        android:layout_width="100dp"
+        android:layout_height="100dp" />
+
+</RelativeLayout>
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/activity_list.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/activity_list.xml
new file mode 100755
index 0000000..b87aee7
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/activity_list.xml
@@ -0,0 +1,8 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/listView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.amulyakhare.td.sample.MiscActivity">
+
+</ListView>
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/activity_main.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..c3942ff
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/activity_main.xml
@@ -0,0 +1,8 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          android:id="@+id/listView"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          tools:context="com.amulyakhare.td.sample.MiscActivity">
+
+</ListView>
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/list_item_layout.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/list_item_layout.xml
new file mode 100755
index 0000000..bd69f42
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/layout/list_item_layout.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:padding="16dp"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <FrameLayout
+        android:layout_marginRight="16dp"
+        android:layout_width="60dp"
+        android:layout_height="60dp">
+
+        <ImageView
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:id="@+id/imageView"/>
+
+        <ImageView
+            android:visibility="gone"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:src="@drawable/check_sm"
+            android:id="@+id/check_icon"/>
+    </FrameLayout>
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:id="@+id/textView"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/menu/check_box.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/menu/check_box.xml
new file mode 100755
index 0000000..734bf82
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/menu/check_box.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.amulyakhare.td.sample.ListActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/menu/list.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/menu/list.xml
new file mode 100755
index 0000000..77fb30e
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/menu/list.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.amulyakhare.td.sample.MiscActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/menu/main.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/menu/main.xml
new file mode 100755
index 0000000..7fe7424
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/menu/main.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".MainActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values-w820dp/dimens.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values/dimens.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..47c8224
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values/strings.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values/strings.xml
new file mode 100755
index 0000000..6e1ab46
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">TextDrawable Sample</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
+    <string name="title_activity_list">TextDrawable Sample</string>
+    <string name="title_activity_check_box">TextDrawable Sample</string>
+
+</resources>
diff --git a/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values/styles.xml b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values/styles.xml
new file mode 100755
index 0000000..766ab99
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/sample/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+    </style>
+
+</resources>
diff --git a/OnTime_Driver_live/lib/TextDrawable/screens/screen1-material.png b/OnTime_Driver_live/lib/TextDrawable/screens/screen1-material.png
new file mode 100755
index 0000000..b8bfdbb
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/screens/screen1-material.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/screens/screen1.png b/OnTime_Driver_live/lib/TextDrawable/screens/screen1.png
new file mode 100755
index 0000000..8fc9e8f
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/screens/screen1.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/screens/screen2-material.png b/OnTime_Driver_live/lib/TextDrawable/screens/screen2-material.png
new file mode 100755
index 0000000..77c9b6b
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/screens/screen2-material.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/screens/screen2.png b/OnTime_Driver_live/lib/TextDrawable/screens/screen2.png
new file mode 100755
index 0000000..dc0afad
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/screens/screen2.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/screens/screen3.png b/OnTime_Driver_live/lib/TextDrawable/screens/screen3.png
new file mode 100755
index 0000000..7d3e5f3
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/screens/screen3.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/screens/screen4.png b/OnTime_Driver_live/lib/TextDrawable/screens/screen4.png
new file mode 100755
index 0000000..0099dab
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/screens/screen4.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/screens/screen5.png b/OnTime_Driver_live/lib/TextDrawable/screens/screen5.png
new file mode 100755
index 0000000..686c636
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/screens/screen5.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/screens/screen6.png b/OnTime_Driver_live/lib/TextDrawable/screens/screen6.png
new file mode 100755
index 0000000..140e120
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/screens/screen6.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/screens/screen7.png b/OnTime_Driver_live/lib/TextDrawable/screens/screen7.png
new file mode 100755
index 0000000..c3d2b69
Binary files /dev/null and b/OnTime_Driver_live/lib/TextDrawable/screens/screen7.png differ
diff --git a/OnTime_Driver_live/lib/TextDrawable/settings.gradle b/OnTime_Driver_live/lib/TextDrawable/settings.gradle
new file mode 100755
index 0000000..2b99c92
--- /dev/null
+++ b/OnTime_Driver_live/lib/TextDrawable/settings.gradle
@@ -0,0 +1,4 @@
+include ':sample'
+
+include 'library'
+project(':library').projectDir = new File('library')
diff --git a/OnTime_Driver_live/lib/flexbox-layout/.circleci/config.yml b/OnTime_Driver_live/lib/flexbox-layout/.circleci/config.yml
new file mode 100755
index 0000000..7666cf3
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/.circleci/config.yml
@@ -0,0 +1,51 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/code
+    docker:
+      - image: circleci/android:api-29
+    environment:
+      JVM_OPTS: -Xmx3200m
+      MAX_RETRY: 4
+    steps:
+      - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "flexbox/build.gradle" }}
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies
+      - run:
+          name: Set up gcloud service key
+          command: |
+            if [ -n "$GCLOUD_SERVICE_KEY" ]; then echo ${GCLOUD_SERVICE_KEY} | base64 --decode > ${HOME}/client-secret.json ;
+                gcloud config set project ${GCLOUD_PROJECT} ;
+                gcloud auth activate-service-account ${GCLOUD_SERVICE_ACCOUNT} --key-file ${HOME}/client-secret.json ;
+            fi
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "flexbox/build.gradle" }}
+      - run:
+          name: Build apks
+          command: ./gradlew build assembleAndroidTest
+      - run:
+          name: Run Firebase Test Lab
+          command: |
+            if [ -n "$GCLOUD_SERVICE_KEY" ]; then set +e ;
+              counter=0 ;
+              result=1 ;
+              while [ $result != 0 -a $counter -lt $MAX_RETRY ]; do
+                gcloud firebase test android run \
+                  --type instrumentation \
+                  --app demo-playground/build/outputs/apk/debug/demo-playground-debug.apk \
+                  --test flexbox/build/outputs/apk/androidTest/debug/flexbox-debug-androidTest.apk \
+                  --device-ids hammerhead,sailfish \
+                  --os-version-ids 19,21,23,24,25,26 \
+                  --locales en --orientations portrait,landscape \
+                  --results-bucket android-devrel-ci-flexbox \
+                  --timeout 180s ;
+                result=$? ;
+                let counter=counter+1 ;
+              done
+              exit $result ;
+            fi
diff --git a/OnTime_Driver_live/lib/flexbox-layout/.github/issue_template.md b/OnTime_Driver_live/lib/flexbox-layout/.github/issue_template.md
new file mode 100755
index 0000000..cc9edf0
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/.github/issue_template.md
@@ -0,0 +1,15 @@
+- [ ] I have searched [existing issues](https://github.com/google/flexbox-layout/issues) and confirmed this is not a duplicate
+
+## Issues and steps to reproduce
+*Please replace this with steps to reproduce your issue.*
+
+## Expected behavior
+*Please describe what you expected would happen.*
+
+## Version of the flexbox library
+*e.g. 0.2.6, 0.3.0-alpha3*
+
+## Link to code
+*Please link to the code we can use to reproduce this issue.*
+*A complete project we can build/run is preferred, if you can't provide one, please show*
+*us relevant code*
diff --git a/OnTime_Driver_live/lib/flexbox-layout/.github/workflows/gradle-wrapper-validation.yml b/OnTime_Driver_live/lib/flexbox-layout/.github/workflows/gradle-wrapper-validation.yml
new file mode 100755
index 0000000..405a2b3
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
diff --git a/OnTime_Driver_live/lib/flexbox-layout/.gitignore b/OnTime_Driver_live/lib/flexbox-layout/.gitignore
new file mode 100755
index 0000000..113ffcc
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/.gitignore
@@ -0,0 +1,50 @@
+*.iml
+.gradle
+.idea/
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+!.idea/codeStyleSettings.xml
+.DS_Store
+/build
+/captures
+.vscode/
+
+# Taken from Android.gitignore https://github.com/github/gitignore/blob/master/Android.gitignore
+#
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
diff --git a/OnTime_Driver_live/lib/flexbox-layout/CONTRIBUTING.md b/OnTime_Driver_live/lib/flexbox-layout/CONTRIBUTING.md
new file mode 100755
index 0000000..050f92a
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/CONTRIBUTING.md
@@ -0,0 +1,45 @@
+# How to become a contributor and submit your own code
+
+## Contributor License Agreements
+
+We'd love to accept your sample apps and patches! Before we can take them, we
+have to jump a couple of legal hurdles.
+
+Please fill out either the individual or corporate Contributor License Agreement (CLA).
+
+  * If you are an individual writing original source code and you're sure you
+    own the intellectual property, then you'll need to sign an [individual CLA]
+    (https://cla.developers.google.com).
+  * If you work for a company that wants to allow you to contribute your work,
+    then you'll need to sign a [corporate CLA]
+    (https://cla.developers.google.com).
+
+Follow either of the two links above to access the appropriate CLA and
+instructions for how to sign and return it. Once we receive it, we'll be able to
+accept your pull requests.
+
+## Contributing A Patch
+
+1. Submit an issue describing your proposed change to the repo in question.
+1. The repo owner will respond to your issue promptly.
+1. If your proposed change is accepted, and you haven't already done so, sign a
+   Contributor License Agreement (see details above).
+1. Fork the desired repo, develop and test your code changes.
+1. Ensure that your code adheres to the existing style in the sample to which
+   you are contributing. Refer to the
+   [Android Code Style Guide]
+   (https://source.android.com/source/code-style.html) for the
+   recommended coding standards for this organization.
+1. Ensure that your code has an appropriate set of unit tests which all pass.
+1. Submit a pull request.
+
+## Code Style
+
+This repository follows the official Android code style.
+When you send a patch, please try to follow that.
+Here are the example steps to follow:
+
+1. From Android Studio or IntelliJ IDEA, navigate to "Preferences" -> "Editor" -> "Code Style"
+1. Select "Import Scheme" by clicking the gear icon next to the Scheme pull down
+1. Choose <root directory of flexbox-layout>/tool/codeStyleSettings.xml
+1. Create a new scheme by typing a scheme name in the "To" edit box or apply to the current scheme.
diff --git a/OnTime_Driver_live/lib/flexbox-layout/LICENSE b/OnTime_Driver_live/lib/flexbox-layout/LICENSE
new file mode 100755
index 0000000..b397cbe
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018 Google LLC
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/OnTime_Driver_live/lib/flexbox-layout/README.md b/OnTime_Driver_live/lib/flexbox-layout/README.md
new file mode 100755
index 0000000..85c9057
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/README.md
@@ -0,0 +1,407 @@
+# FlexboxLayout
+[ ![Circle CI](https://circleci.com/gh/google/flexbox-layout.svg?style=shield&circle-token=2a42716dfffab73d73c5ce7ed7b3ee620cfa137b) ](https://circleci.com/gh/google/flexbox-layout/tree/main)
+
+FlexboxLayout is a library project which brings the similar capabilities of
+[CSS Flexible Box Layout Module](https://www.w3.org/TR/css-flexbox-1) to Android.
+
+# Installation
+Add the following dependency to your `build.gradle` file:
+
+```
+dependencies {
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
+}
+```
+
+**Starting from 3.0.0, the groupId is changed to `com.google.android.flexbox` in preparation to uploading the artifacts to google maven.
+You can still download the artifacts from jcenter for the past versions with the prior groupId (`com.google.android`), but migrating the library 3.0.0 is recommended.**
+
+Note that the default values for `alignItems` and `alignContent` for `FlexboxLayout` have been changed from `stretch` to `flex_start` starting from 2.0.0, it may break the existing apps.
+Please make sure to set `stretch` explicitly if you want to apply the behavior of `stretch`.
+
+
+Note that starting from 1.1.0, the library is expeced to use with AndroidX. Please migrate to [AndroidX](https://developer.android.com/jetpack/androidx/migrate) if you use 1.1.0 or above.
+
+Please use 1.0.0 if you haven't migrated to AndroidX.
+
+
+# Usage
+There are two ways of using Flexbox in your layout.
+
+## FlexboxLayout
+The first one is `FlexboxLayout` that extends the `ViewGroup` like `LinearLayout` and `RelativeLayout`.
+You can specify the attributes from a layout XML like:
+```xml
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/textview1"
+        android:layout_width="120dp"
+        android:layout_height="80dp"
+        app:layout_flexBasisPercent="50%"
+        />
+
+    <TextView
+        android:id="@+id/textview2"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        app:layout_alignSelf="center"
+        />
+
+    <TextView
+        android:id="@+id/textview3"
+        android:layout_width="160dp"
+        android:layout_height="80dp"
+        app:layout_alignSelf="flex_end"
+        />
+</com.google.android.flexbox.FlexboxLayout>
+```
+
+Or from code like:
+```java
+FlexboxLayout flexboxLayout = (FlexboxLayout) findViewById(R.id.flexbox_layout);
+flexboxLayout.setFlexDirection(FlexDirection.ROW);
+
+View view = flexboxLayout.getChildAt(0);
+FlexboxLayout.LayoutParams lp = (FlexboxLayout.LayoutParams) view.getLayoutParams();
+lp.setOrder(-1);
+lp.setFlexGrow(2);
+view.setLayoutParams(lp);
+```
+
+## FlexboxLayoutManager (within RecyclerView)
+The second one is `FlexboxLayoutManager` that can be used within `RecyclerView`.
+
+```java
+RecyclerView recyclerView = (RecyclerView) context.findViewById(R.id.recyclerview);
+FlexboxLayoutManager layoutManager = new FlexboxLayoutManager(context);
+layoutManager.setFlexDirection(FlexDirection.COLUMN);
+layoutManager.setJustifyContent(JustifyContent.FLEX_END);
+recyclerView.setLayoutManager(layoutManager);
+```
+
+or for the attributes for the children of the `FlexboxLayoutManager` you can do like:
+
+```java
+mImageView.setImageDrawable(drawable);
+ViewGroup.LayoutParams lp = mImageView.getLayoutParams();
+if (lp instanceof FlexboxLayoutManager.LayoutParams) {
+    FlexboxLayoutManager.LayoutParams flexboxLp = (FlexboxLayoutManager.LayoutParams) lp;
+    flexboxLp.setFlexGrow(1.0f);
+    flexboxLp.setAlignSelf(AlignSelf.FLEX_END);
+}
+```
+
+The advantage of using `FlexboxLayoutManager` is that it recycles the views that go off the screen
+for reuse for the views that are appearing as the user scrolls instead of inflating every individual view,
+which consumes much less memory especially when the number of items contained in the Flexbox container is large.
+
+![FlexboxLayoutManager in action](/assets/flexbox-layoutmanager.gif)
+
+
+## Supported attributes/features comparison
+Due to some characteristics of `RecyclerView`, some Flexbox attributes are not available/not implemented
+to the `FlexboxLayoutManager`.
+Here is a quick overview of the attributes/features comparison between the two implementations.
+
+|Attribute / Feature|FlexboxLayout| FlexboxLayoutManager (RecyclerView)|
+| ------- |:-----------:|:----------------------------------:|
+|flexDirection|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|flexWrap|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png) (except `wrap_reverse`)|
+|justifyContent|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|alignItems|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|alignContent|![Check](/assets/pngs/check_green_small.png)| - |
+|layout_order|![Check](/assets/pngs/check_green_small.png)| - |
+|layout_flexGrow|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_flexShrink|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_alignSelf|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_flexBasisPercent|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_(min/max)Width|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_(min/max)Height|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_wrapBefore|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|Divider|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|View recycling| - |![Check](/assets/pngs/check_green_small.png)|
+|Scrolling| *1 |![Check](/assets/pngs/check_green_small.png)|
+
+*1 Partially possible by wrapping it with `ScrollView`. But it isn't likely to work with a large set
+   of views inside the layout. Because it doesn't consider view recycling.
+
+# Supported attributes
+
+## Attributes for the FlexboxLayout:
+
+* __flexDirection__
+  * This attribute determines the direction of the main axis (and the cross axis, perpendicular to the main axis). The direction children items are placed inside the Flexbox layout.
+  Possible values are:
+    * row (default)
+    * row_reverse
+    * column
+    * column_reverse
+
+    ![Flex Direction explanation](/assets/flex-direction.gif)
+
+* __flexWrap__
+  * This attribute controls whether the flex container is single-line or multi-line, and the
+  direction of the cross axis. Possible values are:
+    * nowrap (default for FlexboxLayout)
+    * wrap (default for FlexboxLayoutManager)
+    * wrap_reverse (not supported by FlexboxLayoutManager)
+
+    ![Flex Wrap explanation](/assets/flex-wrap.gif)
+
+* __justifyContent__
+  * This attribute controls the alignment along the main axis. Possible values are:
+    * flex_start (default)
+    * flex_end
+    * center
+    * space_between
+    * space_around
+    * space_evenly
+
+    ![Justify Content explanation](/assets/justify-content.gif)
+
+* __alignItems__
+  * This attribute controls the alignment along the cross axis. Possible values are:
+    * flex_start (default for FlexboxLayout)
+    * flex_end
+    * center
+    * baseline
+    * stretch (default for FlexboxLayoutManager)
+
+    ![Align Items explanation](/assets/align-items.gif)
+
+* __alignContent__
+  * This attribute controls the alignment of the flex lines in the flex container. Possible values
+  are:
+    * flex_start (default)
+    * flex_end
+    * center
+    * space_between
+    * space_around
+    * stretch
+
+    ![Align Content explanation](/assets/align-content.gif)
+
+* __showDividerHorizontal__ (one or more of `none | beginning | middle | end`)
+* __dividerDrawableHorizontal__ (reference to a drawable)
+  * Puts horizontal dividers between flex lines (or flex items when flexDirection
+  is set to `column` or `column_rebase`).
+  
+* __showDividerVertical__ (one or more of `none | beginning | middle | end`)
+* __dividerDrawableVertical__ (reference to a drawable)
+  * Puts vertical dividers between flex items (or flex lines when flexDirection
+  is set to `column` or `column_rebase`).
+
+* __showDivider__ (one or more of `none | beginning | middle | end`)
+* __dividerDrawable__ (reference to a drawable)
+  * Shorthand for setting both horizontal and vertical dividers. Note that if used with other attributes
+  (such as `justifyContent="space_around"` or `alignContent="space_between"` ... etc) for putting 
+  spaces between flex lines or flex items, you may see unexpected spaces. Please avoid using these
+  at the same time.
+  
+  Example of putting both vertical and horizontal dividers.
+  
+  `res/drawable/divider.xml`
+  ```xml
+  <shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size
+        android:width="8dp"
+        android:height="12dp" />
+    <solid android:color="#44A444" />
+  </shape> 
+  ```
+  
+  `res/layout/content_main.xml`
+  ```xml
+  <com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:flexWrap="wrap"
+    app:showDivider="beginning|middle"
+    app:dividerDrawable="@drawable/divider" >
+
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="220dp"
+        android:layout_height="80dp"
+        android:text="1" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="120dp"
+        android:layout_height="80dp"
+        android:text="2" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="160dp"
+        android:layout_height="80dp"
+        android:text="3" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:text="4" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="5" />
+  ```
+  
+  ![Dividers beginning and middle](/assets/divider-beginning-middle.png)
+
+
+## Attributes for the children of a FlexboxLayout
+
+* __layout_order__ (integer)
+  * This attribute can change how the ordering of the children views are laid out.
+  By default, children are displayed and laid out in the same order as they appear in the
+  layout XML. If not specified, `1` is set as a default value.
+
+    ![Order explanation](/assets/layout_order.gif)
+
+* __layout_flexGrow__ (float)
+  * This attribute determines how much this child will grow if positive free space is
+  distributed relative to the rest of other flex items included in the same flex line.
+  If a flex item has a positive `layout_flexGrow` value, the item will take up the remaining
+  space in the flex line. If multiple flex items in the same flex line have positive `layout_flexGrow`
+  values, the remaining free space is distributed depending on the proportion of their declared
+  `layout_flexGrow` value. (Similar to the `layout_weight` attribute in the `LinearLayout`)
+  If not specified, `0` is set as a default value.
+
+    ![Flex Grow explanation](/assets/layout_flexGrow.gif)
+
+* __layout_flexShrink__ (float)
+  * This attribute determines how much this child will shrink if negative free space is
+  distributed relative to the rest of other flex items included in the same flex line.
+  If not specified, `1` is set as a default value.
+
+    ![Flex Shrink explanation](/assets/layout_flexShrink.gif)
+
+* __layout_alignSelf__
+  * This attribute determines the alignment along the cross axis (perpendicular to the
+  main axis). The alignment in the same direction can be determined by the
+  `alignItems` in the parent, but if this is set to other than
+  `auto`, the cross axis alignment is overridden for this child. Possible values are:
+    * auto (default)
+    * flex_start
+    * flex_end
+    * center
+    * baseline
+    * stretch
+
+    ![Align Self explanation](/assets/layout_alignSelf.gif)
+
+* __layout_flexBasisPercent__ (fraction)
+  * The initial flex item length in a fraction format relative to its parent.
+  The initial main size of this child view is trying to be expanded as the specified
+  fraction against the parent main size.
+  If this value is set, the length specified from `layout_width`
+  (or `layout_height`) is overridden by the calculated value from this attribute.
+  This attribute is only effective when the parent's length is definite (MeasureSpec mode is
+  `MeasureSpec.EXACTLY`). The default value is `-1`, which means not set.
+
+    ![Flex basis percent explanation](/assets/layout_flexBasisPercent.gif)
+
+* __layout_minWidth__ / __layout_minHeight__ (dimension)
+  * These attributes impose minimum size constraints for the children of FlexboxLayout.
+  A child view won't shrink less than the value of these attributes (varies based on the
+  `flexDirection` attribute as to which attribute imposes the size constraint along the
+  main axis) regardless of the `layout_flexShrink` attribute.
+
+    ![Min width explanation](/assets/layout_minWidth.gif)
+
+* __layout_maxWidth__ / __layout_maxHeight__ (dimension)
+  * These attributes impose maximum size constraints for the children of FlexboxLayout.
+  A child view won't be expanded more than the value of these attributes (varies based on the
+  `flexDirection` attribute as to which attribute imposes the size constraint along the
+  main axis) regardless of the `layout_flexGrow` attribute.
+
+    ![Max width explanation](/assets/layout_maxWidth.gif)
+
+* __layout_wrapBefore__ (boolean)
+  * This attribute forces a flex line wrapping, the default value is `false`.
+  i.e. if this is set to `true` for a
+  flex item, the item will become the first item of a flex line. (A wrapping happens
+  regardless of the flex items being processed in the previous flex line)
+  This attribute is ignored if the `flex_wrap` attribute is set to `nowrap`.
+  The equivalent attribute isn't defined in the original CSS Flexible Box Module
+  specification, but having this attribute is useful for Android developers. For example, to flatten
+  the layouts when building a grid-like layout or for a situation where developers want
+  to put a new flex line to make a semantic difference from the previous one, etc.
+
+    ![Wrap before explanation](/assets/layout_wrapBefore.gif)
+
+# Others
+
+## Known differences from the original CSS specification
+This library tries to achieve the same capabilities of the original
+[Flexible Box specification](https://www.w3.org/TR/css-flexbox-1) as much as possible,
+but due to some reasons such as the way specifying attributes can't be the same between
+CSS and Android XML, there are some known differences from the original specification.
+
+(1) There is no [flex-flow](https://www.w3.org/TR/css-flexbox-1/#flex-flow-property)
+equivalent attribute
+  * Because `flex-flow` is a shorthand for setting the `flex-direction` and `flex-wrap` properties,
+  specifying two attributes from a single attribute is not practical in Android.
+
+(2) There is no [flex](https://www.w3.org/TR/css-flexbox-1/#flex-property) equivalent attribute
+  * Likewise `flex` is a shorthand for setting the `flex-grow`, `flex-shrink` and `flex-basis`,
+  specifying those attributes from a single attribute is not practical.
+
+(3) `layout_flexBasisPercent` is introduced instead of
+  [flexBasis](https://www.w3.org/TR/css-flexbox-1/#flex-basis-property)
+  * Both `layout_flexBasisPercent` in this library and `flex-basis` property in the CSS are used to
+  determine the initial length of an individual flex item. The `flex-basis` property accepts width
+  values such as `1em`, `10px`, and `content` as strings as well as percentage values such as
+  `10%` and `30%`. `layout_flexBasisPercent` only accepts percentage values.
+  However, specifying initial fixed width values can be done by specifying width (or height) values in
+  layout_width (or layout_height, varies depending on the `flexDirection`). Also, the same
+  effect can be done by specifying "wrap_content" in layout_width (or layout_height) if
+  developers want to achieve the same effect as 'content'. Thus, `layout_flexBasisPercent` only
+  accepts percentage values, which can't be done through layout_width (or layout_height) for
+  simplicity.
+
+(4) `layout_wrapBefore` is introduced.
+  * The equivalent attribute doesn't exist in the CSS Flexible Box Module specification,
+  but as explained above, Android developers will benefit by having this attribute for having
+  more control over when a wrapping happens.
+
+(5) Default values for `alignItems` and `alignContent` are set to `flex_start` instead of `stretch`.
+  * Setting `stretch` for the `alignItems` is expensive because the children of `FlexboxLayout` are measured more than twice. The difference is more obvious when the layout hierarchy is deeply nested.
+
+## Xamarin Binding
+Xamarin binding is now available on [NuGet](https://www.nuget.org/packages/FlexboxLayoutXamarinBindingAndroid/) thanks to [@btripp](https://github.com/btripp)
+
+## Demo apps
+### Flexbox Playground demo app
+The `demo-playground` module works as a playground demo app for trying various values for the supported attributes.
+You can install it by
+```
+./gradlew demo-playground:installDebug
+```
+
+### Cat gallery demo app
+The `demo-cat-gallery` module showcases the usage of the FlexboxLayoutManager inside the RecyclerView
+that handles various sizes of views aligned nicely regardless of the device width like the
+Google Photo app without loading all the images on the memory.
+Thus compared to using the {@link FlexboxLayout}, it's much less likely to abuse the memory,
+which sometimes leads to the OutOfMemoryError.
+```
+./gradlew demo-cat-gallery:installDebug
+```
+
+## How to make contributions
+Please read and follow the steps in [CONTRIBUTING.md](/CONTRIBUTING.md)
+
+## License
+Please see [LICENSE](/LICENSE)
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/align-content.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/align-content.gif
new file mode 100755
index 0000000..235cb5b
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/align-content.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/align-items.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/align-items.gif
new file mode 100755
index 0000000..2fca514
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/align-items.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/divider-beginning-middle.png b/OnTime_Driver_live/lib/flexbox-layout/assets/divider-beginning-middle.png
new file mode 100755
index 0000000..f67560d
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/divider-beginning-middle.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/flex-direction.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/flex-direction.gif
new file mode 100755
index 0000000..0d556bf
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/flex-direction.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/flex-wrap.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/flex-wrap.gif
new file mode 100755
index 0000000..352f505
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/flex-wrap.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/flexbox-layoutmanager.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/flexbox-layoutmanager.gif
new file mode 100755
index 0000000..1df2908
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/flexbox-layoutmanager.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/flexbox-visual.png b/OnTime_Driver_live/lib/flexbox-layout/assets/flexbox-visual.png
new file mode 100755
index 0000000..40a91e2
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/flexbox-visual.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-full-width.png b/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-full-width.png
new file mode 100755
index 0000000..f30a62e
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-full-width.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-half.png b/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-half.png
new file mode 100755
index 0000000..5cd6dc9
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-half.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-one-fourth.png b/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-one-fourth.png
new file mode 100755
index 0000000..56e83b3
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-one-fourth.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-three-fourth.png b/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-three-fourth.png
new file mode 100755
index 0000000..ae97ac9
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/fluid-grid/nexus9-three-fourth.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/justify-content.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/justify-content.gif
new file mode 100755
index 0000000..18d3af5
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/justify-content.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/layout_alignSelf.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_alignSelf.gif
new file mode 100755
index 0000000..c5af6a3
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_alignSelf.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/layout_flexBasisPercent.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_flexBasisPercent.gif
new file mode 100755
index 0000000..3c92e91
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_flexBasisPercent.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/layout_flexGrow.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_flexGrow.gif
new file mode 100755
index 0000000..ab730d7
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_flexGrow.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/layout_flexShrink.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_flexShrink.gif
new file mode 100755
index 0000000..612a96f
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_flexShrink.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/layout_maxWidth.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_maxWidth.gif
new file mode 100755
index 0000000..c742093
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_maxWidth.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/layout_minWidth.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_minWidth.gif
new file mode 100755
index 0000000..2c639d5
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_minWidth.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/layout_order.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_order.gif
new file mode 100755
index 0000000..d37e07d
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_order.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/layout_wrapBefore.gif b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_wrapBefore.gif
new file mode 100755
index 0000000..9d9af91
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/layout_wrapBefore.gif differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/assets/pngs/check_green_small.png b/OnTime_Driver_live/lib/flexbox-layout/assets/pngs/check_green_small.png
new file mode 100755
index 0000000..f5fbfa9
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/assets/pngs/check_green_small.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/build.gradle b/OnTime_Driver_live/lib/flexbox-layout/build.gradle
new file mode 100755
index 0000000..9d17521
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/build.gradle
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext {
+        minSdkVersion = 14
+        targetSdkVersion = 30
+        compileSdkVersion = 30
+
+        androidGradlePluginVersion = "4.2.0"
+        androidxAnnotationVersion = "1.2.0"
+        androidxAppCompatVersion = "1.2.0"
+        androidxCoreVersion = "1.3.2"
+        androidxPreferenceVersion = "1.1.1"
+        androidxRecyclerViewVersion = "1.2.0"
+        androidxEspressoVersion = "3.3.0"
+        androidxTestExtVersion = "1.1.2"
+        androidxTestVersion = "1.3.0"
+        junitVersion = "4.13.2"
+        kotlinVersion = "1.4.32"
+        materialVersion = "1.3.0"
+    }
+
+    repositories {
+        jcenter()
+        google()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:$androidGradlePluginVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        google()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
+
+// This allows to disable pre dexing. If not disabled, it makes each CI build slow
+// See https://circleci.com/docs/android/#disable-pre-dexing-to-improve-build-performance
+//     http://tools.android.com/tech-docs/new-build-system/tips#TOC-Improving-Build-Server-performance
+project.ext.preDexLibs = !project.hasProperty('disablePreDex')
+
+subprojects {
+    project.plugins.whenPluginAdded { plugin ->
+        if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        } else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/build.gradle b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/build.gradle
new file mode 100755
index 0000000..10cd543
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/build.gradle
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        applicationId "com.google.android.flexbox.apps.catgallery"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation project(path: ":flexbox")
+    implementation "androidx.appcompat:appcompat:${rootProject.androidxAppCompatVersion}"
+    implementation "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
+    implementation "com.google.android.material:material:${rootProject.materialVersion}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.kotlinVersion}"
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/proguard-rules.pro b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/proguard-rules.pro
new file mode 100755
index 0000000..312658e
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /usr/local/google/home/thagikura/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..9badf19
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.google.android.flexbox.apps.catgallery">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatAdapter.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatAdapter.kt
new file mode 100755
index 0000000..11b2930
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatAdapter.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.apps.catgallery
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * Adapter class that handles the data set with the {@link RecyclerView.LayoutManager}
+ */
+internal class CatAdapter : RecyclerView.Adapter<CatViewHolder>() {
+
+    companion object {
+        private val CAT_IMAGE_IDS = intArrayOf(
+                R.drawable.cat_1,
+                R.drawable.cat_2,
+                R.drawable.cat_3,
+                R.drawable.cat_4,
+                R.drawable.cat_5,
+                R.drawable.cat_6,
+                R.drawable.cat_7,
+                R.drawable.cat_8,
+                R.drawable.cat_9,
+                R.drawable.cat_10,
+                R.drawable.cat_11,
+                R.drawable.cat_12,
+                R.drawable.cat_13,
+                R.drawable.cat_14,
+                R.drawable.cat_15,
+                R.drawable.cat_16,
+                R.drawable.cat_17,
+                R.drawable.cat_18,
+                R.drawable.cat_19
+        )
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CatViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.viewholder_cat, parent, false)
+        return CatViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: CatViewHolder, position: Int) {
+        val pos = position % CAT_IMAGE_IDS.size
+        holder.bindTo(CAT_IMAGE_IDS[pos])
+    }
+
+    override fun getItemCount() = CAT_IMAGE_IDS.size * 4
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt
new file mode 100755
index 0000000..1778879
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.apps.catgallery
+
+import android.view.View
+import android.widget.ImageView
+import androidx.annotation.DrawableRes
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * ViewHolder that represents a cat image.
+ */
+internal class CatViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    private val imageView: ImageView = itemView.findViewById(R.id.imageview)
+
+    internal fun bindTo(@DrawableRes drawableRes: Int) {
+        imageView.setImageResource(drawableRes)
+        val lp = imageView.layoutParams
+        if (lp is FlexboxLayoutManager.LayoutParams) {
+            lp.flexGrow = 1f
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt
new file mode 100755
index 0000000..bbf1e0b
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.apps.catgallery
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * Launcher Activity for the cat gallery demo app that demonstrates the usage of the
+ * {@link FlexboxLayoutManager} that handles various sizes of views aligned nicely regardless of
+ * the device width like the Google Photo app without loading all the images on the memory.
+ * Thus compared to using the {@link FlexboxLayout}, it's much less likely to abuse the memory,
+ * which some times leads to the OutOfMemoryError.
+ */
+class MainActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val toolbar: Toolbar = findViewById(R.id.toolbar)
+        setSupportActionBar(toolbar)
+
+        val flexboxLayoutManager = FlexboxLayoutManager(this).apply {
+            flexWrap = FlexWrap.WRAP
+            flexDirection = FlexDirection.ROW
+            alignItems = AlignItems.STRETCH
+        }
+
+        val recyclerView: RecyclerView = findViewById(R.id.recyclerview)
+        recyclerView.apply {
+            layoutManager = flexboxLayoutManager
+            adapter = CatAdapter()
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_1.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_1.jpg
new file mode 100755
index 0000000..bf23d09
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_1.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_10.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_10.jpg
new file mode 100755
index 0000000..f030ea7
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_10.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_11.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_11.jpg
new file mode 100755
index 0000000..fa1e644
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_11.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_12.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_12.jpg
new file mode 100755
index 0000000..a0c5f5d
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_12.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_13.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_13.jpg
new file mode 100755
index 0000000..4679ffb
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_13.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_14.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_14.jpg
new file mode 100755
index 0000000..13e7aab
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_14.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_15.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_15.jpg
new file mode 100755
index 0000000..31cc4a1
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_15.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_16.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_16.jpg
new file mode 100755
index 0000000..1af0ec8
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_16.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_17.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_17.jpg
new file mode 100755
index 0000000..a3bcfe9
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_17.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_18.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_18.jpg
new file mode 100755
index 0000000..b35a982
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_18.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_19.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_19.jpg
new file mode 100755
index 0000000..74fa74c
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_19.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_2.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_2.jpg
new file mode 100755
index 0000000..e248def
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_2.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_3.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_3.jpg
new file mode 100755
index 0000000..ecb4452
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_3.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_4.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_4.jpg
new file mode 100755
index 0000000..b43bb2d
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_4.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_5.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_5.jpg
new file mode 100755
index 0000000..9efac65
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_5.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_6.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_6.jpg
new file mode 100755
index 0000000..ae6e72a
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_6.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_7.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_7.jpg
new file mode 100755
index 0000000..7a1680a
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_7.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_8.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_8.jpg
new file mode 100755
index 0000000..86d7347
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_8.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_9.jpg b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_9.jpg
new file mode 100755
index 0000000..8d4f7be
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_9.jpg differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/activity_main.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..e80b356
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/activity_main.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="com.google.android.flexbox.apps.catgallery.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/app_bar_height"
+        android:fitsSystemWindows="true"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/toolbar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true"
+            app:contentScrim="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:layout_collapseMode="pin"
+                app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/content_main"/>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/content_main.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/content_main.xml
new file mode 100755
index 0000000..316888f
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/content_main.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    android:id="@+id/recyclerview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/viewholder_cat.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/viewholder_cat.xml
new file mode 100755
index 0000000..7426446
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/viewholder_cat.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/imageview"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:scaleType="centerCrop"
+    android:layout_margin="1dp"
+    android:contentDescription="@string/content_description_cat_view_holder"/>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..21141fe
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..ee878a6
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..47e7af4
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..fb48540
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..a919b0a
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values-v21/styles.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..4ec0e24
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values-v21/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/colors.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/colors.xml
new file mode 100755
index 0000000..b45d91a
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/dimens.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..bac3851
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/dimens.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <dimen name="app_bar_height">180dp</dimen>
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/strings.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/strings.xml
new file mode 100755
index 0000000..bac6179
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <string name="app_name">Cat Gallery</string>
+    <string name="content_description_cat_view_holder">Cat image</string>
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/styles.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/styles.xml
new file mode 100755
index 0000000..6334ac5
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/styles.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
+
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/build.gradle b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/build.gradle
new file mode 100755
index 0000000..ad350da
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/build.gradle
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        applicationId "com.google.android.apps.flexbox"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation project(":flexbox")
+    implementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
+    implementation "androidx.appcompat:appcompat:${rootProject.androidxAppCompatVersion}"
+    implementation "androidx.preference:preference:${rootProject.androidxPreferenceVersion}"
+    implementation "com.google.android.material:material:${rootProject.materialVersion}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+
+    testImplementation "junit:junit:${rootProject.ext.junitVersion}"
+
+    androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
+    androidTestImplementation "androidx.test:runner:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test:rules:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test.espresso:espresso-core:${rootProject.androidxEspressoVersion}"
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/proguard-rules.pro b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/proguard-rules.pro
new file mode 100755
index 0000000..6ca2aba
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/proguard-rules.pro
@@ -0,0 +1,33 @@
+#
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt
new file mode 100755
index 0000000..6a2d169
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.apps.flexbox.test
+
+import android.content.pm.ActivityInfo
+import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.RadioGroup
+import android.widget.Spinner
+import android.widget.TextView
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import com.google.android.apps.flexbox.R
+import com.google.android.flexbox.*
+import com.google.android.material.navigation.NavigationView
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.core.Is.`is`
+import org.junit.Assert.*
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [MainActivity].
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class MainActivityTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(MainActivity::class.java)
+
+    @Test
+    @FlakyTest
+    fun testAddFlexItem() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val beforeCount = flexboxLayout.childCount
+        onView(withId(R.id.add_fab)).perform(click())
+
+        assertThat(flexboxLayout.childCount, `is`(beforeCount + 1))
+    }
+
+    @Test
+    @FlakyTest
+    fun testRemoveFlexItem() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val beforeCount = flexboxLayout.childCount
+        onView(withId(R.id.remove_fab)).perform(click())
+
+        assertThat(flexboxLayout.childCount, `is`(beforeCount - 1))
+    }
+
+    @Test
+    @FlakyTest
+    fun testConfigurationChange() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.add_fab)).perform(click())
+        onView(withId(R.id.add_fab)).perform(click())
+        onView(withId(R.id.add_fab)).perform(click())
+        val beforeCount = flexboxLayout.childCount
+
+        activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Verify the flex items are restored across the configuration change.
+        assertThat(flexboxLayout.childCount, `is`(beforeCount))
+    }
+
+    @Test
+    @FlakyTest
+    fun testFlexDirectionSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_flex_direction).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val columnPosition = spinnerAdapter.getPosition(activity.getString(R.string.column))
+        activity.runOnUiThread { spinner.setSelection(columnPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val rowReversePosition = spinnerAdapter.getPosition(activity.getString(R.string.row_reverse))
+        activity.runOnUiThread { spinner.setSelection(rowReversePosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+    }
+
+    @Test
+    @FlakyTest
+    fun testFlexWrapSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_flex_wrap).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val wrapReversePosition = spinnerAdapter.getPosition(activity.getString(R.string.wrap_reverse))
+        activity.runOnUiThread { spinner.setSelection(wrapReversePosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+
+        val noWrapPosition = spinnerAdapter.getPosition(activity.getString(R.string.nowrap))
+        activity.runOnUiThread { spinner.setSelection(noWrapPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+    }
+
+    @Test
+    @FlakyTest
+    fun testJustifyContentSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<View>(R.id.nav_view) as NavigationView
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_justify_content).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val spaceBetweenPosition = spinnerAdapter.getPosition(activity.getString(R.string.space_between))
+        activity.runOnUiThread { spinner.setSelection(spaceBetweenPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        val centerPosition = spinnerAdapter.getPosition(activity.getString(R.string.center))
+        activity.runOnUiThread { spinner.setSelection(centerPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+    }
+
+    @Test
+    @FlakyTest
+    fun testAlignItemsSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_align_items).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val baselinePosition = spinnerAdapter.getPosition(activity.getString(R.string.baseline))
+        activity.runOnUiThread { spinner.setSelection(baselinePosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.BASELINE))
+
+        val flexEndPosition = spinnerAdapter.getPosition(activity.getString(R.string.flex_end))
+        activity.runOnUiThread { spinner.setSelection(flexEndPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+    }
+
+    @Test
+    @FlakyTest
+    fun testAlignContentSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_align_content).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val spaceAroundPosition = spinnerAdapter.getPosition(activity.getString(R.string.space_around))
+        activity.runOnUiThread { spinner.setSelection(spaceAroundPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+
+        val stretchPosition = spinnerAdapter.getPosition(activity.getString(R.string.stretch))
+        activity.runOnUiThread { spinner.setSelection(stretchPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeOrder() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_order)).perform(replaceText("3"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = flexboxLayout.getReorderedChildAt(0) as TextView
+        val second = flexboxLayout.getReorderedChildAt(1) as TextView
+        val third = flexboxLayout.getReorderedChildAt(2) as TextView
+
+        assertThat(first.text.toString(), `is`("2"))
+        assertThat(second.text.toString(), `is`("3"))
+        assertThat(third.text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeFlexGrow() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_flex_grow)).perform(replaceText("1"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = activity.findViewById<View>(R.id.textview1) as TextView
+        val second = activity.findViewById<View>(R.id.textview2) as TextView
+        val third = activity.findViewById<View>(R.id.textview3) as TextView
+        assertNotNull(first)
+        assertNotNull(second)
+        assertNotNull(third)
+
+        assertThat(first.width, `is`(flexboxLayout.width - second.width - third.width))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeFlexGrowFloat() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_flex_grow)).perform(replaceText("1.0"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = activity.findViewById<View>(R.id.textview1) as TextView
+        val second = activity.findViewById<View>(R.id.textview2) as TextView
+        val third = activity.findViewById<View>(R.id.textview3) as TextView
+        assertNotNull(first)
+        assertNotNull(second)
+        assertNotNull(third)
+
+        assertThat(first.width, `is`(flexboxLayout.width - second.width - third.width))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeFlexBasisPercent() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_flex_basis_percent))
+                .perform(replaceText("50"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = activity.findViewById<TextView>(R.id.textview1)
+        val second = activity.findViewById<TextView>(R.id.textview2)
+        val third = activity.findViewById<TextView>(R.id.textview3)
+        assertNotNull(first)
+        assertNotNull(second)
+        assertNotNull(third)
+
+        assertTrue(first.width - 1 <= flexboxLayout.width / 2 || flexboxLayout.width / 2 <= first.width + 1)
+    }
+
+    @Test
+    @FlakyTest
+    fun testSwitchRecyclerViewFragment() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        assertNull(activity.findViewById(R.id.recyclerview))
+        assertNotNull(activity.findViewById(R.id.flexbox_layout))
+
+        val radioGroup = navigationView.getHeaderView(0)
+                .findViewById<RadioGroup>(R.id.radiogroup_container_implementation)
+        activity.runOnUiThread { radioGroup.check(R.id.radiobutton_recyclerview) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertNotNull(activity.findViewById(R.id.recyclerview))
+        assertNull(activity.findViewById(R.id.flexbox_layout))
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..1bb3c9a
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.google.android.apps.flexbox">
+
+    <uses-sdk tools:overrideLibrary="android.support.v14.preference" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name="com.google.android.flexbox.MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="com.google.android.flexbox.SettingsActivity" />
+    </application>
+
+</manifest>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/Extensions.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/Extensions.kt
new file mode 100755
index 0000000..7f16a7e
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/Extensions.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Context
+
+/**
+ * Convert pixel to dp. Preserve the negative value as it's used for representing
+ * MATCH_PARENT(-1) and WRAP_CONTENT(-2).
+ * Ignore the round error that might happen in dividing the pixel by the density.
+ *
+ * @param pixel   the value in pixel
+ *
+ * @return the converted value in dp
+ */
+fun Context.pixelToDp(pixel: Int): Int {
+    val displayMetrics = this.resources.displayMetrics
+    return if (pixel < 0) pixel else Math.round(pixel / displayMetrics.density)
+}
+
+/**
+ * Convert dp to pixel. Preserve the negative value as it's used for representing
+ * MATCH_PARENT(-1) and WRAP_CONTENT(-2).
+ *
+ * @param dp      the value in dp
+ *
+ * @return the converted value in pixel
+ */
+fun Context.dpToPixel(dp: Int): Int {
+    val displayMetrics = this.resources.displayMetrics
+    return if (dp < 0) dp else Math.round(dp * displayMetrics.density)
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt
new file mode 100755
index 0000000..26b8330
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.apps.flexbox.R
+
+/**
+ * [RecyclerView.Adapter] implementation for [FlexItemViewHolder].
+ */
+internal class FlexItemAdapter(private val activity: AppCompatActivity,
+                               private val flexContainer: FlexContainer)
+    : RecyclerView.Adapter<FlexItemViewHolder>() {
+
+    private val layoutParams = mutableListOf<FlexboxLayoutManager.LayoutParams>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FlexItemViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.viewholder_flex_item, parent, false)
+
+        return FlexItemViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: FlexItemViewHolder, position: Int) {
+        val adapterPosition = holder.adapterPosition
+        // TODO: More optimized set the click listener inside the view holder
+        holder.itemView.setOnClickListener(FlexItemClickListener(activity,
+                FlexItemChangedListenerImplRecyclerView(flexContainer, this),
+                adapterPosition))
+        holder.bindTo(layoutParams[position])
+    }
+
+    fun addItem(lp: FlexboxLayoutManager.LayoutParams) {
+        layoutParams.add(lp)
+        notifyItemInserted(layoutParams.size - 1)
+    }
+
+    fun removeItem(position: Int) {
+        if (position < 0 || position >= layoutParams.size) {
+            return
+        }
+        layoutParams.removeAt(position)
+        notifyItemRemoved(layoutParams.size)
+        notifyItemRangeChanged(position, layoutParams.size)
+    }
+
+    val items get() = layoutParams
+
+    override fun getItemCount() = layoutParams.size
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListener.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListener.kt
new file mode 100755
index 0000000..979cc2c
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListener.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+/**
+ * A listener that listens to the change of a flex item
+ */
+internal interface FlexItemChangedListener {
+
+    fun onFlexItemChanged(flexItem: FlexItem, viewIndex: Int)
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImpl.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImpl.kt
new file mode 100755
index 0000000..9e25dfc
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImpl.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.ViewGroup
+
+/**
+ * Default implementation for the [FlexItemChangedListener].
+ */
+internal class FlexItemChangedListenerImpl(private val flexContainer: FlexContainer) : FlexItemChangedListener {
+
+    override fun onFlexItemChanged(flexItem: FlexItem, viewIndex: Int) {
+        val view = flexContainer.getFlexItemAt(viewIndex)
+        view.layoutParams = flexItem as ViewGroup.LayoutParams
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt
new file mode 100755
index 0000000..acedf7d
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * Implementation for the [FlexItemChangedListener].
+ * It expects RecyclerView as the underlying flex container implementation.
+ */
+internal class FlexItemChangedListenerImplRecyclerView(private val flexContainer: FlexContainer,
+                                              private val adapter: RecyclerView.Adapter<*>) : FlexItemChangedListener {
+
+    override fun onFlexItemChanged(flexItem: FlexItem, viewIndex: Int) {
+        val view = flexContainer.getFlexItemAt(viewIndex)
+        view.layoutParams = flexItem as ViewGroup.LayoutParams
+        adapter.notifyDataSetChanged()
+        // TODO: An Exception is thrown if notifyItemChanged(int) is used.
+        // Investigate that, but using LinearLayoutManager also produces the same Exception
+        // java.lang.IllegalArgumentException: Called attach on a child which is not detached:
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt
new file mode 100755
index 0000000..6ba866b
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+
+/**
+ * Implementation of the [android.view.View.OnClickListener] when a flex item is clicked in
+ * the Flexbox Playground demo app.
+ */
+internal class FlexItemClickListener(private val activity: AppCompatActivity, private val flexItemChangedListener: FlexItemChangedListener,
+                                     private val viewIndex: Int) : View.OnClickListener {
+
+    override fun onClick(v: View) =
+            FlexItemEditFragment.newInstance(v.layoutParams as FlexItem, viewIndex).apply {
+                setFlexItemChangedListener(flexItemChangedListener)
+            }.show(activity.supportFragmentManager, EDIT_DIALOG_TAG)
+
+    companion object {
+
+        private const val EDIT_DIALOG_TAG = "edit_dialog_tag"
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt
new file mode 100755
index 0000000..5b59832
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt
@@ -0,0 +1,369 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Context
+import android.os.Build
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
+import android.widget.*
+import androidx.fragment.app.DialogFragment
+import com.google.android.apps.flexbox.R
+import com.google.android.flexbox.validators.*
+import com.google.android.material.textfield.TextInputLayout
+
+/**
+ * DialogFragment that changes the properties for a flex item.
+ */
+internal class FlexItemEditFragment : DialogFragment() {
+
+    private lateinit var alignSelfAuto: String
+
+    private lateinit var alignSelfFlexStart: String
+
+    private lateinit var alignSelfFlexEnd: String
+
+    private lateinit var alignSelfCenter: String
+
+    private lateinit var alignSelfBaseline: String
+
+    private lateinit var alignSelfStretch: String
+
+    private var viewIndex: Int = 0
+
+    private lateinit var flexItem: FlexItem
+
+    /**
+     * Instance of a [FlexItem] being edited. At first it's created as another instance from
+     * the [flexItem] because otherwise changes before clicking the ok button will be
+     * reflected if the [flexItem] is changed directly.
+     */
+    private lateinit var flexItemInEdit: FlexItem
+
+    private var flexItemChangedListener: FlexItemChangedListener? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            setStyle(STYLE_NORMAL, android.R.style.Theme_Material_Light_Dialog)
+        } else {
+            setStyle(STYLE_NORMAL, android.R.style.Theme_Dialog)
+        }
+        arguments?.let {
+            flexItem = it.getParcelable(FLEX_ITEM_KEY)!!
+            viewIndex = it.getInt(VIEW_INDEX_KEY)
+        }
+        flexItemInEdit = createNewFlexItem(flexItem)
+
+        activity?.let {
+            alignSelfAuto = it.getString(R.string.auto)
+            alignSelfFlexStart = it.getString(R.string.flex_start)
+            alignSelfFlexEnd = it.getString(R.string.flex_end)
+            alignSelfCenter = it.getString(R.string.center)
+            alignSelfBaseline = it.getString(R.string.baseline)
+            alignSelfStretch = it.getString(R.string.stretch)
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        val view = inflater.inflate(R.layout.fragment_flex_item_edit, container, false)
+        dialog?.setTitle((viewIndex + 1).toString())
+
+        val context = activity ?: return view
+        val orderTextInput: TextInputLayout = view.findViewById(R.id.input_layout_order)
+        val orderEdit: EditText = view.findViewById(R.id.edit_text_order)
+        orderEdit.setText(flexItem.order.toString())
+        orderEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, orderTextInput, IntegerInputValidator(),
+                        R.string.must_be_integer))
+        if (flexItem is FlexboxLayoutManager.LayoutParams) {
+            // Order is not enabled in FlexboxLayoutManager
+            orderEdit.isEnabled = false
+        }
+
+        val flexGrowInput: TextInputLayout = view .findViewById(R.id.input_layout_flex_grow)
+        val flexGrowEdit: EditText = view.findViewById(R.id.edit_text_flex_grow)
+        flexGrowEdit.setText(flexItem.flexGrow.toString())
+        flexGrowEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, flexGrowInput, NonNegativeDecimalInputValidator(),
+                        R.string.must_be_non_negative_float))
+
+        val flexShrinkInput: TextInputLayout = view.findViewById(R.id.input_layout_flex_shrink)
+        val flexShrinkEdit: EditText = view.findViewById(R.id.edit_text_flex_shrink)
+        flexShrinkEdit.setText(flexItem.flexShrink.toString())
+        flexShrinkEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, flexShrinkInput, NonNegativeDecimalInputValidator(),
+                        R.string.must_be_non_negative_float))
+
+        val flexBasisPercentInput: TextInputLayout =
+                view.findViewById(R.id.input_layout_flex_basis_percent)
+        val flexBasisPercentEdit: EditText = view.findViewById(R.id.edit_text_flex_basis_percent)
+        if (flexItem.flexBasisPercent != FlexboxLayout.LayoutParams.FLEX_BASIS_PERCENT_DEFAULT) {
+            flexBasisPercentEdit
+                    .setText(Math.round(flexItem.flexBasisPercent * 100).toString())
+        } else {
+            flexBasisPercentEdit.setText(flexItem.flexBasisPercent.toInt().toString())
+        }
+        flexBasisPercentEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, flexBasisPercentInput, FlexBasisPercentInputValidator(),
+                        R.string.must_be_minus_one_or_non_negative_integer))
+
+        val widthInput: TextInputLayout = view.findViewById(R.id.input_layout_width)
+        val widthEdit: EditText = view.findViewById(R.id.edit_text_width)
+        widthEdit.setText(context.pixelToDp(flexItem.width).toString())
+        widthEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, widthInput, DimensionInputValidator(),
+                        R.string.must_be_minus_one_or_minus_two_or_non_negative_integer))
+
+        val heightInput: TextInputLayout = view.findViewById(R.id.input_layout_height)
+        val heightEdit: EditText= view.findViewById(R.id.edit_text_height)
+        heightEdit.setText(context.pixelToDp(flexItem.height).toString())
+        heightEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, heightInput, DimensionInputValidator(),
+                        R.string.must_be_minus_one_or_minus_two_or_non_negative_integer))
+
+        val minWidthInput: TextInputLayout = view.findViewById(R.id.input_layout_min_width)
+        val minWidthEdit: EditText = view.findViewById(R.id.edit_text_min_width)
+        minWidthEdit.setText(context.pixelToDp(flexItem.minWidth).toString())
+        minWidthEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, minWidthInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        val minHeightInput: TextInputLayout = view.findViewById(R.id.input_layout_min_height)
+        val minHeightEdit: EditText = view.findViewById(R.id.edit_text_min_height)
+        minHeightEdit.setText(context.pixelToDp(flexItem.minHeight).toString())
+        minHeightEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, minHeightInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        val maxWidthInput: TextInputLayout = view.findViewById(R.id.input_layout_max_width)
+        val maxWidthEdit: EditText = view.findViewById(R.id.edit_text_max_width)
+        maxWidthEdit.setText(context.pixelToDp(flexItem.maxWidth).toString())
+        maxWidthEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, maxWidthInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        val maxHeightInput: TextInputLayout = view.findViewById(R.id.input_layout_max_height)
+        val maxHeightEdit: EditText = view.findViewById(R.id.edit_text_max_height)
+        maxHeightEdit.setText(context.pixelToDp(flexItem.maxHeight).toString())
+        maxHeightEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, maxHeightInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        setNextFocusesOnEnterDown(orderEdit, flexGrowEdit, flexShrinkEdit, flexBasisPercentEdit,
+                widthEdit, heightEdit, minWidthEdit, minHeightEdit, maxWidthEdit, maxHeightEdit)
+
+        val alignSelfSpinner: Spinner = view.findViewById(R.id.spinner_align_self)
+        val arrayAdapter = ArrayAdapter.createFromResource(requireActivity(),
+                R.array.array_align_self, R.layout.spinner_item)
+        alignSelfSpinner.adapter = arrayAdapter
+        alignSelfSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                        id: Long) {
+                flexItemInEdit.alignSelf = when (parent.getItemAtPosition(position).toString()) {
+                    alignSelfAuto -> AlignSelf.AUTO
+                    alignSelfFlexStart -> AlignItems.FLEX_START
+                    alignSelfFlexEnd -> AlignItems.FLEX_END
+                    alignSelfCenter -> AlignItems.CENTER
+                    alignSelfBaseline -> AlignItems.BASELINE
+                    alignSelfStretch -> AlignItems.STRETCH
+                    else -> return
+                }
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>) {
+                // No op
+            }
+        }
+
+        val wrapBeforeCheckBox: CheckBox = view.findViewById(R.id.checkbox_wrap_before)
+        wrapBeforeCheckBox.isChecked = flexItem.isWrapBefore
+        wrapBeforeCheckBox.setOnCheckedChangeListener { _, isChecked ->
+            flexItemInEdit.isWrapBefore = isChecked }
+        val alignSelfPosition = arrayAdapter
+                .getPosition(alignSelfAsString(flexItem.alignSelf))
+        alignSelfSpinner.setSelection(alignSelfPosition)
+
+        view.findViewById<Button>(R.id.button_cancel).setOnClickListener {
+            copyFlexItemValues(flexItem, flexItemInEdit)
+            dismiss()
+        }
+        val okButton: Button = view.findViewById(R.id.button_ok)
+        okButton.setOnClickListener(View.OnClickListener {
+            if (orderTextInput.isErrorEnabled || flexGrowInput.isErrorEnabled ||
+                    flexBasisPercentInput.isErrorEnabled || widthInput.isErrorEnabled ||
+                    heightInput.isErrorEnabled || minWidthInput.isErrorEnabled ||
+                    minHeightInput.isErrorEnabled || maxWidthInput.isErrorEnabled ||
+                    maxHeightInput.isErrorEnabled) {
+                Toast.makeText(activity, R.string.invalid_values_exist, Toast.LENGTH_SHORT)
+                        .show()
+                return@OnClickListener
+            }
+            if (flexItemChangedListener != null) {
+                copyFlexItemValues(flexItemInEdit, flexItem)
+                flexItemChangedListener!!.onFlexItemChanged(flexItem, viewIndex)
+            }
+            dismiss()
+        })
+        return view
+    }
+
+    fun setFlexItemChangedListener(flexItemChangedListener: FlexItemChangedListener) {
+        this.flexItemChangedListener = flexItemChangedListener
+    }
+
+    private fun setNextFocusesOnEnterDown(vararg textViews: TextView) {
+        // This can be done by setting android:nextFocus* as in
+        // https://developer.android.com/training/keyboard-input/navigation.html
+        // But it requires API level 11 as a minimum sdk version. To support the lower level
+        // devices,
+        // doing it programmatically.
+        for (i in textViews.indices) {
+            textViews[i].setOnEditorActionListener { v, actionId, event ->
+                if (actionId == EditorInfo.IME_ACTION_NEXT ||
+                        actionId == EditorInfo.IME_ACTION_DONE ||
+                        actionId == EditorInfo.IME_NULL
+                                && event.action == KeyEvent.ACTION_DOWN
+                                && event.keyCode == KeyEvent.KEYCODE_ENTER) {
+                    if (i + 1 < textViews.size) {
+                        textViews[i + 1].requestFocus()
+                    } else if (i == textViews.size - 1) {
+                        val inputMethodManager = activity?.getSystemService(
+                                Context.INPUT_METHOD_SERVICE) as InputMethodManager?
+                        inputMethodManager?.hideSoftInputFromWindow(v.windowToken, 0)
+                    }
+                }
+                true
+            }
+
+            // Suppress the key focus change by KeyEvent.ACTION_UP of the enter key
+            textViews[i].setOnKeyListener { _, keyCode, event -> keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP }
+        }
+
+    }
+
+    private fun alignSelfAsString(alignSelf: Int): String {
+        return when (alignSelf) {
+            AlignSelf.AUTO -> alignSelfAuto
+            AlignItems.FLEX_START -> alignSelfFlexStart
+            AlignItems.FLEX_END -> alignSelfFlexEnd
+            AlignItems.CENTER -> alignSelfCenter
+            AlignItems.BASELINE -> alignSelfBaseline
+            AlignItems.STRETCH -> alignSelfStretch
+            else -> alignSelfAuto
+        }
+    }
+
+    private inner class FlexEditTextWatcher internal constructor(val context: Context,
+                                                                 val textInputLayout: TextInputLayout,
+                                                                 val inputValidator: InputValidator,
+                                                                 val errorMessageId: Int) : TextWatcher {
+
+        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
+            // No op
+        }
+
+        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+            if (inputValidator.isValidInput(s)) {
+                textInputLayout.isErrorEnabled = false
+                textInputLayout.error = ""
+            } else {
+                textInputLayout.isErrorEnabled = true
+                textInputLayout.error = activity?.resources?.getString(errorMessageId)
+            }
+        }
+
+        override fun afterTextChanged(editable: Editable) {
+            if (textInputLayout.isErrorEnabled || editable.isEmpty() ||
+                    !inputValidator.isValidInput(editable.toString())) {
+                return
+            }
+            val value = editable.toString().toFloatOrNull() ?: return
+            when (textInputLayout.id) {
+                R.id.input_layout_order -> if (flexItemInEdit !is FlexboxLayoutManager.LayoutParams) {
+                    flexItemInEdit.order = value.toInt()
+                } else return
+                R.id.input_layout_flex_grow -> flexItemInEdit.flexGrow = value
+                R.id.input_layout_flex_shrink -> flexItemInEdit.flexShrink = value
+                R.id.input_layout_width -> flexItemInEdit.width = context.dpToPixel(value.toInt())
+                R.id.input_layout_height -> flexItemInEdit.height = context.dpToPixel(value.toInt())
+                R.id.input_layout_flex_basis_percent -> if (value != FlexboxLayout.LayoutParams.FLEX_BASIS_PERCENT_DEFAULT) {
+                    flexItemInEdit.flexBasisPercent = value.toInt() / 100.0f
+                } else {
+                    flexItemInEdit.flexBasisPercent = FlexItem.FLEX_BASIS_PERCENT_DEFAULT
+                }
+                R.id.input_layout_min_width -> flexItemInEdit.minWidth = context.dpToPixel(value.toInt())
+                R.id.input_layout_min_height -> flexItemInEdit.minHeight = context.dpToPixel(value.toInt())
+                R.id.input_layout_max_width -> flexItemInEdit.maxWidth = context.dpToPixel(value.toInt())
+                R.id.input_layout_max_height -> flexItemInEdit.maxHeight = context.dpToPixel(value.toInt())
+                else -> return
+            }
+        }
+    }
+
+    private fun createNewFlexItem(item: FlexItem): FlexItem {
+        if (item is FlexboxLayout.LayoutParams) {
+            val newItem = FlexboxLayout.LayoutParams(item.getWidth(), item.getHeight())
+            copyFlexItemValues(item, newItem)
+            return newItem
+        } else if (item is FlexboxLayoutManager.LayoutParams) {
+            val newItem = FlexboxLayoutManager.LayoutParams(item.getWidth(), item.getHeight())
+            copyFlexItemValues(item, newItem)
+            return newItem
+        }
+        throw IllegalArgumentException("Unknown FlexItem: $item")
+    }
+
+    private fun copyFlexItemValues(from: FlexItem, to: FlexItem) {
+        if (from !is FlexboxLayoutManager.LayoutParams) {
+            to.order = from.order
+        }
+        to.flexGrow = from.flexGrow
+        to.flexShrink = from.flexShrink
+        to.flexBasisPercent = from.flexBasisPercent
+        to.height = from.height
+        to.width = from.width
+        to.maxHeight = from.maxHeight
+        to.minHeight = from.minHeight
+        to.maxWidth = from.maxWidth
+        to.minWidth = from.minWidth
+        to.alignSelf = from.alignSelf
+        to.isWrapBefore = from.isWrapBefore
+    }
+
+    companion object {
+
+        private const val FLEX_ITEM_KEY = "flex_item"
+
+        private const val VIEW_INDEX_KEY = "view_index"
+
+        fun newInstance(flexItem: FlexItem, viewIndex: Int) = FlexItemEditFragment().apply {
+            arguments = Bundle().apply {
+                putParcelable(FLEX_ITEM_KEY, flexItem)
+                putInt(VIEW_INDEX_KEY, viewIndex)
+            }
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt
new file mode 100755
index 0000000..1e9f4a2
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.Gravity
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.apps.flexbox.R
+
+/**
+ * ViewHolder implementation for a flex item.
+ */
+class FlexItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    private val textView: TextView = itemView.findViewById(R.id.textview)
+
+    fun bindTo(params: RecyclerView.LayoutParams) {
+        val adapterPosition = adapterPosition
+        textView.apply {
+            text = (adapterPosition + 1).toString()
+            setBackgroundResource(R.drawable.flex_item_background)
+            gravity = Gravity.CENTER
+            layoutParams = params
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt
new file mode 100755
index 0000000..146299f
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Context
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import com.google.android.apps.flexbox.R
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import java.util.*
+
+/**
+ * Fragment that contains the [FlexboxLayout] as the playground.
+ */
+class FlexboxLayoutFragment : Fragment() {
+
+    private lateinit var flexContainer: FlexboxLayout
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_flexboxlayout, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val activity = activity as MainActivity
+        flexContainer = view.findViewById(R.id.flexbox_layout)
+
+        val fragmentHelper = FragmentHelper(activity, flexContainer)
+        fragmentHelper.initializeViews()
+        if (savedInstanceState != null) {
+            val flexItems = savedInstanceState
+                    .getParcelableArrayList<FlexItem>(FLEX_ITEMS_KEY)!!
+            flexContainer.removeAllViews()
+            for (i in flexItems.indices) {
+                val flexItem = flexItems[i]
+                val textView = createBaseFlexItemTextView(activity, i)
+                textView.layoutParams = flexItem as FlexboxLayout.LayoutParams
+                flexContainer.addView(textView)
+            }
+        }
+        for (i in 0 until flexContainer.flexItemCount) {
+            flexContainer.getFlexItemAt(i).setOnClickListener(
+                    FlexItemClickListener(activity,
+                            FlexItemChangedListenerImpl(flexContainer), i))
+        }
+
+        val addFab: FloatingActionButton = activity.findViewById(R.id.add_fab)
+        addFab.setOnClickListener {
+            val viewIndex = flexContainer.flexItemCount
+            // index starts from 0. New View's index is N if N views ([0, 1, 2, ... N-1])
+            // exist.
+            val textView = createBaseFlexItemTextView(activity, viewIndex)
+            val lp = FlexboxLayout.LayoutParams(
+                    ViewGroup.LayoutParams.WRAP_CONTENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT)
+            fragmentHelper.setFlexItemAttributes(lp)
+            textView.layoutParams = lp
+            textView.setOnClickListener(FlexItemClickListener(activity,
+                    FlexItemChangedListenerImpl(flexContainer), viewIndex))
+            flexContainer.addView(textView)
+        }
+        val removeFab: FloatingActionButton = activity.findViewById(R.id.remove_fab)
+        removeFab.setOnClickListener(View.OnClickListener {
+            if (flexContainer.flexItemCount == 0) {
+                return@OnClickListener
+            }
+            flexContainer.removeViewAt(flexContainer.flexItemCount - 1)
+        })
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        val flexItems = (0 until flexContainer.flexItemCount)
+                .map { flexContainer.getFlexItemAt(it) }
+                .mapTo(ArrayList()) { it.layoutParams as FlexItem }
+        outState.putParcelableArrayList(FLEX_ITEMS_KEY, flexItems)
+    }
+
+    private fun createBaseFlexItemTextView(context: Context, index: Int): TextView {
+        return TextView(context).apply {
+            setBackgroundResource(R.drawable.flex_item_background)
+            text = (index + 1).toString()
+            gravity = Gravity.CENTER
+        }
+    }
+
+    companion object {
+
+        private const val FLEX_ITEMS_KEY = "flex_items_key"
+
+        fun newInstance(): FlexboxLayoutFragment {
+            return FlexboxLayoutFragment()
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt
new file mode 100755
index 0000000..9f9fc3e
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt
@@ -0,0 +1,340 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.SharedPreferences
+import android.view.Menu
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Spinner
+import android.widget.Toast
+import androidx.preference.PreferenceManager
+import com.google.android.apps.flexbox.R
+import com.google.android.material.navigation.NavigationView
+
+/**
+ * Helper class that has the common logic for initializing the Fragment for the play ground demo
+ * such as [FlexboxLayoutFragment] and a Fragment that uses RecyclerView in it.
+ */
+internal class FragmentHelper(private val activity: MainActivity, private val flexContainer: FlexContainer) {
+
+    private lateinit var ROW: String
+
+    private lateinit var COLUMN: String
+
+    private lateinit var ROW_REVERSE: String
+
+    private lateinit var COLUMN_REVERSE: String
+
+    private lateinit var NOWRAP: String
+
+    private lateinit var WRAP: String
+
+    private lateinit var WRAP_REVERSE: String
+
+    private lateinit var FLEX_START: String
+
+    private lateinit var FLEX_END: String
+
+    private lateinit var CENTER: String
+
+    private lateinit var BASELINE: String
+
+    private lateinit var STRETCH: String
+
+    private lateinit var SPACE_BETWEEN: String
+
+    private lateinit var SPACE_AROUND: String
+
+    private lateinit var SPACE_EVENLY: String
+
+    private lateinit var sharedPreferences: SharedPreferences
+
+    fun initializeViews() {
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity)
+        initializeStringResources()
+        val navigationView: NavigationView = activity.findViewById(R.id.nav_view)
+        navigationView.setNavigationItemSelectedListener(activity)
+        val navigationMenu = navigationView.menu
+        initializeFlexDirectionSpinner(navigationMenu)
+        initializeFlexWrapSpinner(navigationMenu)
+        initializeJustifyContentSpinner(navigationMenu)
+        initializeAlignItemsSpinner(navigationMenu)
+        initializeAlignContentSpinner(navigationMenu)
+    }
+
+    private fun initializeStringResources() {
+        ROW = activity.getString(R.string.row)
+        COLUMN = activity.getString(R.string.column)
+        ROW_REVERSE = activity.getString(R.string.row_reverse)
+        COLUMN_REVERSE = activity.getString(R.string.column_reverse)
+        NOWRAP = activity.getString(R.string.nowrap)
+        WRAP = activity.getString(R.string.wrap)
+        WRAP_REVERSE = activity.getString(R.string.wrap_reverse)
+        FLEX_START = activity.getString(R.string.flex_start)
+        FLEX_END = activity.getString(R.string.flex_end)
+        CENTER = activity.getString(R.string.center)
+        BASELINE = activity.getString(R.string.baseline)
+        STRETCH = activity.getString(R.string.stretch)
+        SPACE_BETWEEN = activity.getString(R.string.space_between)
+        SPACE_AROUND = activity.getString(R.string.space_around)
+        SPACE_EVENLY = activity.getString(R.string.space_evenly)
+    }
+
+    /**
+     * Sets the attributes for a [FlexItem] based on the stored default values in
+     * the SharedPreferences.
+
+     * @param flexItem the FlexItem instance
+     * *
+     * @return a FlexItem instance, which attributes from the SharedPreferences are updated
+     */
+    fun setFlexItemAttributes(flexItem: FlexItem): FlexItem {
+        flexItem.width = activity.dpToPixel(readPreferenceAsInteger(activity.getString(R.string.new_width_key), DEFAULT_WIDTH))
+        flexItem.height = activity.dpToPixel(readPreferenceAsInteger(activity.getString(R.string.new_height_key), DEFAULT_HEIGHT))
+        // Order is not supported in the FlexboxLayoutManager
+        if (flexItem !is FlexboxLayoutManager.LayoutParams) {
+            flexItem.order = readPreferenceAsInteger(activity.getString(R.string.new_flex_item_order_key), "1")
+        }
+        flexItem.flexGrow = readPreferenceAsFloat(activity.getString(R.string.new_flex_grow_key), "0.0")
+        flexItem.flexShrink = readPreferenceAsFloat(activity.getString(R.string.new_flex_shrink_key), "1.0")
+        val flexBasisPercent = readPreferenceAsInteger(
+                activity.getString(R.string.new_flex_basis_percent_key), "-1")
+        flexItem.flexBasisPercent = if (flexBasisPercent == -1) -1f else (flexBasisPercent / 100.0).toFloat()
+        return flexItem
+    }
+
+    private fun readPreferenceAsInteger(key: String, defValue: String): Int {
+        return if (sharedPreferences.contains(key)) {
+            sharedPreferences.getString(key, defValue)?.toIntOrNull() ?: defValue.toInt()
+        } else {
+            defValue.toInt()
+        }
+    }
+
+    private fun readPreferenceAsFloat(key: String, defValue: String): Float {
+        return if (sharedPreferences.contains(key)) {
+            sharedPreferences.getString(key, defValue)?.toFloatOrNull() ?: defValue.toFloat()
+        } else {
+            defValue.toFloat()
+        }
+    }
+
+    private fun initializeSpinner(currentValue: Int, menuItemId: Int, navigationMenu: Menu,
+                                  arrayResourceId: Int, listener: AdapterView.OnItemSelectedListener,
+                                  converter: ValueToStringConverter) {
+        val spinner = navigationMenu.findItem(menuItemId).actionView as Spinner
+        val adapter = ArrayAdapter.createFromResource(activity,
+                arrayResourceId, R.layout.spinner_item)
+        spinner.adapter = adapter
+        spinner.onItemSelectedListener = listener
+        val selectedAsString = converter.asString(currentValue)
+        val position = adapter.getPosition(selectedAsString)
+        spinner.setSelection(position)
+    }
+
+    private fun initializeFlexDirectionSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.flexDirection, R.id.menu_item_flex_direction,
+                navigationMenu, R.array.array_flex_direction,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.flexDirection = when (parent.getItemAtPosition(position).toString()) {
+                            ROW -> FlexDirection.ROW
+                            ROW_REVERSE -> FlexDirection.ROW_REVERSE
+                            COLUMN -> FlexDirection.COLUMN
+                            COLUMN_REVERSE -> FlexDirection.COLUMN_REVERSE
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    FlexDirection.ROW -> ROW
+                    FlexDirection.ROW_REVERSE -> ROW_REVERSE
+                    FlexDirection.COLUMN -> COLUMN
+                    FlexDirection.COLUMN_REVERSE -> COLUMN_REVERSE
+                    else -> ROW
+                }
+            }
+        })
+    }
+
+    private fun initializeFlexWrapSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.flexWrap, R.id.menu_item_flex_wrap,
+                navigationMenu, R.array.array_flex_wrap,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.flexWrap = when (parent.getItemAtPosition(position).toString()) {
+                            NOWRAP -> FlexWrap.NOWRAP
+                            WRAP -> FlexWrap.WRAP
+                            WRAP_REVERSE -> if (flexContainer is FlexboxLayoutManager) {
+                                Toast.makeText(activity,
+                                        R.string.wrap_reverse_not_supported,
+                                        Toast.LENGTH_SHORT).show()
+                                return
+                            } else {
+                                FlexWrap.WRAP_REVERSE
+                            }
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    FlexWrap.NOWRAP -> NOWRAP
+                    FlexWrap.WRAP -> WRAP
+                    FlexWrap.WRAP_REVERSE -> WRAP_REVERSE
+                    else -> NOWRAP
+                }
+            }
+        })
+    }
+
+    private fun initializeJustifyContentSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.justifyContent, R.id.menu_item_justify_content,
+                navigationMenu, R.array.array_justify_content,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.justifyContent = when (parent.getItemAtPosition(position).toString()) {
+                            FLEX_START -> JustifyContent.FLEX_START
+                            FLEX_END -> JustifyContent.FLEX_END
+                            CENTER -> JustifyContent.CENTER
+                            SPACE_BETWEEN -> JustifyContent.SPACE_BETWEEN
+                            SPACE_AROUND -> JustifyContent.SPACE_AROUND
+                            SPACE_EVENLY -> JustifyContent.SPACE_EVENLY
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    JustifyContent.FLEX_START -> FLEX_START
+                    JustifyContent.FLEX_END -> FLEX_END
+                    JustifyContent.CENTER -> CENTER
+                    JustifyContent.SPACE_AROUND -> SPACE_AROUND
+                    JustifyContent.SPACE_BETWEEN -> SPACE_BETWEEN
+                    JustifyContent.SPACE_EVENLY -> SPACE_EVENLY
+                    else -> FLEX_START
+                }
+            }
+        })
+    }
+
+    private fun initializeAlignItemsSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.alignItems, R.id.menu_item_align_items,
+                navigationMenu, R.array.array_align_items,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.alignItems = when (parent.getItemAtPosition(position).toString()) {
+                            FLEX_START -> AlignItems.FLEX_START
+                            FLEX_END -> AlignItems.FLEX_END
+                            CENTER -> AlignItems.CENTER
+                            BASELINE -> AlignItems.BASELINE
+                            STRETCH -> AlignItems.STRETCH
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    AlignItems.FLEX_START -> FLEX_START
+                    AlignItems.FLEX_END -> FLEX_END
+                    AlignItems.CENTER -> CENTER
+                    AlignItems.BASELINE -> BASELINE
+                    AlignItems.STRETCH -> STRETCH
+                    else -> STRETCH
+                }
+            }
+        })
+    }
+
+    private fun initializeAlignContentSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.alignContent, R.id.menu_item_align_content,
+                navigationMenu, R.array.array_align_content,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        if (flexContainer is FlexboxLayoutManager) {
+                            Toast.makeText(activity, R.string.align_content_not_supported,
+                                    Toast.LENGTH_SHORT).show()
+                            return
+                        }
+                        flexContainer.alignContent = when (parent.getItemAtPosition(position).toString()) {
+                            FLEX_START -> AlignContent.FLEX_START
+                            FLEX_END -> AlignContent.FLEX_END
+                            CENTER -> AlignContent.CENTER
+                            SPACE_BETWEEN -> AlignContent.SPACE_BETWEEN
+                            SPACE_AROUND -> AlignContent.SPACE_AROUND
+                            STRETCH -> AlignContent.STRETCH
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                when (value) {
+                    AlignContent.FLEX_START -> return FLEX_START
+                    AlignContent.FLEX_END -> return FLEX_END
+                    AlignContent.CENTER -> return CENTER
+                    AlignContent.SPACE_BETWEEN -> return SPACE_BETWEEN
+                    AlignContent.SPACE_AROUND -> return SPACE_AROUND
+                    AlignContent.STRETCH -> return STRETCH
+                    else -> return STRETCH
+                }
+            }
+        })
+    }
+
+    /**
+     * Converter for converting an int value for Flexbox properties to a String.
+     */
+    private interface ValueToStringConverter {
+
+        fun asString(value: Int): String
+    }
+
+    companion object {
+
+        private const val DEFAULT_WIDTH = "120"
+
+        private const val DEFAULT_HEIGHT = "80"
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt
new file mode 100755
index 0000000..7c670ed
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.widget.RadioGroup
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.fragment.app.FragmentManager
+import com.google.android.apps.flexbox.R
+import com.google.android.material.navigation.NavigationView
+
+class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val toolbar: Toolbar = findViewById(R.id.toolbar)
+        setSupportActionBar(toolbar)
+        val drawer: DrawerLayout = findViewById(R.id.drawer_layout)
+        val toggle = ActionBarDrawerToggle(
+                this, drawer, toolbar, R.string.navigation_drawer_open,
+                R.string.navigation_drawer_close)
+        drawer.addDrawerListener(toggle)
+        toggle.syncState()
+
+        val navigationView: NavigationView = findViewById(R.id.nav_view)
+        val radioGroup: RadioGroup = navigationView.getHeaderView(0)
+                .findViewById(R.id.radiogroup_container_implementation)
+        val fragmentManager = supportFragmentManager
+
+        radioGroup.setOnCheckedChangeListener { _, checkedId ->
+            if (checkedId == R.id.radiobutton_viewgroup) {
+                replaceToFlexboxLayoutFragment(fragmentManager)
+            } else {
+                replaceToRecyclerViewFragment(fragmentManager)
+            }
+        }
+
+        if (savedInstanceState == null) {
+            replaceToFlexboxLayoutFragment(fragmentManager)
+        }
+    }
+
+    private fun replaceToFlexboxLayoutFragment(fragmentManager: FragmentManager) {
+        var fragment: FlexboxLayoutFragment? = fragmentManager.findFragmentByTag(FLEXBOXLAYOUT_FRAGMENT) as FlexboxLayoutFragment?
+        if (fragment == null) {
+            fragment = FlexboxLayoutFragment.newInstance()
+        }
+        fragmentManager.beginTransaction()
+                .replace(R.id.container, fragment, FLEXBOXLAYOUT_FRAGMENT).commit()
+    }
+
+    private fun replaceToRecyclerViewFragment(fragmentManager: FragmentManager) {
+        var fragment: RecyclerViewFragment? = fragmentManager.findFragmentByTag(RECYCLERVIEW_FRAGMENT) as RecyclerViewFragment?
+        if (fragment == null) {
+            fragment = RecyclerViewFragment.newInstance()
+        }
+        fragmentManager.beginTransaction()
+                .replace(R.id.container, fragment, RECYCLERVIEW_FRAGMENT).commit()
+    }
+
+    override fun onNavigationItemSelected(item: MenuItem): Boolean {
+        return false
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_main, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id = item.itemId
+
+        if (id == R.id.action_settings) {
+            val intent = Intent(this, SettingsActivity::class.java)
+            startActivity(intent)
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    companion object {
+
+        private const val FLEXBOXLAYOUT_FRAGMENT = "flexboxlayout_fragment"
+
+        private const val RECYCLERVIEW_FRAGMENT = "recyclerview_fragment"
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt
new file mode 100755
index 0000000..474c485
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.apps.flexbox.R
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+
+/**
+ * Fragment that contains the [RecyclerView] and the [FlexboxLayoutManager] as its
+ * LayoutManager for the flexbox playground.
+ */
+internal class RecyclerViewFragment : Fragment() {
+
+    private lateinit var adapter: FlexItemAdapter
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_recyclerview, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val recyclerView: RecyclerView = view.findViewById(R.id.recyclerview)
+        val activity = activity as MainActivity
+        val flexboxLayoutManager = FlexboxLayoutManager(activity)
+        recyclerView.layoutManager = flexboxLayoutManager
+        adapter = FlexItemAdapter(activity, flexboxLayoutManager)
+        recyclerView.adapter = adapter
+        if (savedInstanceState != null) {
+            val layoutParams : List<FlexboxLayoutManager.LayoutParams>? = savedInstanceState
+                    .getParcelableArrayList(FLEX_ITEMS_KEY)
+            layoutParams?.let {
+                for (i in layoutParams.indices) {
+                    adapter.addItem(layoutParams[i])
+                }
+            }
+            adapter.notifyDataSetChanged()
+        }
+        val fragmentHelper = FragmentHelper(activity, flexboxLayoutManager)
+        fragmentHelper.initializeViews()
+
+        val addFab: FloatingActionButton = activity.findViewById(R.id.add_fab)
+        addFab.setOnClickListener {
+            val lp = FlexboxLayoutManager.LayoutParams(
+                    ViewGroup.LayoutParams.WRAP_CONTENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT)
+            fragmentHelper.setFlexItemAttributes(lp)
+            adapter.addItem(lp)
+        }
+        val removeFab: FloatingActionButton = activity.findViewById(R.id.remove_fab)
+        removeFab.setOnClickListener(View.OnClickListener {
+            if (adapter.itemCount == 0) {
+                return@OnClickListener
+            }
+            adapter.removeItem(adapter.itemCount - 1)
+        })
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putParcelableArrayList(FLEX_ITEMS_KEY, ArrayList(adapter.items))
+    }
+
+    companion object {
+
+        private const val FLEX_ITEMS_KEY = "flex_items"
+
+        fun newInstance(): RecyclerViewFragment {
+            return RecyclerViewFragment()
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt
new file mode 100755
index 0000000..8ce4633
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.os.Bundle
+import android.widget.Toast
+import androidx.fragment.app.FragmentActivity
+import androidx.preference.EditTextPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import com.google.android.apps.flexbox.R
+import com.google.android.flexbox.validators.DimensionInputValidator
+import com.google.android.flexbox.validators.FlexBasisPercentInputValidator
+import com.google.android.flexbox.validators.IntegerInputValidator
+import com.google.android.flexbox.validators.NonNegativeDecimalInputValidator
+
+internal class SettingsActivity : FragmentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // Display the fragment as the main content.
+        supportFragmentManager.beginTransaction().replace(android.R.id.content,
+                SettingsFragment()).commit()
+    }
+
+    /**
+     * Fragment for settings.
+     */
+    class SettingsFragment : PreferenceFragmentCompat() {
+
+        override fun onCreatePreferences(savedInstanceState: Bundle?, s: String?) {
+            addPreferencesFromResource(R.xml.new_flex_item_preferences)
+
+            val orderPreference = findPreference(
+                    getString(R.string.new_flex_item_order_key)) as EditTextPreference?
+            orderPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = IntegerInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val flexGrowPreference = findPreference(
+                    getString(R.string.new_flex_grow_key)) as EditTextPreference?
+            flexGrowPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = NonNegativeDecimalInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_non_negative_float,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val flexShrinkPreference = findPreference(
+                    getString(R.string.new_flex_shrink_key)) as EditTextPreference?
+            flexShrinkPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = NonNegativeDecimalInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_non_negative_float,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val flexBasisPercentPreference = findPreference(
+                    getString(R.string.new_flex_basis_percent_key)) as EditTextPreference?
+            flexBasisPercentPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = FlexBasisPercentInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_minus_one_or_non_negative_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val widthPreference = findPreference(
+                    getString(R.string.new_width_key)) as EditTextPreference?
+            widthPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = DimensionInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_minus_one_or_minus_two_or_non_negative_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val heightPreference = findPreference(
+                    getString(R.string.new_height_key)) as EditTextPreference?
+            heightPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = DimensionInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_minus_one_or_minus_two_or_non_negative_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+        }
+
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/DimensionInputValidator.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/DimensionInputValidator.kt
new file mode 100755
index 0000000..ef06a71
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/DimensionInputValidator.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+import android.text.TextUtils
+
+/**
+ * Validator for dimension values including match_parent and wrap_content.
+ */
+class DimensionInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        // -1 represents match_parent, -2 represents wrap_content
+        return !charSequence.isEmpty() && (TextUtils.isDigitsOnly(charSequence) ||
+                charSequence.toString() == "-1" ||
+                charSequence.toString() == "-2")
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FixedDimensionInputValidator.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FixedDimensionInputValidator.kt
new file mode 100755
index 0000000..dacce41
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FixedDimensionInputValidator.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+import android.text.TextUtils
+
+/**
+ * Validator for dimension values.
+ */
+class FixedDimensionInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        return !charSequence.isEmpty() && TextUtils.isDigitsOnly(charSequence)
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FlexBasisPercentInputValidator.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FlexBasisPercentInputValidator.kt
new file mode 100755
index 0000000..52b803a
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FlexBasisPercentInputValidator.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+import android.text.TextUtils
+
+/**
+ * Validator for the flex basis percent attribute.
+ */
+class FlexBasisPercentInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        // -1 represents not set
+        return !charSequence.isEmpty() && (TextUtils.isDigitsOnly(charSequence) || charSequence.toString() == "-1")
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/InputValidator.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/InputValidator.kt
new file mode 100755
index 0000000..2eae6a0
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/InputValidator.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+/**
+ * Interface to verify a given input.
+ */
+interface InputValidator {
+
+    /**
+     * Verifies if the given input is valid.
+
+     * @param charSequence the input to be verified
+     * *
+     * @return `true` if charSequence is valid, `false` otherwise
+     */
+    fun isValidInput(charSequence: CharSequence): Boolean
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/IntegerInputValidator.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/IntegerInputValidator.kt
new file mode 100755
index 0000000..e2af328
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/IntegerInputValidator.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+/**
+ * Validator for the integers.
+ */
+class IntegerInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        return charSequence.toString().toIntOrNull() != null
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/NonNegativeDecimalInputValidator.kt b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/NonNegativeDecimalInputValidator.kt
new file mode 100755
index 0000000..9ddcac8
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/NonNegativeDecimalInputValidator.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+/**
+ * Validator for non negative integers.
+ */
+class NonNegativeDecimalInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        return charSequence.toString().toFloatOrNull() ?: -1f >= 0
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..694179b
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_remove_white_24dp.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..68f65dd
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..3856041
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_remove_white_24dp.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..23a9f6a
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..67bb598
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..d28b711
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..0fdced8
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..52cad9d
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..d64c22e
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..b9222f0
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/flex_item_background.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/flex_item_background.xml
new file mode 100755
index 0000000..fb3d465
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/flex_item_background.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/lightPink" />
+    <stroke android:width="1dp" android:color="#888888"/>
+</shape>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/side_nav_bar.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/side_nav_bar.xml
new file mode 100755
index 0000000..441e87c
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/side_nav_bar.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <gradient
+        android:startColor="#81C784"
+        android:centerColor="#4CAF50"
+        android:endColor="#2E7D32"
+        android:type="linear"
+        android:angle="135"/>
+</shape>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/activity_main.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..107331c
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/activity_main.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start">
+
+    <include
+        layout="@layout/app_bar_main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true"
+        app:headerLayout="@layout/nav_header_main"
+        app:menu="@menu/activity_main_drawer" />
+
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/app_bar_main.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/app_bar_main.xml
new file mode 100755
index 0000000..bf77c7d
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/app_bar_main.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="com.google.android.flexbox.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/content_main" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/remove_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginRight="@dimen/fab_margin"
+        android:layout_marginEnd="@dimen/fab_margin"
+        android:layout_marginBottom="@dimen/second_fab_margin"
+        android:src="@drawable/ic_remove_white_24dp" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/add_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        android:src="@drawable/ic_add_white_24dp" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/content_main.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/content_main.xml
new file mode 100755
index 0000000..f8021fe
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/content_main.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flex_item_edit.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flex_item_edit.xml
new file mode 100755
index 0000000..c1a98be
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flex_item_edit.xml
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginEnd="@dimen/activity_horizontal_margin"
+    android:layout_marginStart="@dimen/activity_horizontal_margin"
+    android:layout_marginTop="@dimen/activity_vertical_margin"
+    android:layout_marginBottom="@dimen/activity_vertical_margin">
+
+    <com.google.android.flexbox.FlexboxLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingEnd="@dimen/margin_medium"
+        android:paddingStart="@dimen/margin_medium"
+        app:flexWrap="wrap">
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_order"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_order"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_order"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_flex_grow"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_flex_grow"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_flex_grow"
+                android:inputType="numberDecimal"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_flex_shrink"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_flex_shrink"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_flex_shrink"
+                android:inputType="numberDecimal"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_flex_basis_percent"
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_flex_basis_percent"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_flex_basis_percent"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_width"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            app:layout_wrapBefore="true"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_width"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_width"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_height"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_height"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_height"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_min_width"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_wrapBefore="true"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_min_width"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_min_width"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_min_height"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_min_height"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_min_height"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_max_width"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_max_width"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_max_width"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_max_height"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_max_height"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_max_height"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <CheckBox
+            android:id="@+id/checkbox_wrap_before"
+            android:layout_width="130dp"
+            android:layout_height="wrap_content"
+            android:text="@string/hint_wrap_before"
+            app:layout_wrapBefore="true"
+            app:layout_flexGrow="1" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_flexGrow="1">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/hint_align_self" />
+
+            <Spinner
+                android:id="@+id/spinner_align_self"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="end" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/button_panel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="bottom"
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/margin_small"
+            android:paddingTop="@dimen/margin_small">
+
+            <View
+                android:id="@+id/spacer"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:visibility="invisible" />
+
+            <Button
+                android:id="@+id/button_cancel"
+                style="@style/DialogButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/cancel" />
+
+            <Button
+                android:id="@+id/button_ok"
+                style="@style/DialogButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/ok" />
+        </LinearLayout>
+    </com.google.android.flexbox.FlexboxLayout>
+</ScrollView>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flexboxlayout.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flexboxlayout.xml
new file mode 100755
index 0000000..26cb55b
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flexboxlayout.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:flexWrap="wrap"
+    tools:showIn="@layout/activity_main">
+
+    <TextView
+        android:id="@+id/textview1"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length2"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/one" />
+
+    <TextView
+        android:id="@+id/textview2"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length3"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/two" />
+
+    <TextView
+        android:id="@+id/textview3"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/three" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_recyclerview.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_recyclerview.xml
new file mode 100755
index 0000000..0820f0a
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_recyclerview.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recyclerview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/nav_header_main.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/nav_header_main.xml
new file mode 100755
index 0000000..108db8c
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/nav_header_main.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/side_nav_bar"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark"
+    android:orientation="vertical"
+    android:gravity="bottom">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/nav_header_vertical_spacing"
+        android:src="@android:drawable/sym_def_app_icon"
+        android:id="@+id/imageView" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/nav_header_vertical_spacing"
+        android:text="@string/app_name"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+    <RadioGroup
+        android:id="@+id/radiogroup_container_implementation"
+        android:checkedButton="@+id/radiobutton_viewgroup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_large">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/underlying_implementation" />
+
+        <RadioButton
+            android:id="@+id/radiobutton_viewgroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/viewgroup" />
+
+        <RadioButton
+            android:id="@+id/radiobutton_recyclerview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/recyclerview" />
+    </RadioGroup>
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_content.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_content.xml
new file mode 100755
index 0000000..84f8ba5
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_align_content"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_items.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_items.xml
new file mode 100755
index 0000000..ae49138
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_items.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_align_items"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_direction.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_direction.xml
new file mode 100755
index 0000000..c5ebffd
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_direction.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_flex_direction"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_wrap.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_wrap.xml
new file mode 100755
index 0000000..c9d7ce3
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_wrap.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_flex_wrap"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_item.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_item.xml
new file mode 100755
index 0000000..531a227
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textSize="13sp"
+    android:gravity="left"
+    android:textColor="@android:color/black"
+    android:paddingTop="@dimen/margin_small"
+    android:paddingBottom="@dimen/margin_small"
+    android:paddingStart="@dimen/margin_tiny"
+    android:paddingLeft="@dimen/margin_tiny"
+    android:paddingEnd="@dimen/margin_tiny"
+    android:paddingRight="@dimen/margin_tiny" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_justify_content.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_justify_content.xml
new file mode 100755
index 0000000..766e94d
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_justify_content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_justify_content"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/viewholder_flex_item.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/viewholder_flex_item.xml
new file mode 100755
index 0000000..e481741
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/layout/viewholder_flex_item.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textview"
+    android:layout_width="@dimen/flex_item_length2"
+    android:layout_height="@dimen/flex_item_length" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/menu/activity_main_drawer.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/menu/activity_main_drawer.xml
new file mode 100755
index 0000000..e44a9b2
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/menu/activity_main_drawer.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <group android:checkableBehavior="none">
+        <item
+            android:id="@+id/menu_item_flex_direction"
+            android:title="@string/flex_direction"
+            app:actionLayout="@layout/spinner_flex_direction" />
+        <item
+            android:id="@+id/menu_item_flex_wrap"
+            android:title="@string/flex_wrap"
+            app:actionLayout="@layout/spinner_flex_wrap" />
+        <item
+            android:id="@+id/menu_item_justify_content"
+            android:title="@string/justify_content"
+            app:actionLayout="@layout/spinner_justify_content" />
+        <item
+            android:id="@+id/menu_item_align_items"
+            android:title="@string/align_items"
+            app:actionLayout="@layout/spinner_align_items" />
+        <item
+            android:id="@+id/menu_item_align_content"
+            android:title="@string/align_content"
+            app:actionLayout="@layout/spinner_align_content" />
+    </group>
+</menu>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/menu/menu_main.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/menu/menu_main.xml
new file mode 100755
index 0000000..e7e043f
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/menu/menu_main.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context="com.google.android.flexbox.MainActivity">
+    <item
+        android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..5cc414a
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..55c8513
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..a12fcf7
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..2b1f4f4
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..2236372
Binary files /dev/null and b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values-v14/styles.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values-v14/styles.xml
new file mode 100755
index 0000000..b1af976
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values-v14/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <style name="AppTheme" parent="AppThemeBase">
+        <!--
+            This is needed to make the app work with the preference-v7 library while keeping
+            material theme on API level 14+.
+            See http://stackoverflow.com/questions/32070670/preferencefragmentcompat-requires-preferencetheme-to-be-set
+        -->
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+    </style>
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values-v21/styles.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..10cb299
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values-v21/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="DialogButton" parent="@android:style/Widget.Material.Button.Borderless.Colored" />
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values-w720dp/dimens.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values-w720dp/dimens.xml
new file mode 100755
index 0000000..30607f7
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values-w720dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+    <dimen name="activity_vertical_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/colors.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/colors.xml
new file mode 100755
index 0000000..2f51f14
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+    <color name="lightPink">#FFCEE1</color>
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/dimens.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..b96866b
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/dimens.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="nav_header_vertical_spacing">16dp</dimen>
+    <dimen name="nav_header_height">160dp</dimen>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="second_fab_margin">92dp</dimen>
+
+    <dimen name="margin_tiny">4dp</dimen>
+    <dimen name="margin_small">8dp</dimen>
+    <dimen name="margin_medium">16dp</dimen>
+    <dimen name="margin_large">32dp</dimen>
+    <dimen name="margin_huge">64dp</dimen>
+
+    <dimen name="flex_item_length">80dp</dimen>
+    <dimen name="flex_item_length2">120dp</dimen>
+    <dimen name="flex_item_length3">160dp</dimen>
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/strings.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/strings.xml
new file mode 100755
index 0000000..64b6604
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/strings.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <string name="app_name">Flexbox Playground</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
+    <string name="one" translatable="false">1</string>
+    <string name="two" translatable="false">2</string>
+    <string name="three" translatable="false">3</string>
+
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+
+    <string name="flex_direction" translatable="false">Flex Direction</string>
+    <string name="flex_wrap" translatable="false">Flex Wrap</string>
+    <string name="justify_content" translatable="false">Justify Content</string>
+    <string name="align_items" translatable="false">Align Items</string>
+    <string name="align_content" translatable="false">Align Content</string>
+
+    <string name="row" translatable="false">Row</string>
+    <string name="row_reverse" translatable="false">Row Reverse</string>
+    <string name="column" translatable="false">Column</string>
+    <string name="column_reverse" translatable="false">Column Reverse</string>
+    <string name="nowrap" translatable="false">Nowrap</string>
+    <string name="wrap" translatable="false">Wrap</string>
+    <string name="wrap_reverse" translatable="false">Wrap Reverse</string>
+    <string name="flex_start" translatable="false">Flex Start</string>
+    <string name="flex_end" translatable="false">Flex End</string>
+    <string name="center" translatable="false">Center</string>
+    <string name="space_between" translatable="false">Space Between</string>
+    <string name="space_around" translatable="false">Space Around</string>
+    <string name="space_evenly" translatable="false">Space Evenly</string>
+    <string name="baseline" translatable="false">Baseline</string>
+    <string name="stretch" translatable="false">Stretch</string>
+    <string name="auto" translatable="false">Auto</string>
+
+    <string-array translatable="false" name="array_flex_direction">
+        <item>@string/row</item>
+        <item>@string/row_reverse</item>
+        <item>@string/column</item>
+        <item>@string/column_reverse</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_flex_wrap">
+        <item>@string/nowrap</item>
+        <item>@string/wrap</item>
+        <item>@string/wrap_reverse</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_justify_content">
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/space_between</item>
+        <item>@string/space_around</item>
+        <item>@string/space_evenly</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_align_items">
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/baseline</item>
+        <item>@string/stretch</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_align_content">
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/space_between</item>
+        <item>@string/space_around</item>
+        <item>@string/stretch</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_align_self">
+        <item>@string/auto</item>
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/baseline</item>
+        <item>@string/stretch</item>
+    </string-array>
+
+    <string name="hint_order">Order</string>
+    <string name="hint_flex_grow">Flex Grow</string>
+    <string name="hint_flex_shrink">Flex Shrink</string>
+    <string name="hint_flex_basis_percent">Flex Basis Percent (-1: not set)</string>
+    <string name="hint_align_self">Align Self</string>
+    <string name="hint_width">Width (-1: match_parent, -2: wrap_content)</string>
+    <string name="hint_height">Height (-1: match_parent, -2: wrap_content)</string>
+    <string name="hint_min_width">Min Width</string>
+    <string name="hint_min_height">Min Height</string>
+    <string name="hint_max_width">Max Width</string>
+    <string name="hint_max_height">Max Height</string>
+    <string name="hint_wrap_before">Wrap Before</string>
+
+    <string name="must_be_non_negative_float">Must be a non-negative float value</string>
+    <string name="must_be_non_negative_integer">Must be a non-negative integer value</string>
+    <string name="must_be_minus_one_or_minus_two_or_non_negative_integer">Must be -1 or -2 or a non-negative integer value</string>
+    <string name="must_be_integer">Must be an integer value</string>
+    <string name="must_be_minus_one_or_non_negative_integer">Must be -1 or a non-negative integer value</string>
+    <string name="invalid_values_exist">Invalid values exist</string>
+
+    <string name="action_settings">Settings</string>
+    <string name="new_flex_items_default">Default values for new flex items</string>
+    <string name="new_flex_items_default_key" translatable="false">new_flex_items_default_key</string>
+    <string name="new_flex_item_order_key" translatable="false">new_flex_item_order_key</string>
+    <string name="new_flex_grow_key" translatable="false">new_flex_grow_key</string>
+    <string name="new_flex_shrink_key" translatable="false">new_flex_shrink_key</string>
+    <string name="new_flex_basis_percent_key" translatable="false">new_flex_basis_percent_key</string>
+    <string name="flex_basis_percent" translatable="false">Flex Basis Percent</string>
+    <string name="flex_basis_percent_summary">(-1: not set)</string>
+    <string name="width">Width</string>
+    <string name="height">Height</string>
+    <string name="size_unit_summary">(-1: match_parent, -2: wrap_content)</string>
+    <string name="new_width_key" translatable="false">new_width_key</string>
+    <string name="new_height_key" translatable="false">new_height_key</string>
+
+    <string name="viewgroup">ViewGroup</string>
+    <string name="recyclerview">RecyclerView</string>
+    <string name="underlying_implementation">Underlying implementation</string>
+    <string name="align_content_not_supported">Setting the alignContent in FlexboxLayoutManager is not supported. Ignoring.</string>
+    <string name="wrap_reverse_not_supported">wrap_reverse is not supporeted in the FlexboxLayoutManager.</string>
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/styles.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/styles.xml
new file mode 100755
index 0000000..4ce82c0
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/values/styles.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppThemeBase" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme" parent="AppThemeBase">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+    <style name="FlexItem">
+        <item name="android:background">@drawable/flex_item_background</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="DialogButton" />
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/xml/new_flex_item_preferences.xml b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/xml/new_flex_item_preferences.xml
new file mode 100755
index 0000000..44ce1ba
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/demo-playground/src/main/res/xml/new_flex_item_preferences.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        android:title="@string/new_flex_items_default"
+        android:key="@string/new_flex_items_default_key">
+        <EditTextPreference
+            android:key="@string/new_flex_item_order_key"
+            android:title="@string/hint_order"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="1" />
+
+        <EditTextPreference
+            android:key="@string/new_flex_grow_key"
+            android:title="@string/hint_flex_grow"
+            android:inputType="numberDecimal"
+            android:persistent="true"
+            android:defaultValue="0.0" />
+
+        <EditTextPreference
+            android:key="@string/new_flex_shrink_key"
+            android:title="@string/hint_flex_shrink"
+            android:inputType="numberDecimal"
+            android:persistent="true"
+            android:defaultValue="1.0" />
+
+        <EditTextPreference
+            android:key="@string/new_flex_basis_percent_key"
+            android:title="@string/flex_basis_percent"
+            android:summary="@string/flex_basis_percent_summary"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="-1" />
+
+        <EditTextPreference
+            android:key="@string/new_width_key"
+            android:title="@string/width"
+            android:summary="@string/size_unit_summary"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="120" />
+
+        <EditTextPreference
+            android:key="@string/new_height_key"
+            android:title="@string/height"
+            android:summary="@string/size_unit_summary"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="80" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/.gitignore b/OnTime_Driver_live/lib/flexbox-layout/flexbox/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/build.gradle b/OnTime_Driver_live/lib/flexbox-layout/flexbox/build.gradle
new file mode 100755
index 0000000..30a00bc
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/build.gradle
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: 'maven-puglisher-plugin.gradle'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "$mavenVersion"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        consumerProguardFiles 'proguard-rules.txt'
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+
+    libraryVariants.all {
+        it.generateBuildConfigProvider.configure { enabled = false }
+    }
+}
+
+dependencies {
+    compileOnly "androidx.core:core:${rootProject.androidxCoreVersion}"
+    compileOnly "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
+
+    testImplementation "junit:junit:${rootProject.junitVersion}"
+
+    androidTestImplementation "androidx.core:core:${rootProject.androidxCoreVersion}"
+    androidTestImplementation "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
+    androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
+    androidTestImplementation "androidx.test.ext:junit:${rootProject.androidxTestExtVersion}"
+    androidTestImplementation "androidx.test:runner:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test:rules:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test.espresso:espresso-core:${rootProject.androidxEspressoVersion}"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.kotlinVersion}"
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/constants.gradle b/OnTime_Driver_live/lib/flexbox-layout/flexbox/constants.gradle
new file mode 100755
index 0000000..fe8fc8f
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/constants.gradle
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ext {
+    projectName = 'flexbox-layout'
+    projectDesc = 'Flexbox for Android'
+
+    githubUrl = 'https://github.com/google/flexbox-layout'
+
+    mavenGroup = 'com.google.android.flexbox'
+    mavenArtifactId = 'flexbox'
+    mavenVersion = '3.0.0'
+
+    bintrayOrg = 'google'
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/maven-puglisher-plugin.gradle b/OnTime_Driver_live/lib/flexbox-layout/flexbox/maven-puglisher-plugin.gradle
new file mode 100755
index 0000000..c6cdcc3
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/maven-puglisher-plugin.gradle
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2021 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'maven-publish'
+apply from: 'constants.gradle'
+
+afterEvaluate {
+
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                groupId = "$mavenGroup"
+                artifactId = "$mavenArtifactId"
+                version = "$mavenVersion"
+
+                artifact androidSourcesJar
+
+                pom {
+                    name = "$projectName"
+                    description = "$projectDesc"
+                    licenses {
+                        license {
+                            name = 'The Apache Software License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                            distribution = 'repo'
+                        }
+                    }
+                    developers {
+                        developer {
+                            name = 'Google'
+                        }
+                    }
+                    scm {
+                        connection = "${githubUrl}.git"
+                        url = githubUrl
+                    }
+                }
+            }
+        }
+    }
+}
+
+task androidSourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from android.sourceSets.main.java.srcDirs
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/proguard-rules.txt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/proguard-rules.txt
new file mode 100755
index 0000000..0d727ed
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/proguard-rules.txt
@@ -0,0 +1,20 @@
+#
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# The FlexboxLayoutManager may be set from a layout xml, in that situation the RecyclerView
+# tries to instantiate the layout manager using reflection.
+# This is to prevent the layout manager from being obfuscated.
+-keepnames public class com.google.android.flexbox.FlexboxLayoutManager
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/AndroidManifest.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/AndroidManifest.xml
new file mode 100755
index 0000000..e0c569e
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<manifest
+    package="com.google.android.flexbox.test"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity android:name=".FlexboxTestActivity"/>
+        <activity android:name=".ConfigChangeActivity"
+                  android:configChanges="orientation|screenSize|keyboardHidden"/>
+    </application>
+
+</manifest>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FakeFlexContainer.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FakeFlexContainer.kt
new file mode 100755
index 0000000..e87637e
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FakeFlexContainer.kt
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.View
+import android.view.ViewGroup
+
+/**
+ * Fake implementation of [FlexContainer].
+ */
+internal class FakeFlexContainer : FlexContainer {
+
+    private val views = mutableListOf<View>()
+
+    private var flexLines = mutableListOf<FlexLine>()
+
+    @FlexDirection
+    private var flexDirection = FlexDirection.ROW
+
+    @FlexWrap
+    private var flexWrap = FlexWrap.WRAP
+
+    @JustifyContent
+    private var justifyContent = JustifyContent.FLEX_START
+
+    @AlignItems
+    private var alignItems = AlignItems.STRETCH
+
+    @AlignContent
+    private var alignContent = AlignContent.STRETCH
+
+    private var maxLine = -1
+
+    override fun getFlexItemCount() = views.size
+
+    override fun getFlexItemAt(index: Int) = views[index]
+
+    override fun getReorderedFlexItemAt(index: Int) = views[index]
+
+    override fun addView(view: View) {
+        views.add(view)
+    }
+
+    override fun addView(view: View, index: Int) {
+        views.add(index, view)
+    }
+
+    override fun removeAllViews() {
+        views.clear()
+    }
+
+    override fun removeViewAt(index: Int) {
+        views.removeAt(index)
+    }
+
+    override fun getFlexDirection() = flexDirection
+
+    override fun setFlexDirection(@FlexDirection flexDirection: Int) {
+        this.flexDirection = flexDirection
+    }
+
+    override fun getFlexWrap() = flexWrap
+
+    override fun setFlexWrap(@FlexWrap flexWrap: Int) {
+        this.flexWrap = flexWrap
+    }
+
+    override fun getJustifyContent() = justifyContent
+
+    override fun setJustifyContent(@JustifyContent justifyContent: Int) {
+        this.justifyContent = justifyContent
+    }
+
+    override fun getAlignContent() = alignContent
+
+    override fun setAlignContent(@AlignContent alignContent: Int) {
+        this.alignContent = alignContent
+    }
+
+    override fun getAlignItems() = alignItems
+
+    override fun setAlignItems(@AlignItems alignItems: Int) {
+        this.alignItems = alignItems
+    }
+
+    override fun getMaxLine(): Int = this.maxLine
+
+    override fun setMaxLine(maxLine: Int) {
+        this.maxLine = maxLine
+    }
+
+    override fun getFlexLines() = flexLines
+
+    override fun isMainAxisDirectionHorizontal(): Boolean {
+        return flexDirection == FlexDirection.ROW || flexDirection == FlexDirection.ROW_REVERSE
+    }
+
+    override fun getDecorationLengthMainAxis(view: View, index: Int, indexInFlexLine: Int) = 0
+
+    override fun getDecorationLengthCrossAxis(view: View) = 0
+
+    override fun getPaddingTop() = 0
+
+    override fun getPaddingLeft() = 0
+
+    override fun getPaddingRight() = 0
+
+    override fun getPaddingBottom() = 0
+
+    override fun getPaddingStart() = 0
+
+    override fun getPaddingEnd() = 0
+
+    override fun getChildWidthMeasureSpec(widthSpec: Int, padding: Int, childDimension: Int): Int {
+        return ViewGroup.getChildMeasureSpec(widthSpec, padding, childDimension)
+    }
+
+    override fun getChildHeightMeasureSpec(heightSpec: Int, padding: Int, childDimension: Int): Int {
+        return ViewGroup.getChildMeasureSpec(heightSpec, padding, childDimension)
+    }
+
+    override fun getLargestMainSize() = flexLines.maxBy { it.mMainSize }?.mMainSize ?: Integer.MIN_VALUE
+
+    override fun getSumOfCrossSize() = flexLines.sumBy { it.mCrossSize }
+
+    override fun onNewFlexItemAdded(view: View, index: Int, indexInFlexLine: Int, flexLine: FlexLine) = Unit
+
+    override fun onNewFlexLineAdded(flexLine: FlexLine) = Unit
+
+    override fun setFlexLines(flexLines: List<FlexLine>) {
+        this.flexLines = flexLines.toMutableList()
+    }
+
+    override fun getFlexLinesInternal() = flexLines
+
+    override fun updateViewCache(position: Int, view: View) = Unit
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt
new file mode 100755
index 0000000..430b9d3
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt
@@ -0,0 +1,613 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.View
+import android.widget.CheckBox
+import android.widget.TextView
+import androidx.core.widget.CompoundButtonCompat
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
+import com.google.android.flexbox.test.FlexboxTestActivity
+import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
+import org.hamcrest.Matchers.`is`
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Unit tests for [FlexboxHelper].
+ */
+@RunWith(AndroidJUnit4::class)
+class FlexboxHelperTest {
+
+    private val LONG_TEXT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do " +
+            "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim " +
+            "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " +
+            "consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum " +
+            "dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, " +
+            "sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(FlexboxTestActivity::class.java)
+
+    private lateinit var flexboxHelper: FlexboxHelper
+
+    private lateinit var flexContainer: FlexContainer
+
+    @Before
+    fun setUp() {
+        flexContainer = FakeFlexContainer()
+        flexboxHelper = FlexboxHelper(flexContainer)
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testCalculateHorizontalFlexLines() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(300, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(400, 100)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexWrap = FlexWrap.WRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+
+        flexboxHelper.ensureIndexToFlexLine(flexContainer.flexItemCount)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+
+        assertEquals(3, result.mFlexLines.size)
+        assertEquals(300, result.mFlexLines[0].mainSize)
+        assertEquals(300, result.mFlexLines[1].mainSize)
+        assertEquals(400, result.mFlexLines[2].mainSize)
+        assertEquals(100, result.mFlexLines[0].crossSize)
+        assertEquals(100, result.mFlexLines[1].crossSize)
+        assertEquals(100, result.mFlexLines[2].crossSize)
+
+        assertNotNull(flexboxHelper.mIndexToFlexLine)
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![0])
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![1])
+        assertEquals(1, flexboxHelper.mIndexToFlexLine!![2])
+        assertEquals(2, flexboxHelper.mIndexToFlexLine!![3])
+
+        val firstLine = result.mFlexLines[0]
+        assertEquals(0, firstLine.mFirstIndex)
+        assertEquals(1, firstLine.mLastIndex)
+        val secondLine = result.mFlexLines[1]
+        assertEquals(2, secondLine.mFirstIndex)
+        assertEquals(2, secondLine.mLastIndex)
+        val thirdLine = result.mFlexLines[2]
+        assertEquals(3, thirdLine.mFirstIndex)
+        assertEquals(3, thirdLine.mLastIndex)
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testCalculateVerticalFlexLines() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexWrap = FlexWrap.WRAP
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+
+        flexboxHelper.ensureIndexToFlexLine(flexContainer.flexItemCount)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+
+        assertEquals(3, result.mFlexLines.size)
+        assertEquals(300, result.mFlexLines[0].mainSize)
+        assertEquals(300, result.mFlexLines[1].mainSize)
+        assertEquals(400, result.mFlexLines[2].mainSize)
+        assertEquals(100, result.mFlexLines[0].crossSize)
+        assertEquals(100, result.mFlexLines[1].crossSize)
+        assertEquals(100, result.mFlexLines[2].crossSize)
+
+        assertNotNull(flexboxHelper.mIndexToFlexLine)
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![0])
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![1])
+        assertEquals(1, flexboxHelper.mIndexToFlexLine!![2])
+        assertEquals(2, flexboxHelper.mIndexToFlexLine!![3])
+
+        val firstLine = result.mFlexLines[0]
+        assertEquals(0, firstLine.mFirstIndex)
+        assertEquals(1, firstLine.mLastIndex)
+        val secondLine = result.mFlexLines[1]
+        assertEquals(2, secondLine.mFirstIndex)
+        assertEquals(2, secondLine.mLastIndex)
+        val thirdLine = result.mFlexLines[2]
+        assertEquals(3, thirdLine.mFirstIndex)
+        assertEquals(3, thirdLine.mLastIndex)
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_row_flexGrowSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        lp2.flexGrow = 1.0f
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(300, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(400, 100)
+        lp4.flexGrow = 2.0f
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.ROW
+        flexContainer.flexWrap = FlexWrap.WRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view1.measuredHeight, `is`(100))
+        // view2 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view2.measuredWidth, `is`(400))
+        assertThat(view2.measuredHeight, `is`(100))
+        assertThat(view3.measuredWidth, `is`(300))
+        assertThat(view3.measuredHeight, `is`(100))
+        // view4 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view4.measuredWidth, `is`(500))
+        assertThat(view4.measuredHeight, `is`(100))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_column_flexGrowSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        lp2.flexGrow = 1.0f
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400)
+        lp4.flexGrow = 2.0f
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        flexContainer.flexWrap = FlexWrap.WRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view1.measuredHeight, `is`(100))
+        assertThat(view2.measuredWidth, `is`(100))
+        // view2 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view2.measuredHeight, `is`(400))
+        assertThat(view3.measuredWidth, `is`(100))
+        assertThat(view3.measuredHeight, `is`(300))
+        assertThat(view4.measuredWidth, `is`(100))
+        // view4 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view4.measuredHeight, `is`(500))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_row_flexShrinkSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(200, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(200, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(200, 100)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.ROW
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Flex shrink is set to 1.0 (default value) for all views.
+        // They should be shrank equally for the amount overflown the width
+        assertThat(view1.measuredWidth, `is`(125))
+        assertThat(view1.measuredHeight, `is`(100))
+        assertThat(view2.measuredWidth, `is`(125))
+        assertThat(view2.measuredHeight, `is`(100))
+        assertThat(view3.measuredWidth, `is`(125))
+        assertThat(view3.measuredHeight, `is`(100))
+        assertThat(view4.measuredWidth, `is`(125))
+        assertThat(view4.measuredHeight, `is`(100))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_column_flexShrinkSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 200)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 200)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 200)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Flex shrink is set to 1.0 (default value) for all views.
+        // They should be shrank equally for the amount overflown the height
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view1.measuredHeight, `is`(125))
+        assertThat(view2.measuredWidth, `is`(100))
+        assertThat(view2.measuredHeight, `is`(125))
+        assertThat(view3.measuredWidth, `is`(100))
+        assertThat(view3.measuredHeight, `is`(125))
+        assertThat(view4.measuredWidth, `is`(100))
+        assertThat(view4.measuredHeight, `is`(125))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_fixedSizeViewAndShrinkable_doNotExceedMaxMainSize() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        lp1.flexShrink = 0f
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Container with WRAP_CONTENT and a max width forces resizable children to shrink
+        // to avoid exceeding max available space.
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view2.measuredWidth, `is`(400))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_twoFixedSizeViewsAndShrinkable_doNotExceedMaxMainSize() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        lp1.flexShrink = 0f
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        val lp3 = FlexboxLayout.LayoutParams(100, 100)
+        val view3 = View(activity)
+        lp3.flexShrink = 0f
+        view3.layoutParams = lp3
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Container with WRAP_CONTENT and a max width forces resizable children to shrink
+        // to avoid exceeding max available space.
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view2.measuredWidth, `is`(300))
+        assertThat(view3.measuredWidth, `is`(100))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_considerCompoundButtonImplicitMinSizeWhenNotSpecified() {
+        val containerWidth = 500
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view1 = CheckBox(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(containerWidth, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // CompoundButton will use its ButtonDrawable minWidth to determine its size when
+        // no minimum width is set on it.
+        val drawableMinWidth = CompoundButtonCompat.getButtonDrawable(view1)!!.minimumWidth
+        val expectedTextWidth = containerWidth - drawableMinWidth
+        assertThat(view1.measuredWidth, `is`(drawableMinWidth))
+        assertThat(view2.measuredWidth, `is`(expectedTextWidth))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_considerCompoundButtonExplicitMinSizeWhenSpecified() {
+        val containerWidth = 500
+        val compoundButtonMinWidth = 150
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        lp1.minWidth = compoundButtonMinWidth
+        val view1 = CheckBox(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(containerWidth, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // CompoundButton will be measured based on its explicitly specified minWidth.
+        val expectedTextWidth = containerWidth - compoundButtonMinWidth
+        assertThat(view1.measuredWidth, `is`(compoundButtonMinWidth))
+        assertThat(view2.measuredWidth, `is`(expectedTextWidth))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineCrossSize_direction_row_alignContent_stretch() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(300, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(400, 100)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.ROW
+        flexContainer.flexWrap = FlexWrap.WRAP
+        flexContainer.alignContent = AlignContent.STRETCH
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+        flexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec, 0)
+        flexboxHelper.stretchViews()
+
+        // align content is set to Align.STRETCH, the cross size for each flex line is stretched
+        // to distribute the remaining free space along the cross axis
+        // (remaining height in this case)
+        assertThat(view1.measuredHeight, isEqualAllowingError(333))
+        assertThat(view2.measuredHeight, isEqualAllowingError(333))
+        assertThat(view3.measuredHeight, isEqualAllowingError(333))
+        assertThat(view4.measuredHeight, isEqualAllowingError(333))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineCrossSize_direction_column_alignContent_stretch() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        flexContainer.flexWrap = FlexWrap.WRAP
+        flexContainer.alignContent = AlignContent.STRETCH
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+        flexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec, 0)
+        flexboxHelper.stretchViews()
+
+        // align content is set to Align.STRETCH, the cross size for each flex line is stretched
+        // to distribute the remaining free space along the cross axis
+        // (remaining width in this case)
+        assertThat(view1.measuredWidth, isEqualAllowingError(333))
+        assertThat(view2.measuredWidth, isEqualAllowingError(333))
+        assertThat(view3.measuredWidth, isEqualAllowingError(333))
+        assertThat(view4.measuredWidth, isEqualAllowingError(333))
+    }
+
+    @Test
+    fun testMakeCombinedLong() {
+        var higher = -1
+        var lower = 10
+        var combined = flexboxHelper.makeCombinedLong(lower, higher)
+        assertThat(flexboxHelper.extractHigherInt(combined), `is`(higher))
+        assertThat(flexboxHelper.extractLowerInt(combined), `is`(lower))
+
+        higher = Integer.MAX_VALUE
+        lower = Integer.MIN_VALUE
+        combined = flexboxHelper.makeCombinedLong(lower, higher)
+        assertThat(flexboxHelper.extractHigherInt(combined), `is`(higher))
+        assertThat(flexboxHelper.extractLowerInt(combined), `is`(lower))
+
+        higher = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        lower = View.MeasureSpec.makeMeasureSpec(300, View.MeasureSpec.UNSPECIFIED)
+        combined = flexboxHelper.makeCombinedLong(lower, higher)
+        assertThat(flexboxHelper.extractHigherInt(combined), `is`(higher))
+        assertThat(flexboxHelper.extractLowerInt(combined), `is`(lower))
+    }
+
+    @Test
+    fun testFlexLine_anyItemsHaveFlexGrow() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100).apply {
+            flexGrow = 1.0f
+        }
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400).apply {
+            flexGrow = 2.0f
+        }
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.apply {
+            addView(view1)
+            addView(view2)
+            addView(view3)
+            addView(view4)
+            flexDirection = FlexDirection.COLUMN
+            flexWrap = FlexWrap.WRAP
+            alignContent = AlignContent.STRETCH
+        }
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        assertThat(flexContainer.flexLines.size, `is`(3))
+        assertThat(flexContainer.flexLines[0].mAnyItemsHaveFlexGrow, `is`(true))
+        assertThat(flexContainer.flexLines[1].mAnyItemsHaveFlexGrow, `is`(false))
+        assertThat(flexContainer.flexLines[2].mAnyItemsHaveFlexGrow, `is`(true))
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt
new file mode 100755
index 0000000..520d557
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.app.Activity
+import android.content.res.Configuration
+import android.util.Log
+
+import com.google.android.flexbox.FlexboxLayout
+
+/**
+ * Activity for testing the [FlexboxLayout] that handles configuration changes by itself
+ * instead of letting the system take care of those.
+ */
+class ConfigChangeActivity : Activity() {
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+
+        Log.d(TAG, "onConfigurationChanged: $newConfig")
+    }
+
+    companion object {
+        private const val TAG = "ConfigChangeActivity"
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt
new file mode 100755
index 0000000..63b8723
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt
@@ -0,0 +1,4066 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.annotation.LayoutRes
+import androidx.core.content.res.ResourcesCompat
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewAssertion
+import androidx.test.espresso.assertion.PositionAssertions.isBottomAlignedWith
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyAbove
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyBelow
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyLeftOf
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyRightOf
+import androidx.test.espresso.assertion.PositionAssertions.isLeftAlignedWith
+import androidx.test.espresso.assertion.PositionAssertions.isRightAlignedWith
+import androidx.test.espresso.assertion.PositionAssertions.isTopAlignedWith
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import com.google.android.flexbox.AlignContent
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxLayout
+import com.google.android.flexbox.JustifyContent
+import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
+import org.hamcrest.Description
+import org.hamcrest.TypeSafeMatcher
+import org.hamcrest.core.Is.`is`
+import org.hamcrest.core.IsNot.not
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertThat
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [FlexboxLayout].
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class FlexboxAndroidTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(FlexboxTestActivity::class.java)
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLoadFromLayoutXml() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_simple)
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.childCount, `is`(1))
+
+        val child = flexboxLayout.getChildAt(0)
+        val lp = child.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(lp.order, `is`(2))
+        assertThat(lp.flexGrow, `is`(1f))
+        assertThat(lp.alignSelf, `is`(AlignItems.STRETCH))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_fromLayoutXml() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test)
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(4))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 1, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_fromCode() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val fifth = createTextView(activity, "5", 0)
+                        val sixth = createTextView(activity, "6", -10)
+                        flexboxLayout.addView(fifth)
+                        flexboxLayout.addView(sixth)
+                    }
+                })
+
+        assertThat(flexboxLayout.childCount, `is`(6))
+        // order: -10, index 5
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("6"))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("3"))
+        // order: 0, index 4
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("5"))
+        // order: 1, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(4) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(5) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChangeOrder_fromChildSetLayoutParams() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test)
+
+        assertThat(flexboxLayout.childCount, `is`(4))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 0, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("1"))
+
+        // By changing the order and calling the setLayoutParams, the reordered array in the
+        // FlexboxLayout (mReorderedIndices) will be recreated without adding a new View.
+        activityRule.runOnUiThread {
+            val view1 = flexboxLayout.getChildAt(0)
+            val lp = view1.layoutParams as FlexboxLayout.LayoutParams
+            lp.order = -3
+            view1.layoutParams = lp
+        }
+        // order: -3, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("1"))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 1, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("4"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_addViewInMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val fifth = createTextView(activity, "5", 0)
+                        // Add the new TextView in the middle of the indices
+                        flexboxLayout.addView(fifth, 2)
+                    }
+                })
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(5))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("5"))
+        // order: 0, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("3"))
+        // order: 0, index 4
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(4) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_removeLastView() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.removeViewAt(flexboxLayout.childCount - 1)
+                    }
+                })
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(3))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_removeViewInMiddle() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.removeViewAt(2)
+                    }
+                })
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(3))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // The third text view should be placed below the first one
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        val activity = activityRule.activity
+        assertThat(flexLine1.mainSize, `is`(activity.dpToPixel(320)))
+        assertThat(flexLine1.crossSize, `is`(activity.dpToPixel(120)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.mainSize, `is`(activity.dpToPixel(160)))
+        assertThat(flexLine2.crossSize, `is`(activity.dpToPixel(120)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_nowrap() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                        flexboxLayout.alignItems = AlignItems.FLEX_START
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // But the flexWrap attribute is set to NOWRAP, the third text view is placed
+        // to the right of the second one and overflowing the parent FlexboxLayout.
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(1))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(1))
+        val flexLine = flexLines[0]
+        val activity = activityRule.activity
+        assertThat(flexLine.mainSize, `is`(activity.dpToPixel(480)))
+        assertThat(flexLine.crossSize, `is`(activity.dpToPixel(300)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap_reverse() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // There should be two flex lines same as WRAP, but the layout starts from bottom
+        // to top in FlexWrap.WRAP_REVERSE
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        // The height of the FlexboxLayout is not enough for placing the three text views.
+        // The third text view should be placed right of the first one
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_nowrap_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        // The height of the FlexboxLayout is not enough for placing the three text views.
+        // But the flexWrap attribute is set to NOWRAP, the third text view is placed
+        // below the second one and overflowing the parent FlexboxLayout.
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap_reverse_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // There should be two flex lines same as WRAP, but the layout starts from right
+        // to left in FlexWrap.WRAP_REVERSE
+        onView(withId(R.id.text3)).check(isCompletelyLeftOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyLeftOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexItem_match_parent() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_item_match_parent)
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(text1.width, `is`(flexboxLayout.width))
+        assertThat(text2.width, `is`(flexboxLayout.width))
+        assertThat(text3.width, `is`(flexboxLayout.width))
+        assertThat(flexboxLayout.height, `is`(text1.height + text2.height + text3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexItem_match_parent_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_flex_item_match_parent_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(text1.height, `is`(flexboxLayout.height))
+        assertThat(text2.height, `is`(flexboxLayout.height))
+        assertThat(text3.height, `is`(flexboxLayout.height))
+        assertThat(flexboxLayout.width, `is`(text1.width + text2.width + text3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexboxLayout_wrapContent() {
+        createFlexboxLayout(R.layout.activity_flexbox_wrap_content)
+        // The parent FlexboxLayout's layout_width and layout_height are set to wrap_content
+        // The size of the FlexboxLayout is aligned with three text views.
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexboxLayout_wrapped_with_ScrollView() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flexbox_wrapped_with_scrollview)
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        // The heightMode of the FlexboxLayout is set as MeasureSpec.UNSPECIFIED, the height of the
+        // layout will be expanded to include the all children views
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexboxLayout_wrapped_with_HorizontalScrollView() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_flexbox_wrapped_with_horizontalscrollview)
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // The widthMode of the FlexboxLayout is set as MeasureSpec.UNSPECIFIED, the width of the
+        // layout will be expanded to include the all children views
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.width, `is`(textView1.width + textView2.width + textView3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test)
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_START))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_withParentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_parent_padding)
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_START))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        // Both the parent FrameLayout and the FlexboxLayout have different padding values
+        // but the text1.getLeft should be the padding value for the FlexboxLayout, not including
+        // the parent's padding value
+        assertThat(text1.left, `is`(flexboxLayout.paddingLeft))
+        assertThat(text1.top, `is`(flexboxLayout.paddingTop))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_END))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text2)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_withParentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_parent_padding,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_END))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text2)))
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        // Both the parent FrameLayout and the FlexboxLayout have different padding values
+        // but the text3.getRight should be the padding value for the FlexboxLayout, not including
+        // the parent's padding value
+        assertThat(flexboxLayout.width - text3.right, `is`(flexboxLayout.paddingRight))
+        assertThat(text3.top, `is`(flexboxLayout.paddingTop))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val space = (flexboxLayout.width - textView1.width - textView2.width - textView3.width) / 2
+        assertThat(textView1.left, isEqualAllowingError(space))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_withParentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_parent_padding,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width -
+                textView3.width - flexboxLayout.paddingLeft - flexboxLayout.paddingRight
+        space /= 2
+        assertThat(textView1.left - flexboxLayout.paddingLeft, isEqualAllowingError(space))
+        assertThat(flexboxLayout.width - textView3.right - flexboxLayout.paddingRight,
+                isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width
+        space /= 2
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width -
+                padding * 2
+        space /= 2
+        assertThat(textView1.left, `is`(padding))
+        assertThat(flexboxLayout.right - textView3.right, `is`(padding))
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width
+        space /= 6 // Divide by the number of children * 2
+        assertTrue(space - 1 <= textView1.left && textView1.left <= space + 1)
+        val spaceInMiddle = space * 2
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.left, isEqualAllowingError(space))
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width -
+                padding * 2
+        space /= 6 // Divide by the number of children * 2
+        assertThat(textView1.left - padding, isEqualAllowingError(space))
+
+        val spaceInMiddle = space * 2
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.right - textView3.right - padding, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width -
+                padding * 2
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.left - padding, isEqualAllowingError(space))
+
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+        assertThat(flexboxLayout.right - textView3.right - padding, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.alignItems = AlignItems.STRETCH
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isCompletelyAbove(withId(R.id.text2)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 2
+        assertThat(textView1.top, isEqualAllowingError(space))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 2
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_flexDirection_column_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height - padding * 2
+        space /= 2
+        assertThat(textView1.top, `is`(padding))
+        assertThat(flexboxLayout.bottom - textView3.bottom, `is`(padding))
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 6 // Divide by the number of children * 2
+        assertThat(textView1.top, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.top, isEqualAllowingError(space))
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_flexDirection_column_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height -
+                padding * 2
+        space /= 6 // Divide by the number of children * 2
+        assertThat(textView1.top - padding, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.bottom - textView3.bottom - padding, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_flexDirection_column_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height -
+                padding * 2
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.top - padding, isEqualAllowingError(space))
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+        assertThat(flexboxLayout.bottom - textView3.bottom - padding,
+                isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_including_gone_views() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView3.width
+        space /= 4 // Divide by the number of visible children * 2
+        assertThat(textView1.left, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView3.left - textView1.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_including_gone_views() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val space = flexboxLayout.width - textView1.width - textView3.width
+        assertThat(textView3.left - textView1.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_including_gone_views_direction_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView3.height
+        space /= 4 // Divide by the number of visible children * 2
+        assertThat(textView1.top, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView3.top - textView1.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_including_gone_views_direction_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val space = flexboxLayout.height - textView1.height - textView3.height
+        assertThat(textView3.top - textView1.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_withExactParentLength() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_grow_test)
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is expanded to the right edge of the FlexboxLayout
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.width, `is`(flexboxLayout.width - textView1.width - textView2.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_withExactParentLength_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_grow_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is expanded to the bottom edge of the FlexboxLayout
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.height, `is`(flexboxLayout.height - textView1.height - textView2.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_including_view_gone() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_grow_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val textView2 = activity.findViewById<TextView>(R.id.text2)
+                        textView2.visibility = View.GONE
+                    }
+                })
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        // the third TextView is expanded to the right edge of the FlexboxLayout
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView2.visibility, `is`(View.GONE))
+        assertThat(textView3.width, `is`(flexboxLayout.width - textView1.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test)
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val flexLineCrossSize = flexboxLayout.height / 2
+        // Two flex line's cross sizes are expanded to the half of the height of the FlexboxLayout.
+        // The third textView's top should be aligned width the second flex line.
+        assertThat(textView3.top, `is`(flexLineCrossSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexStart() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_START
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_START))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.top, `is`(textView1.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isCompletelyAbove(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text3)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.bottom, `is`(flexboxLayout.bottom - textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_parentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.setPadding(32, 32, 32, 32)
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        onView(withId(R.id.text1)).check(isCompletelyAbove(withId(R.id.text3)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text3)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.bottom, `is`(flexboxLayout.bottom - flexboxLayout.paddingBottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_parentPadding_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(32, 32, 32, 32)
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text3)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.right, `is`(flexboxLayout.right - flexboxLayout.paddingRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_center() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var spaceAboveAndBottom = flexboxLayout.height - textView1.height - textView3.height
+        spaceAboveAndBottom /= 2
+
+        assertThat(textView1.top, isEqualAllowingError(spaceAboveAndBottom))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(spaceAboveAndBottom))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween_withPadding() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceAround() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_AROUND
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        var spaceAround = flexboxLayout.height - textView1.height - textView3.height
+        spaceAround /= 4 // Divide by the number of flex lines * 2
+
+        assertThat(textView1.top, isEqualAllowingError(spaceAround))
+        val spaceInMiddle = textView1.bottom + spaceAround * 2
+        assertThat(textView3.top, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch_parentWrapContent() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val parentLp = flexboxLayout.layoutParams
+                        parentLp.height = ViewGroup.LayoutParams.WRAP_CONTENT
+                        flexboxLayout.layoutParams = parentLp
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // alignContent is only effective if the parent's height/width mode is MeasureSpec.EXACTLY.
+        // The size of the flex lines don't change even if the alignContent is set to
+        // ALIGN_CONTENT_STRETCH
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.top, `is`(textView1.height))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val flexLineCrossSize = flexboxLayout.width / 2
+        // Two flex line's cross sizes are expanded to the half of the width of the FlexboxLayout.
+        // The third textView's left should be aligned with the second flex line.
+        assertThat(textView3.left, `is`(flexLineCrossSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexStart_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_START
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_START))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.left, `is`(textView1.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text3)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.right, `is`(flexboxLayout.right - textView3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_center_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val spaceLeftAndRight = (flexboxLayout.width - textView1.width - textView3.width) / 2
+
+        assertThat(textView1.left, isEqualAllowingError(spaceLeftAndRight))
+        assertThat(textView3.right, isEqualAllowingError(flexboxLayout.right - spaceLeftAndRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceAround_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_AROUND
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        var spaceAround = flexboxLayout.width - textView1.width - textView3.width
+        spaceAround /= 4 // Divide by the number of flex lines * 2
+
+        assertThat(textView1.left, isEqualAllowingError(spaceAround))
+        val spaceInMiddle = textView1.right + spaceAround * 2
+        assertThat(textView3.left, isEqualAllowingError(spaceInMiddle))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch_parentWrapContent_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val parentLp = flexboxLayout.layoutParams
+                        parentLp.width = ViewGroup.LayoutParams.WRAP_CONTENT
+                        flexboxLayout.layoutParams = parentLp
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // alignContent is only effective if the parent's height/width mode is MeasureSpec.EXACTLY.
+        // The size of the flex lines don't change even if the alignContent is set to
+        // ALIGN_CONTENT_STRETCH
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.left, `is`(textView1.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_wrapReverse_contentOverflowed() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        onView(withId(R.id.text6)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text5)).check(isCompletelyLeftOf(withId(R.id.text6)))
+        onView(withId(R.id.text4)).check(isCompletelyBelow(withId(R.id.text6)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexStart_wrapReverse_contentOverflowed() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_START
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_START))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text1)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween_wrapReverse_contentOverflowed() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text1)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_center_wrapReverse_contentOverflowed() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.CENTER
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+        val textView6 = activity.findViewById<TextView>(R.id.text6)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+
+        assertThat(textView6.top - flexboxLayout.top, isEqualAllowingError(
+                (flexboxLayout.height - textView6.height - textView4.height - textView2.height) / 2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceAround_wrapReverse_contentOverflowed() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_AROUND
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+        val textView6 = activity.findViewById<TextView>(R.id.text6)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+
+        assertThat(textView6.top - flexboxLayout.top, isEqualAllowingError(
+                (flexboxLayout.height - textView6.height - textView4.height - textView2.height) / 2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_stretch() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_stretch_test)
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.STRETCH))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.height, isEqualAllowingError(flexLineSize))
+        assertThat(textView3.height, isEqualAllowingError(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_align_self_stretch_test)
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        // Only the first TextView's alignSelf is set to ALIGN_SELF_STRETCH
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_self_stretch_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        // Only the first TextView's alignSelf is set to ALIGN_SELF_STRETCH
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.width, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexStart() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test)
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_START))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView3.top, isEqualAllowingError(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.bottom, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.bottom, isEqualAllowingError(flexLineSize))
+        assertThat(textView3.bottom, `is`(flexboxLayout.bottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_parentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_align_items_parent_padding_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(textView1.bottom, `is`(flexboxLayout.bottom - flexboxLayout.paddingBottom))
+        assertThat(textView2.bottom, `is`(flexboxLayout.bottom - flexboxLayout.paddingBottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_parentPadding_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_align_items_parent_padding_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(textView1.right, `is`(flexboxLayout.right - flexboxLayout.paddingRight))
+        assertThat(textView2.right, `is`(flexboxLayout.right - flexboxLayout.paddingRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        // All TextView's heights are the same. No issues should be found if using the first
+        // TextView to calculate the space above and below
+        val spaceAboveAndBelow = (flexLineSize - textView1.height) / 2
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.top, isEqualAllowingError(spaceAboveAndBelow))
+        assertThat(textView2.top, isEqualAllowingError(spaceAboveAndBelow))
+        assertThat(textView3.top, isEqualAllowingError(flexLineSize + spaceAboveAndBelow))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_wrapReverse() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.top, isEqualAllowingError(flexboxLayout.height - flexLineSize))
+        assertThat(textView2.top, isEqualAllowingError(flexboxLayout.height - flexLineSize))
+        assertThat(textView3.top, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center_wrapReverse() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        // All TextView's heights are the same. No issues should be found if using the first
+        // TextView to calculate the space above and below
+        val spaceAboveAndBelow = (flexLineSize - textView1.height) / 2
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.bottom, isEqualAllowingError(flexboxLayout.height - spaceAboveAndBelow))
+        assertThat(textView2.bottom, isEqualAllowingError(flexboxLayout.height - spaceAboveAndBelow))
+        assertThat(textView3.bottom,
+                isEqualAllowingError(flexboxLayout.height - flexLineSize - spaceAboveAndBelow))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexStart_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_START))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView3.left, isEqualAllowingError(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.right, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.right, isEqualAllowingError(flexLineSize))
+        assertThat(textView3.right, `is`(flexboxLayout.right))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        // All TextView's widths are the same. No issues should be found if using the first
+        // TextView to calculate the space left and right
+        val spaceLeftAndRight = (flexLineSize - textView1.width) / 2
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.left, isEqualAllowingError(spaceLeftAndRight))
+        assertThat(textView2.left, isEqualAllowingError(spaceLeftAndRight))
+        assertThat(textView3.left, isEqualAllowingError(flexLineSize + spaceLeftAndRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_wrapReverse_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.left, isEqualAllowingError(flexboxLayout.width - flexLineSize))
+        assertThat(textView2.left, isEqualAllowingError(flexboxLayout.width - flexLineSize))
+        assertThat(textView3.left, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center_wrapReverse_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        // All TextView's widths are the same. No issues should be found if using the first
+        // TextView to calculate the space above and below
+        val spaceLeftAndRight = (flexLineSize - textView1.width) / 2
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.right, isEqualAllowingError(flexboxLayout.width - spaceLeftAndRight))
+        assertThat(textView2.right, isEqualAllowingError(flexboxLayout.width - spaceLeftAndRight))
+        assertThat(textView3.right,
+                isEqualAllowingError(flexboxLayout.width - flexLineSize - spaceLeftAndRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_baseline() {
+        val activity = activityRule.activity
+        createFlexboxLayout(R.layout.activity_align_items_baseline_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val topPluBaseline1 = textView1.top + textView1.baseline
+        val topPluBaseline2 = textView2.top + textView2.baseline
+        val topPluBaseline3 = textView3.top + textView3.baseline
+
+        assertThat(topPluBaseline1, `is`(topPluBaseline2))
+        assertThat(topPluBaseline2, `is`(topPluBaseline3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_baseline_wrapContent() {
+        // This test verifies the issue that baseline calculation is broken on API level +24
+        // https://github.com/google/flexbox-layout/issues/341
+        val activity = activityRule.activity
+        val layout = createFlexboxLayout(R.layout.activity_align_items_baseline_wrap_content)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val topPluBaseline1 = textView1.top + textView1.baseline
+        val topPluBaseline2 = textView2.top + textView2.baseline
+        val topPluBaseline3 = textView3.top + textView3.baseline
+
+        assertThat(topPluBaseline1, `is`(topPluBaseline2))
+        assertThat(topPluBaseline2, `is`(topPluBaseline3))
+        assertThat(layout.flexLines.size, `is`(1))
+        assertTrue(layout.flexLines[0].crossSize > textView1.height)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_baseline_wrapReverse() {
+        val activity = activityRule.activity
+        createFlexboxLayout(R.layout.activity_align_items_baseline_test, object : Configuration {
+            override fun apply(flexboxLayout: FlexboxLayout) {
+                flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+            }
+        })
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val bottomPluBaseline1 = textView1.bottom + textView1.baseline
+        val bottomPluBaseline2 = textView2.bottom + textView2.baseline
+        val bottomPluBaseline3 = textView3.bottom + textView3.baseline
+
+        assertThat(bottomPluBaseline1, `is`(bottomPluBaseline2))
+        assertThat(bottomPluBaseline2, `is`(bottomPluBaseline3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_row_reverse() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.ROW_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+
+        // The layout direction should be right to left
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_column_reverse() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_wrap() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_flex_basis_percent_test)
+
+        // The text1 length is 50%, the text2 length is 60% and the wrap property is WRAP,
+        // the text2 should be on the second flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val lp1 = textView1.layoutParams as FlexboxLayout.LayoutParams
+        val lp2 = textView2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(textView1.width, `is`(Math.round(flexboxLayout.width * lp1.flexBasisPercent)))
+        assertThat(textView2.width, `is`(Math.round(flexboxLayout.width * lp2.flexBasisPercent)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_nowrap() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_basis_percent_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                    }
+                })
+
+        // The text1 length is 50%, the text2 length is 60% and the text3 has the fixed width,
+        // but the flex wrap attribute is NOWRAP, and flexShrink attributes for all
+        // children are the default value (1), three text views are shrank to fit in a single flex
+        // line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val totalWidth = textView1.width + textView2.width + textView3.width
+        // Allowing minor different length with the flex container since the sum of the three text
+        // views width is not always the same as the flex container's main size caused by round
+        // errors in calculating the percent lengths.
+        assertThat(flexboxLayout.width, isEqualAllowingError(totalWidth))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_wrap_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_basis_percent_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        // The text1 length is 50%, the text2 length is 60% and the wrap property is WRAP,
+        // the text2 should be on the second flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val lp1 = textView1.layoutParams as FlexboxLayout.LayoutParams
+        val lp2 = textView2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(textView1.height, `is`(Math.round(flexboxLayout.height * lp1.flexBasisPercent)))
+        assertThat(textView2.height, `is`(Math.round(flexboxLayout.height * lp2.flexBasisPercent)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_nowrap_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_basis_percent_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        // The text1 length is 50%, the text2 length is 60% and the text3 has the fixed height,
+        // but the flex wrap attribute is NOWRAP, and flexShrink attributes for all
+        // children are the default value (1), three text views are shrank to fit in a single
+        // flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val totalHeight = textView1.height + textView2.height + textView3.height
+        // Allowing minor different length with the flex container since the sum of the three text
+        // views width is not always the same as the flex container's main size caused by round
+        // errors in calculating the percent lengths.
+        assertThat(flexboxLayout.height, isEqualAllowingError(totalHeight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinWidth_initial_width_less_than_minWidth() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minWidth attribute works as a minimum constraint
+        // If the initial view width is less than the value of minWidth.
+        // The textView1's layout_width is set to wrap_content and its text is "1" apparently
+        // the initial measured width is less than the value of layout_minWidth (100dp)
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minwidth_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val minWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).minWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(minWidth))
+        onView(withId(R.id.text2)).check(hasWidth(flexboxLayout.width - minWidth))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinWidth_works_as_lower_bound_shrink_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minWidth attribute works as a lower bound
+        // when the view would shrink less than the minWidth if the minWidth weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minwidth_lower_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val minWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).minWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(minWidth))
+        assertEquals(flexboxLayout.width, textView1.width + textView2.width + textView3.width +
+                textView4.width)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinHeight_initial_height_less_than_minHeight() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minHeight attribute works as a minimum constraint
+        // If the initial view height is less than the value of minHeight.
+        // The textView1's layout_height is set to wrap_content and its text is "1" apparently
+        // the initial measured height is less than the value of layout_minHeight (100dp)
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minheight_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val minHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).minHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(minHeight))
+        onView(withId(R.id.text2)).check(hasHeight(flexboxLayout.height - minHeight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinHeight_works_as_lower_bound_shrink_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minHeight attribute works as a lower bound
+        // when the view would shrink less than the minHeight if the minHeight weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minheight_lower_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val minHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).minHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(minHeight))
+        assertEquals(flexboxLayout.height, textView1.height + textView2.height + textView3.height +
+                textView4.height)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxWidth_initial_width_more_than_maxWidth() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxWidth attribute works as a maximum constraint
+        // ff the initial view width is more than the value of maxWidth.
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxwidth_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val maxWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(maxWidth))
+        onView(withId(R.id.text2)).check(hasWidth(flexboxLayout.width - maxWidth))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxWidth_works_as_upper_bound_expand_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxWidth attribute works as a upper bound
+        // when the view would expand more than the maxWidth if the maxWidth weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxwidth_upper_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val maxWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(maxWidth))
+        assertEquals(flexboxLayout.width, textView1.width + textView2.width)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxHeight_initial_height_more_than_maxHeight() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxHeight attribute works as a maximum constraint
+        // ff the initial view height is more than the value of maxHeight.
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxheight_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val maxHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(maxHeight))
+        onView(withId(R.id.text2)).check(hasHeight(flexboxLayout.height - maxHeight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxHeight_works_as_lower_bound_expand_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxHeight attribute works as a upper bound
+        // when the view would expand more than the maxHeight if the maxHeight weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxheight_upper_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val maxHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(maxHeight))
+        assertEquals(flexboxLayout.height, textView1.height + textView2.height)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_gone() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_views_visibility_gone)
+
+        // The text1 and text2's visibility are gone, so the visible view starts from text3
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text4)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text4)).check(isCompletelyRightOf(withId(R.id.text3)))
+        onView(withId(R.id.text5)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text5)).check(isCompletelyBelow(withId(R.id.text3)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val textView5 = activity.findViewById<TextView>(R.id.text5)
+        assertThat(textView1.visibility, `is`(View.GONE))
+        assertThat(textView2.visibility, `is`(View.GONE))
+        assertThat(textView4.left, `is`(textView3.right))
+        assertThat(textView5.top, `is`(textView3.bottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_gone_first_item_in_flex_line_horizontal() {
+        // This test verifies if the FlexboxLayout is visible when the visibility of the first
+        // flex item in the second flex line (or arbitrary flex lines other than the first flex
+        // line) is set to "gone"
+        // There was an issue reported for that
+        // https://github.com/google/flexbox-layout/issues/47
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_visibility_gone_first_item_in_flex_line_row)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertTrue(flexboxLayout.height > 0)
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_gone_first_item_in_flex_line_vertical() {
+        // This test verifies if the FlexboxLayout is visible when the visibility of the first
+        // flex item in the second flex line (or arbitrary flex lines other than the first flex
+        // line) is set to "gone"
+        // There was an issue reported for that
+        // https://github.com/google/flexbox-layout/issues/47
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_visibility_gone_first_item_in_flex_line_column)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertTrue(flexboxLayout.width > 0)
+        assertThat(flexboxLayout.width, `is`(textView1.width + textView3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_invisible() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_views_visibility_invisible)
+
+        // The text1 and text2's visibility are invisible, these views take space like visible views
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.visibility, `is`(View.INVISIBLE))
+        assertThat(textView2.visibility, `is`(View.INVISIBLE))
+        assertThat(textView3.top, `is`(textView1.bottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrapBefore() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_before_test)
+
+        // layout_wrapBefore for the text2 and text3 are set to true, the text2 and text3 should
+        // be the first item for each flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView2.height + textView3.height))
+
+        activityRule.runOnUiThread {
+            val lp2 = textView2.layoutParams as FlexboxLayout.LayoutParams
+            lp2.isWrapBefore = false
+            textView2.layoutParams = lp2
+        }
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrapBefore_nowrap() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_before_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                    }
+                })
+
+        // layout_wrapBefore for the text2 and text3 are set to true, but the flexWrap is set to
+        // NOWRAP, three text views should not be wrapped.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_parentPadding_horizontal() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_parent_padding_horizontal_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // parent padding, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(flexboxLayout.height, `is`(flexboxLayout.paddingTop + flexboxLayout.paddingBottom +
+                text1.height + text2.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_parentPadding_vertical() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_parent_padding_vertical_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        // The sum of height of TextView1 and TextView2 is not enough for wrapping, but considering
+        // parent padding, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(flexboxLayout.width, `is`(flexboxLayout.paddingLeft + flexboxLayout.paddingRight +
+                text1.width + text2.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_childMargin_horizontal() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_child_margin_horizontal_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin for the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val lp2 = text2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(flexboxLayout.height, `is`(text1.height + text2.height + lp2.topMargin +
+                lp2.bottomMargin))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstItemLarge_horizontal() {
+        // This test verifies a empty flex line is not added when the first flex item is large
+        // and judged wrapping is required with the first item.
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_first_item_large_horizontal_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin for the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.height, `is`(text1.height + text2.height + text3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstItemLarge_vertical() {
+        // This test verifies a empty flex line is not added when the first flex item is large
+        // and judged wrapping is required with the first item.
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_first_item_large_vertical_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin for the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.width, `is`(text1.width + text2.width + text3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_childMargin_vertical() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_child_margin_vertical_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        // The sum of height of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin of the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val lp2 = text2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(flexboxLayout.width,
+                `is`(text1.width + text2.width + lp2.leftMargin + lp2.rightMargin))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testEmptyChildren() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children)
+
+        assertThat(flexboxLayout.childCount, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalBeginning() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_divider_test_direction_row)
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth
+        assertThat(text3.right, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 (divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                    }
+                }
+        )
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        // Three text views are placed in the first row, thus two vertical middle dividers should
+        // be placed
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth * 2
+        assertThat(text3.right, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 * 2(divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        // Three text views are placed in the first row, thus two vertical middle dividers should
+        // be placed
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth
+        assertThat(text3.right + divider.intrinsicWidth, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 (divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        // Three text views are placed in the first row, thus two vertical middle dividers should
+        // be placed
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth * 4
+        assertThat(text3.right + divider.intrinsicWidth, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 * 4 (divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(310)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 * 3 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(310)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalBeginning() {
+        val activity = activityRule.activity
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight
+        assertThat(text4.bottom, `is`(heightSum))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // There is a horizontal divider at the beginning. Top and bottom coordinates are shifted
+        // by the amount of 15
+        // The right should be 90 * 3
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight
+        assertThat(text4.bottom, `is`(heightSum))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // There is a horizontal divider at the middle. Top and bottom coordinates are shifted
+        // by the amount of 15
+        val flexLine2 = flexLines[1]
+        // The right should be 140
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight
+        assertThat(text4.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // There is a horizontal divider at the middle. Top and bottom coordinates are shifted
+        // by the amount of 15
+        val flexLine2 = flexLines[1]
+        // The right should be 140
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight * 3
+        assertThat(text4.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_all_thickDivider() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val thickDivider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider_thick, null)
+                        flexboxLayout.dividerDrawableVertical = thickDivider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider_thick, null)
+        // The sum of three text views and the sum of thick dividers don't fit in one line.
+        // The last text view should be placed to the next line.
+        assertNotNull(divider)
+        val widthSumFirstRow = text1.width + text2.width + divider!!.intrinsicWidth * 3
+        assertThat(text2.right + divider.intrinsicWidth, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        assertThat(text3.bottom, `is`(text1.height + text2.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalBeginning() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_divider_test_direction_column)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight
+        assertThat(text3.bottom, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(285)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(295)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight * 2
+        assertThat(text3.bottom, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15 * 2
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(300)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(295)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight
+        assertThat(text3.bottom + divider.intrinsicHeight, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(285)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(295)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight * 4
+        assertThat(text3.bottom + divider.intrinsicHeight, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15 * 4
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(330)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15 * 3
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(325)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalBeginning() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableVertical = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth
+        assertThat(text4.right, `is`(widthSum))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableVertical = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth
+        assertThat(text4.right, `is`(widthSum))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth
+        assertThat(text4.right + divider.intrinsicWidth, `is`(widthSum))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableVertical = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth * 3
+        assertThat(text4.right + divider.intrinsicWidth, `is`(widthSum))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_vertical_horizontal_All() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.setDividerDrawable(divider)
+                        flexboxLayout.setShowDivider(
+                                FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END)
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text2.height + text3.height + divider!!.intrinsicHeight * 4
+        val widthSum = text1.width + text4.width + divider.intrinsicWidth * 3
+        assertThat(text3.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text4.right + divider.intrinsicWidth, `is`(widthSum))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_all_thickDivider() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val thickDivider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider_thick, null)
+                        flexboxLayout.dividerDrawableHorizontal = thickDivider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider_thick, null)
+        // The sum of three text views and the sum of thick dividers don't fit in one line.
+        // The last text view should be placed to the next line.
+        assertNotNull(divider)
+        val heightSum = text1.height + text2.height + divider!!.intrinsicHeight * 3
+        assertThat(text2.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        assertThat(text3.right, `is`(text1.width + text3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testZeroWidth_wrapContentHeight_positiveFlexGrow() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_zero_width_positive_flexgrow)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        // Both text view's layout_width is set to 0dp, layout_height is set to wrap_content and
+        // layout_flexGrow is set to 1. And the text2 has a longer text than the text1.
+        // So if the cross size calculation (height) is wrong, the height of two text view do not
+        // match because text2 is trying to expand vertically.
+        // This assertion verifies that isn't happening. Finally both text views expand horizontally
+        // enough to contain their texts in one line.
+        assertThat(text1.height, `is`(text2.height))
+        assertThat(text1.width + text2.width, isEqualAllowingError(flexboxLayout.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testZeroHeight_wrapContentWidth_positiveFlexGrow() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_zero_height_positive_flexgrow)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(text1.width, `is`(not(text2.width)))
+        assertThat(text1.height + text2.height, isEqualAllowingError(flexboxLayout.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_row_alignItems_center_margin_oneSide() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_direction_row_align_items_center_margin_oneside)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        assertThat(text1.top, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(flexboxLayout.bottom - text1.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_column_alignItems_center_margin_oneSide() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_direction_column_align_items_center_margin_oneside)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        assertThat(text1.left, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(flexboxLayout.right - text1.right, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildBottomMarginIncluded_flexContainerWrapContent_directionRow_flexGrow() {
+        // This test is to verify the case where:
+        //   - layout_height is set to wrap_content for the FlexboxLayout
+        //   - Bottom (or top) margin is set to a child
+        //   - The child which the has the bottom (top) margin has the largest height in the
+        //     same flex line (or only a single child exists)
+        //   - The child has a positive layout_flexGrow attribute set
+        //  If these conditions were met, the height of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_row_grow)
+
+        // layout_height for text1: 24dp, layout_marginBottom: 12dp
+        assertThat(flexboxLayout.height, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildEndMarginIncluded_flexContainerWrapContent_directionColumn_flexGrow() {
+        // This test is to verify the case where:
+        //   - layout_width is set to wrap_content for the FlexboxLayout
+        //   - End (or start) margin is set to a child
+        //   - The child which the has the end (start) margin has the largest width in the
+        //     same flex line (or only a single child exists)
+        //   - The child has a positive layout_flexGrow attribute set
+        //  If these conditions were met, the width of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_column_grow)
+
+        // layout_width for text1: 24dp, layout_marginEnd: 12dp
+        assertThat(flexboxLayout.width, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildBottomMarginIncluded_flexContainerWrapContent_directionRow_flexShrink() {
+        // This test is to verify the case where:
+        //   - layout_height is set to wrap_content for the FlexboxLayout
+        //   - flex_wrap is set to nowrap for the FlexboxLayout
+        //   - Bottom (or top) margin is set to a child
+        //   - The child which the has the bottom (top) margin has the largest height in the
+        //     same flex line
+        //   - The child has a positive layout_flexShrink attribute set
+        //   - The sum of children width overflows parent's width (shrink will happen)
+        //  If these conditions were met, the height of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_row_shrink)
+
+        // layout_height for text1: 24dp, layout_marginBottom: 12dp
+        assertThat(flexboxLayout.height, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildBottomMarginIncluded_flexContainerWrapContent_directionColumn_flexShrink() {
+        // This test is to verify the case where:
+        //   - layout_width is set to wrap_content for the FlexboxLayout
+        //   - flex_wrap is set to nowrap for the FlexboxLayout
+        //   - End (or start) margin is set to a child
+        //   - The child which the has the end (start) margin has the largest width in the
+        //     same flex line
+        //   - The child has a positive layout_flexShrink attribute set
+        //   - The sum of children height overflows parent's height (shrink will happen)
+        //  If these conditions were met, the height of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_column_shrink)
+
+        // layout_width for text1: 24dp, layout_marginEnd: 12dp
+        assertThat(flexboxLayout.width, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildNeedsRemeasure_row() {
+        createFlexboxLayout(R.layout.activity_child_needs_remeasure_row)
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildNeedsRemeasure_column() {
+        createFlexboxLayout(R.layout.activity_child_needs_remeasure_column)
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_firstLineSingleItem_row() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view is in the next flex line. In that case, the second view's position is misplaced.
+        // https://github.com/google/flexbox-layout/issues/283
+        createFlexboxLayout(R.layout.activity_first_view_gone_first_line_single_item)
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_firstLineSingleItem_column() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view is in the next flex line. In that case, the second view's position is misplaced.
+        // https://github.com/google/flexbox-layout/issues/283
+        createFlexboxLayout(R.layout.activity_first_view_gone_first_line_single_item,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexGrowSetForRestOfItems_row() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view and third view have the layout_flexGrow attribute set. In that case, the second
+        // view's position is misplaced and the third view becomes invisible .
+        // https://github.com/google/flexbox-layout/issues/303
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_grow_set_for_rest)
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexGrowSetForRestOfItems_column() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view and third view have the layout_flexGrow attribute set. In that case, the second
+        // view's position is misplaced and the third view becomes invisible .
+        // https://github.com/google/flexbox-layout/issues/303
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_grow_set_for_rest,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexShrinkSetForRestOfItems_row() {
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_shrink_set_for_rest)
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexShrinkSetForRestOfItems_column() {
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_shrink_set_for_rest,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddItemProgrammatically_withMarginLayoutParams() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children,
+        object : Configuration {
+            override fun apply(flexboxLayout: FlexboxLayout) {
+                flexboxLayout.alignItems = AlignItems.FLEX_START
+                val first = createTextView(activity, "1", 0)
+                val second = createTextView(activity, "2", 0)
+                val lp1 = ViewGroup.MarginLayoutParams(100, 100)
+                lp1.setMargins(10, 10, 10, 10)
+                val lp2 = ViewGroup.MarginLayoutParams(100, 100)
+                lp2.setMargins(20, 20, 20, 20)
+                first.layoutParams = lp1
+                second.layoutParams = lp2
+                flexboxLayout.addView(first)
+                flexboxLayout.addView(second)
+            }
+        })
+
+        assertThat(flexboxLayout.childCount, `is`(2))
+        val view1 = flexboxLayout.getChildAt(0)
+        val view2 = flexboxLayout.getChildAt(1)
+        // Assert the coordinates of the views added programmatically with margins
+        assertThat(view1.left, `is`(10))
+        assertThat(view1.top, `is`(10))
+        assertThat(view1.bottom, `is`(110))
+        assertThat(view1.right, `is`(110))
+        assertThat(view2.left, `is`(140))
+        assertThat(view2.top, `is`(20))
+        assertThat(view2.bottom, `is`(120))
+        assertThat(view2.right, `is`(240))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddItemProgrammatically_withFlexboxLayoutLayoutParams() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_START
+                        val first = createTextView(activity, "1", 0)
+                        val second = createTextView(activity, "2", 0)
+                        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+                        lp1.setMargins(10, 10, 10, 10)
+                        val lp2 = FlexboxLayout.LayoutParams(100, 100)
+                        lp2.setMargins(20, 20, 20, 20)
+                        first.layoutParams = lp1
+                        second.layoutParams = lp2
+                        flexboxLayout.addView(first)
+                        flexboxLayout.addView(second)
+                    }
+                })
+
+        assertThat(flexboxLayout.childCount, `is`(2))
+        val view1 = flexboxLayout.getChildAt(0)
+        val view2 = flexboxLayout.getChildAt(1)
+        // Assert the coordinates of the views added programmatically with margins
+        assertThat(view1.left, `is`(10))
+        assertThat(view1.top, `is`(10))
+        assertThat(view1.bottom, `is`(110))
+        assertThat(view1.right, `is`(110))
+        assertThat(view2.left, `is`(140))
+        assertThat(view2.top, `is`(20))
+        assertThat(view2.bottom, `is`(120))
+        assertThat(view2.right, `is`(240))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxLines() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.maxLine = 3
+                        for (i in 1..50) {
+                            val textView = createTextView(activity, i.toString(), 0)
+                            val lp = FlexboxLayout.LayoutParams(100, 100)
+                            lp.flexShrink = 0f
+                            textView.layoutParams = lp
+                            flexboxLayout.addView(textView)
+                        }
+                    }
+                })
+        assertThat(flexboxLayout.childCount, `is`(50))
+        assertThat(flexboxLayout.flexLines.size, `is`(3))
+    }
+
+    @Throws(Throwable::class)
+    private fun createFlexboxLayout(@LayoutRes activityLayoutResId: Int,
+                                    configuration: Configuration = Configuration.EMPTY): FlexboxLayout {
+        val activity = activityRule.activity
+        activityRule.runOnUiThread {
+            activity.setContentView(activityLayoutResId)
+            val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+            configuration.apply(flexboxLayout)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        return activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+    }
+
+    private fun createTextView(context: Context, text: String, order: Int): TextView {
+        val textView = TextView(context)
+        textView.text = text
+        val lp = FlexboxLayout.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        lp.order = order
+        textView.layoutParams = lp
+        return textView
+    }
+
+    private fun hasWidth(width: Int): ViewAssertion {
+        return matches(object : TypeSafeMatcher<View>() {
+            override fun describeTo(description: Description) {
+                description.appendText("expected width: $width")
+            }
+
+            override fun describeMismatchSafely(item: View, mismatchDescription: Description) {
+                mismatchDescription.appendText("actual width: " + item.width)
+            }
+
+            override fun matchesSafely(item: View) = item.width == width
+        })
+    }
+
+    private fun hasHeight(height: Int): ViewAssertion {
+        return matches(object : TypeSafeMatcher<View>() {
+            override fun describeTo(description: Description) {
+                description.appendText("expected height: $height")
+            }
+
+            override fun describeMismatchSafely(item: View, mismatchDescription: Description) {
+                mismatchDescription.appendText("actual height: " + item.height)
+            }
+
+            override fun matchesSafely(item: View) = item.height == height
+        })
+    }
+
+    private interface Configuration {
+
+        fun apply(flexboxLayout: FlexboxLayout)
+
+        companion object {
+            val EMPTY: Configuration = object : Configuration {
+                override fun apply(flexboxLayout: FlexboxLayout) = Unit
+            }
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerConfigChangeTest.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerConfigChangeTest.kt
new file mode 100755
index 0000000..e21a458
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerConfigChangeTest.kt
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+import android.content.pm.ActivityInfo
+import android.content.res.Configuration
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.*
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexboxLayoutManager
+import org.hamcrest.Matchers.`is`
+import org.hamcrest.core.IsNot.not
+import org.junit.Assert.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [FlexboxLayoutManager] with the Activity that handles configuration
+ * changes manually.
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class FlexboxLayoutManagerConfigChangeTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(ConfigChangeActivity::class.java)
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexLinesDiscardedOnOrientationChange_direction_row() {
+        // Verifies the case that the calculated Flex lines are correctly discarded when a
+        // orientation happens with an Activity that handles configuration changes manually
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            // This test assumes that the screen width and the height are different.
+            recyclerView.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            recyclerView.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..99) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstLine = layoutManager.flexLines[0]
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(0) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val firstLineAfterRotation = layoutManager.flexLines[0]
+        assertThat(firstLine.mainSize, `is`(not(firstLineAfterRotation.mainSize)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexLinesDiscardedOnOrientationChange_direction_column() {
+        // Verifies the case that the calculated Flex lines are correctly discarded when a
+        // orientation happens with an Activity that handles configuration changes manually
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            // This test assumes that the screen width and the height are different.
+            recyclerView.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            recyclerView.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..99) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstLine = layoutManager.flexLines[0]
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(0) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val firstLineAfterRotation = layoutManager.flexLines[0]
+        assertThat(firstLine.mainSize, `is`(not(firstLineAfterRotation.mainSize)))
+    }
+
+    /**
+     * Creates a new flex item.
+     *
+     * @param context the context
+     * @param width   in DP
+     * @param height  in DP
+     * @return the created [FlexboxLayoutManager.LayoutParams] instance
+     */
+    private fun createLayoutParams(context: Context, width: Int,
+                                   height: Int): FlexboxLayoutManager.LayoutParams {
+        return FlexboxLayoutManager.LayoutParams(context.dpToPixel(width), context.dpToPixel(height))
+    }
+
+    private fun swipe(from: CoordinatesProvider, to: CoordinatesProvider): ViewAction {
+        return GeneralSwipeAction(Swipe.FAST, from, to, Press.FINGER)
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt
new file mode 100755
index 0000000..26e6da6
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt
@@ -0,0 +1,3503 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+import android.content.pm.ActivityInfo
+import android.content.res.Configuration
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.CoordinatesProvider
+import androidx.test.espresso.action.GeneralLocation
+import androidx.test.espresso.action.GeneralSwipeAction
+import androidx.test.espresso.action.Press
+import androidx.test.espresso.action.Swipe
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.AlignSelf
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxItemDecoration
+import com.google.android.flexbox.FlexboxItemDecoration.HORIZONTAL
+import com.google.android.flexbox.FlexboxItemDecoration.VERTICAL
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.google.android.flexbox.JustifyContent
+import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
+import org.hamcrest.Matchers.`is`
+import org.hamcrest.Matchers.instanceOf
+import org.hamcrest.Matchers.lessThan
+import org.hamcrest.Matchers.notNullValue
+import org.hamcrest.core.IsNot.not
+import org.junit.Assert.assertThat
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [FlexboxLayoutManager].
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class FlexboxLayoutManagerTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(FlexboxTestActivity::class.java)
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLoadFromXml() {
+        val activity = activityRule.activity
+        activityRule.runOnUiThread { activity.setContentView(R.layout.recyclerview_reverse) }
+        val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        val layoutManager = recyclerView.layoutManager
+        assertThat(recyclerView, `is`(notNullValue()))
+        assertThat(layoutManager, `is`(instanceOf<Any>(FlexboxLayoutManager::class.java)))
+        val flexboxLayoutManager = layoutManager as FlexboxLayoutManager
+        assertThat(flexboxLayoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(flexboxLayoutManager.flexWrap, `is`(FlexWrap.WRAP))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChangeAttributesFromCode() {
+        val activity = activityRule.activity
+        activityRule.runOnUiThread { activity.setContentView(R.layout.recyclerview_reverse) }
+        val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        val layoutManager = recyclerView.layoutManager
+        assertThat(recyclerView, `is`(notNullValue()))
+        assertThat(layoutManager, `is`(instanceOf<Any>(FlexboxLayoutManager::class.java)))
+        val flexboxLayoutManager = layoutManager as FlexboxLayoutManager
+        assertThat(flexboxLayoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(flexboxLayoutManager.flexWrap, `is`(FlexWrap.WRAP))
+
+        flexboxLayoutManager.flexDirection = FlexDirection.COLUMN
+        flexboxLayoutManager.flexWrap = FlexWrap.NOWRAP
+        flexboxLayoutManager.justifyContent = JustifyContent.CENTER
+        flexboxLayoutManager.alignItems = AlignItems.FLEX_END
+        assertThat(flexboxLayoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayoutManager.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(flexboxLayoutManager.alignItems, `is`(AlignItems.FLEX_END))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_not_wrapped() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.flexWrap, `is`(FlexWrap.WRAP))
+        // Only 2 items are added and all items should be attached (visible). So both
+        // getChildCount and getFlexItemCount(including detached items) should return the same value
+        assertThat(layoutManager.flexItemCount, `is`(2))
+        assertThat(layoutManager.childCount, `is`(2))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_wrapped() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // 4 items are added and all items should be attached (visible). So both
+        // getChildCount and getFlexItemCount(including detached items) should return the same value
+        assertThat(layoutManager.flexItemCount, `is`(4))
+        assertThat(layoutManager.childCount, `is`(4))
+        assertThat(layoutManager.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_partOfItems_detached() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 320, height: 450
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items follow aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_scrollVertically() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 320, height: 450
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items follow aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        // The RecyclerView is swiped to top until it reaches the bottom of the view.
+        // The number of the visible views should be 5
+        assertThat(layoutManager.childCount, `is`(5))
+        // Since the RecyclerView is swiped to the bottom, all flex lines should be calculated
+        // by now
+        assertThat(layoutManager.flexLines.size, `is`(5))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 150, 130)
+            lp1.flexGrow = 1.0f
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 150, 130)
+            lp2.flexGrow = 1.0f
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 150, 130)
+            lp3.flexGrow = 1.0f
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // The flexGrow parameters for all LayoutParams are set to 1.0, expecting each child to
+        // fill the horizontal remaining space
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(2))
+        assertThat(layoutManager.getChildAt(0)!!.width, isEqualAllowingError(activity.dpToPixel(160)))
+        assertThat(layoutManager.getChildAt(1)!!.width, isEqualAllowingError(activity.dpToPixel(160)))
+        assertThat(layoutManager.getChildAt(2)!!.width, isEqualAllowingError(activity.dpToPixel(320)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_column_partOfItems_detached() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 450, height: 240
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items after aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_column_scrollHorizontally() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 500, height: 240
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items follow aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        // The RecyclerView is swiped to top until it reaches the right edge of the view.
+        // The number of the visible views should be 5
+        assertThat(layoutManager.childCount, `is`(5))
+        // Since the RecyclerView is swiped to the bottom, all flex lines should be calculated
+        // by now
+        assertThat(layoutManager.flexLines.size, `is`(5))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(150)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(170)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(220)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(220)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(320)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(85)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(235)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(28)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(78)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(242)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(292)))
+    }
+
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(43)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(93)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(228)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(278)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(320)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(320)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(220)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(170)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(220)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(150)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(235)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(85)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(135)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(242)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(292)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(28)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(78)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(228)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(278)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(43)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(93)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(320)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(150)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(90)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(140)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(140)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(45)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(195)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(15)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(65)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(175)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(225)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(23)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(73)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(167)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(217)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(140)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(90)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(140)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(150)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(195)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(45)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(95)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(175)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(225)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(15)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(65)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(167)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(217)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(23)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(73)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLargeItem_scrollFast_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..199) {
+                val lp = createLayoutParams(activity, 100, 50)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // Should be scrolled to the bottom by now
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        // Should be scrolled to the top
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLargeItem_scrollFast_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..199) {
+                val lp = createLayoutParams(activity, 70, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+
+        // Should be scrolled to the right edge by now
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        // Should be scrolled to the left edge by now
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_stretch_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 70, 80)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 70, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 70, 30)
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify all items heights are stretched
+        assertThat(layoutManager.getChildAt(0)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(2)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_stretch_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 80, 70)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 70)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 30, 70)
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify all items widths are stretched
+        assertThat(layoutManager.getChildAt(0)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(2)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 70, 80)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 70, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 70, 30)
+            lp3.alignSelf = AlignSelf.STRETCH
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify the item whose align self is set to stretch is stretched
+        assertThat(layoutManager.getChildAt(0)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.height, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(layoutManager.getChildAt(2)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 80, 70)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 70)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 30, 70)
+            lp3.alignSelf = AlignSelf.STRETCH
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify the item whose align self is set to stretch is stretched
+        assertThat(layoutManager.getChildAt(0)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.width, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(layoutManager.getChildAt(2)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testStretchViews_from_middle_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        activityRule.runOnUiThread {
+            layoutManager.alignItems = AlignItems.STRETCH
+            val lp = createLayoutParams(activity, 70, 20)
+            // Add an item whose height is less than the other items.
+            // But with alignItems set to stretch, the height of the item should be stretched
+            adapter.addItem(lp)
+            adapter.notifyDataSetChanged()
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.getChildAt(layoutManager.childCount - 1)!!.height,
+                isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testStretchViews_from_middle_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 50)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        activityRule.runOnUiThread {
+            layoutManager.alignItems = AlignItems.STRETCH
+            val lp = createLayoutParams(activity, 20, 50)
+            // Add an item whose width is less than the other items.
+            // But with alignItems set to stretch, the width of the item should be stretched
+            adapter.addItem(lp)
+            adapter.notifyDataSetChanged()
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.getChildAt(layoutManager.childCount - 1)!!.width,
+                isEqualAllowingError(activity.dpToPixel(70)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToTop_middleItem_as_anchorPosition() {
+        // There was an issue that the anchor position was based on the first item in the first
+        // visible flex line when scrolling to top. But the anchor position should be based on the
+        // flex line position (view which has the minimum top position in the same flex line)
+        // This test verifies the issue is fixed.
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val positionInSecondLine = 6
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                var lp = createLayoutParams(activity, 70, 80)
+                if (i == positionInSecondLine) {
+                    // Change the height from other items in the second line, not the first item
+                    // in the second line
+                    lp = createLayoutParams(activity, 70, 130)
+                }
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (320 / 70) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // Now scrolling to the top to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        assertThat(layoutManager.getChildAt(positionInSecondLine)!!.bottom,
+                isEqualAllowingError(activity.dpToPixel(210))) // 80 + 130
+        // Verify that the view in the same line's cross axis position is correct
+        assertThat(layoutManager.getChildAt(positionInSecondLine - 1)!!.bottom,
+                isEqualAllowingError(activity.dpToPixel(160))) // 80 + 80
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToLeft_middleItem_as_anchorPosition() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val positionInSecondLine = 6
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                var lp = createLayoutParams(activity, 80, 50)
+                if (i == positionInSecondLine) {
+                    // Change the width from other items in the second line, not the first item
+                    // in the second line
+                    lp = createLayoutParams(activity, 130, 50)
+                }
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (240 / 50) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        // By this moment reached to the right edge
+
+        // Now scrolling to the left to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+
+        assertThat(layoutManager.getChildAt(positionInSecondLine)!!.right,
+                isEqualAllowingError(activity.dpToPixel(210))) // 80 + 130
+        // Verify that the view in the same line's cross axis position is correct
+        assertThat(layoutManager.getChildAt(positionInSecondLine - 1)!!.right,
+                isEqualAllowingError(activity.dpToPixel(160))) // 80 + 80
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToBottom_middleItem_as_anchorPosition() {
+        // There was an issue that the anchor position was based on the last item in the last
+        // visible flex line when scrolling to bottom. But the anchor position should be based on
+        // the flex line position (view which has the maximum bottom position in the same flex line)
+        // This test verifies the issue is fixed.
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val positionInSecondBottomLine = 45
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                var lp = createLayoutParams(activity, 70, 80)
+                if (i == positionInSecondBottomLine) {
+                    // Change the height from other items in the second bottom line
+                    lp = createLayoutParams(activity, 70, 130)
+                }
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (320 / 70) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // 4 comes from the number of flex items - positionInSecondBottomLine
+        val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        val anchorView = layoutManager.getChildAt(layoutManager.childCount - 4)
+        assertThat(recyclerView.bottom - anchorView!!.top,
+                isEqualAllowingError(activity.dpToPixel(210))) // 80 + 130
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToTop_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (320 / 70) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // Now scrolling to the top to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        assertThat((layoutManager.getChildAt(0) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_only_oneItem_has_positive_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..3) {
+                val lp = createLayoutParams(activity, 100, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 1 item
+            // Give the second item in the first line a positive flex grow
+            adapter.getItemAt(0).setHeight(activity.dpToPixel(140))
+            adapter.getItemAt(1).flexGrow = 1.0f
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        // Verify the vertical position (cross size) of the second line is correctly positioned
+        assertThat(layoutManager.getChildAt(3)!!.top, isEqualAllowingError(activity.dpToPixel(140)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_only_oneItem_has_positive_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..3) {
+                val lp = createLayoutParams(activity, 70, 70)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 1 item
+            // Give the second item in the first line a positive flex grow
+            adapter.getItemAt(0).setWidth(activity.dpToPixel(120))
+            adapter.getItemAt(1).flexGrow = 1.0f
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        // Verify the horizontal position (cross size) of the second line is correctly positioned
+        assertThat(layoutManager.getChildAt(3)!!.left, isEqualAllowingError(activity.dpToPixel(120)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstReferenceView_middleOf_line_used_as_anchor() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_END
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp1)
+            // The second view in the first line has the maximum height in the same line
+            val lp2 = createLayoutParams(activity, 100, 180)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp3)
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // Now scrolling to the top to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        // The top coordinate of the first view should be the height of the second view minus the
+        // height of the first view (180 - 80)
+        assertThat(layoutManager.getChildAt(0)!!.top, isEqualAllowingError(activity.dpToPixel(100)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLastReferenceView_middleOf_line_used_as_anchor() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 80)
+                adapter.addItem(lp)
+            }
+            val lp1 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp1)
+            // The second view in the last line has the maximum height in the same line
+            val lp2 = createLayoutParams(activity, 100, 180)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        // The bottom coordinate of the first view in the last line should be the height of the
+        // second view in the last line minus the height of the first view in the last line
+        // (180 - 80)
+        assertThat(layoutManager.getChildAt(layoutManager.childCount - 2)!!.bottom
+                - layoutManager.getChildAt(layoutManager.childCount - 3)!!.bottom,
+                isEqualAllowingError(activity.dpToPixel(100)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testRotateScreen_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.CENTER))
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        val anchorView = layoutManager.getChildAt(0)
+        val offset = anchorView!!.top
+        assertTrue(offset < 0)
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Verify that offset position is preserved for the first visible view after the rotation
+        val anchorAfterRotate = layoutManager.getChildAt(0)
+        assertTrue(anchorAfterRotate!!.top < 0)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testRotateScreen_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER))
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        val anchorView = layoutManager.getChildAt(0)
+        val offset = anchorView!!.left
+        assertTrue(offset < 0)
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Verify that offset position is preserved for the first visible view after the rotation
+        val anchorAfterRotate = layoutManager.getChildAt(0)
+        assertTrue(anchorAfterRotate!!.left < 0)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        var view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view2!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        var view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view3!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+        var view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        var view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width)
+        assertThat(view2!!.left, isEqualAllowingError(activity.dpToPixel(90)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 90(view width)
+        assertThat(view3!!.left, isEqualAllowingError(activity.dpToPixel(180)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view2!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view3!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 100 (view height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        var view1 = layoutManager.getChildAt(0)
+        var view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view1!!.right - view2!!.right, isEqualAllowingError(activity.dpToPixel(100)))
+        var view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view1.right - view3!!.right, isEqualAllowingError(activity.dpToPixel(200)))
+        var view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        var view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width)
+        assertThat(view1!!.right - view2!!.right, isEqualAllowingError(activity.dpToPixel(90)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 90(view width)
+        assertThat(view1.right - view3!!.right, isEqualAllowingError(activity.dpToPixel(180)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view1!!.right - view2!!.right,
+                isEqualAllowingError(activity.dpToPixel(100)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view1.right - view3!!.right,
+                isEqualAllowingError(activity.dpToPixel(200)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 100 (view height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        var view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        var view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        var view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        var view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(90)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 90 (view width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(180)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height)
+        assertThat(view2!!.top, isEqualAllowingError(activity.dpToPixel(65)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 65 (view height)
+        assertThat(view3!!.top, isEqualAllowingError(activity.dpToPixel(130)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        var view1 = layoutManager.getChildAt(0)
+        var view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view1!!.top - view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        var view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view1.top - view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        var view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        var view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view1!!.top - view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view1.top - view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(90)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 90 (view width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(180)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height)
+        assertThat(view1!!.top - view2!!.top, isEqualAllowingError(activity.dpToPixel(65)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 65 (view height)
+        assertThat(view1.top - view3!!.top, isEqualAllowingError(activity.dpToPixel(130)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..149) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+            // ....
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        val scrollTo = 42
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Each flex line should have 3 items in this test's configuration.
+        // After scrolling to the position of 42 (% 3 == 0), the first visible item should
+        // be the 42'th item
+        assertThat((layoutManager.getChildAt(0) as TextView).text.toString(),
+                `is`((scrollTo + 1).toString()))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // Scroll enough that 42'th item becomes off screen to the top
+
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // The 42'th item should be at the bottom of the screen.
+        // The last visible item should be 42 + 3 since the last visible item is at the last
+        // of the bottom flex line
+        assertThat((layoutManager.getChildAt(layoutManager.childCount - 1) as TextView).text.toString(),
+                `is`((scrollTo + 3).toString()))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..149) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+            // ....
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val scrollTo = 42
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Each flex line should have 3 items in this test's configuration.
+        // After scrolling to the position of 42 (% 3 == 0), the first visible item should
+        // be the 42'th item
+        assertThat((layoutManager.getChildAt(0) as TextView).text.toString(),
+                `is`((scrollTo + 1).toString()))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        // Scroll enough that 42'th item becomes off screen to the left
+
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // The 42'th item should be at the bottom of the screen.
+        // The last item should be the (42 + 3)'th item since it should be also the last item in the
+        // bottom flex line
+        assertThat((layoutManager.getChildAt(layoutManager.childCount - 1) as TextView).text.toString(),
+                `is`((scrollTo + 3).toString()))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_scrollToNewItem_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..5) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // There should be 2 lines
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 100, 70)
+            adapter.addItem(lp)
+            layoutManager.scrollToPosition(adapter.itemCount - 1)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // ChildCount (visible views) should be 6 + 1,
+        // which before fixing https://github.com/google/flexbox-layout/issues/206, only the new
+        // item was visible
+        assertThat(layoutManager.childCount, `is`(7))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_scrollToNewItem_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..5) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // There should be 2 lines
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 100, 70)
+            adapter.addItem(lp)
+            layoutManager.scrollToPosition(adapter.itemCount - 1)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // ChildCount (visible views) should be 6 + 1,
+        // which before fixing https://github.com/google/flexbox-layout/issues/206, only the new
+        // item was visible
+        assertThat(layoutManager.childCount, `is`(7))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToStart_secondLineHasMoreItemThanFirst() {
+        // This test verifies the case that the first line disappears as the user first scrolls to
+        // the bottom enough that the first line becomes invisible then the user scrolls toward
+        // start on the condition that the second line has more items than the first line
+        // https://github.com/google/flexbox-layout/issues/228
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val first = FlexboxLayoutManager.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, activity.dpToPixel(70))
+            adapter.addItem(first)
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // The first line has 1 item, the following lines have more than 1 items
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 1 items
+            // Flex line 2: 3 items
+            // Flex line 3: 3 items
+            // ...
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // At this moment, the first item should become invisible
+        var firstView = layoutManager.getChildAt(0)
+        assertThat((firstView as TextView).text.toString(), `is`(not("1")))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        // The first visible item should be "1", which before fixing the issue
+        // https://github.com/google/flexbox-layout/issues/228, the first line disappeared.
+        firstView = layoutManager.getChildAt(0)
+        assertThat((firstView as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNestedRecyclerViews_direction_row() {
+        // This test verifies the nested RecyclerViews.
+        // The outer RecyclerView scrolls vertical using LinearLayoutManager.
+        // The inner RecyclerViews use FlexboxLayoutManager with flexDirection == ROW and
+        // height of the RecyclerView is set to "wrap_content", which before fixing
+        // https://github.com/google/flexbox-layout/issues/208, the height of the inner
+        // RecyclerViews were set to 0.
+        val activity = activityRule.activity
+        val outerLayoutManager = LinearLayoutManager(activity)
+
+        // Give the inner adapter item count enough so that inner RecyclerView with
+        // FlexboxLayoutManager wraps its items
+        val innerAdapterItemCount = 20
+        val adapter = NestedOuterAdapter(FlexDirection.ROW,
+                innerAdapterItemCount, R.layout.viewholder_inner_recyclerview)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            outerLayoutManager.orientation = LinearLayoutManager.VERTICAL
+            recyclerView.layoutManager = outerLayoutManager
+            recyclerView.adapter = adapter
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val viewHolder = adapter.getViewHolder(0)
+        val innerRecyclerView = viewHolder.innerRecyclerView
+        assertThat(innerRecyclerView.height, `is`(not(0)))
+
+        // This assertion verifies that inner RecyclerView displays the entire items including
+        // wrapped lines to verify the issue that nested RecyclerView with FlexboxLayoutManager
+        // only displayed one line https://github.com/google/flexbox-layout/issues/290
+        assertThat((innerRecyclerView.layoutManager as FlexboxLayoutManager).findLastVisibleItemPosition(),
+                `is`(innerAdapterItemCount - 1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNestedRecyclerViews_direction_column() {
+        // This test verifies the nested RecyclerViews.
+        // The outer RecyclerView scrolls horizontally using LinearLayoutManager.
+        // The inner RecyclerViews use FlexboxLayoutManager with flexDirection == COLUMN and
+        // width of the RecyclerView is set to "wrap_content", which before fixing
+        // https://github.com/google/flexbox-layout/issues/208, the width of the inner
+        // RecyclerViews were set to 0.
+        val activity = activityRule.activity
+        val outerLayoutManager = LinearLayoutManager(activity)
+
+        // Give the inner adapter item count enough so that inner RecyclerView with
+        // FlexboxLayoutManager wraps its items
+        val innerAdapterItemCount = 20
+        val adapter = NestedOuterAdapter(FlexDirection.COLUMN,
+                innerAdapterItemCount, R.layout.viewholder_inner_recyclerview_wrap_horizontally)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            outerLayoutManager.orientation = LinearLayoutManager.HORIZONTAL
+            recyclerView.layoutManager = outerLayoutManager
+            recyclerView.adapter = adapter
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val viewHolder = adapter.getViewHolder(0)
+        val innerRecyclerView = viewHolder.innerRecyclerView
+        assertThat(innerRecyclerView.width, `is`(not(0)))
+
+        // This assertion verifies that inner RecyclerView displays the entire items including
+        // wrapped lines to verify the issue that nested RecyclerView with FlexboxLayoutManager
+        // only displayed one line https://github.com/google/flexbox-layout/issues/290
+        assertThat((innerRecyclerView.layoutManager as FlexboxLayoutManager).findLastVisibleItemPosition(),
+                `is`(innerAdapterItemCount - 1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFindVisibleChild_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // At first three completely visible lines.
+            // Flex line 1, item count 3 (0, 1, 2)
+            // Flex line 2, item count 3 (3, 4, 5)
+            // Flex line 3, item count 3 (6, 7, 8)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(8))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(11))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(42))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(39))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(49))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(49))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFindVisibleChild_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // At first three completely visible lines.
+            // Flex line 1, item count 3 (0, 1, 2)
+            // Flex line 2, item count 3 (3, 4, 5)
+            // Flex line 3, item count 3 (6, 7, 8)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(8))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(11))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(42))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(39))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(49))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(49))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDrawDirtyFlexLine_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // First scroll to the bottom, then add a new item that isn't visible at this moment.
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 40, 75)
+            adapter.addItem(0, lp)
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstVisible = layoutManager.getChildAt(0)
+        assertThat(firstVisible!!.width, isEqualAllowingError(activity.dpToPixel(40)))
+        assertThat(firstVisible.height, isEqualAllowingError(activity.dpToPixel(75)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDrawDirtyFlexLine_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // First scroll to the bottom, then add a new item that isn't visible at this moment.
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 100, 120)
+            adapter.addItem(0, lp)
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstVisible = layoutManager.getChildAt(0)
+        assertThat(firstVisible!!.width, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(firstVisible.height, isEqualAllowingError(activity.dpToPixel(120)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDrawDirtyFlexLine_multi_viewTypes_direction_row() {
+        // This test verifies https://github.com/google/flexbox-layout/issues/280
+        // the position of the view type is shifted if a new item is inserted before the
+        // view which has the special viewType and that view isn't visible at the time the item
+        // was inserted.
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapterMultiViewTypes()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val parent = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        var matchParentText = layoutManager
+                .getChildAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT) as TextView
+        assertThat(matchParentText.width, `is`(parent.width))
+        assertThat(matchParentText.text.toString(),
+                `is`<String>((TestAdapterMultiViewTypes.POSITION_MATCH_PARENT + 1).toString()))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+
+        val insertedValue = 10
+        activityRule.runOnUiThread {
+            val item = TestAdapterMultiViewTypes.Item()
+            item.value = insertedValue
+            // Insert an item before the position that has a special viewType
+            adapter.addItemAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT - 1, item)
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Since a new item is inserted before the position, the index at the view who has the
+        // special viewType should be shifted.
+        matchParentText = layoutManager
+                .getChildAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT + 1) as TextView
+        assertThat(matchParentText.width, `is`(parent.width))
+        assertThat(matchParentText.text.toString(),
+                `is`<String>((TestAdapterMultiViewTypes.POSITION_MATCH_PARENT + 1).toString()))
+
+        // The position of this view is the old position who had the special viewType, but
+        // now the viewType should be a normal one
+        val textView = layoutManager
+                .getChildAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT - 1) as TextView
+        assertThat(textView.width, lessThan(parent.width))
+        assertThat(textView.text.toString(), `is`(insertedValue.toString()))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildrenSizeWithMargin() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp = createLayoutParams(activity, 100, 30)
+            lp.setMargins(10, 30, 20, 40)
+            adapter.addItem(lp)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val text = layoutManager.getChildAt(0) as TextView
+        val lp = text.layoutParams as FlexboxLayoutManager.LayoutParams
+        assertThat(text.height, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(text.width, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(lp.marginLeft, isEqualAllowingError(10))
+        assertThat(lp.marginRight, isEqualAllowingError(20))
+        assertThat(lp.marginTop, isEqualAllowingError(30))
+        assertThat(lp.marginBottom, isEqualAllowingError(40))
+        activityRule.runOnUiThread { layoutManager.flexDirection = FlexDirection.COLUMN }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val text2 = layoutManager.getChildAt(0) as TextView
+        assertThat(text2.height, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(text2.width, isEqualAllowingError(activity.dpToPixel(100)))
+
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testItemDecoration_withScrolling_direction_row() {
+        // This test verifies the case that the item decoration set through FlexboxItemDecoration
+        // is misplaced after the user scrolls the RecyclerView
+        // https://github.com/google/flexbox-layout/issues/285
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val decorationDrawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val decoration = FlexboxItemDecoration(activity)
+            decoration.setDrawable(decorationDrawable)
+            recyclerView.addItemDecoration(decoration)
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // The first line has 1 item, the following lines have more than 1 items
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 1 items
+            // Flex line 2: 3 items
+            // Flex line 3: 3 items
+            // ...
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getLeftDecorationWidth(it), `is`(0)) }
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        // Verify even after the scrolling, decoration values are set correctly
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getLeftDecorationWidth(it), `is`(0)) }
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testItemDecoration_withScrolling_direction_column() {
+        // This test verifies the case that the item decoration set through FlexboxItemDecoration
+        // is misplaced after the user scrolls the RecyclerView
+        // https://github.com/google/flexbox-layout/issues/285
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val decorationDrawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val decoration = FlexboxItemDecoration(activity)
+            decoration.setDrawable(decorationDrawable)
+            recyclerView.addItemDecoration(decoration)
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // The first line has 1 item, the following lines have more than 1 items
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 1 items
+            // Flex line 2: 3 items
+            // Flex line 3: 3 items
+            // ...
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getTopDecorationHeight(it), `is`(0)) }
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+
+        // Verify even after the scrolling, decoration values are set correctly
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getTopDecorationHeight(it), `is`(0)) }
+    }
+
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNotifyItemChange_withPayload() {
+        // This test verifies the payload is correctly passed to the Adapter in the case
+        // that notifying an item with payload
+        // https://github.com/google/flexbox-layout/issues/297
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp = createLayoutParams(activity, 100, 70)
+            adapter.addItem(lp)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(adapter.payloads.size, `is`(0))
+
+        val payload = "payload"
+        activityRule.runOnUiThread { adapter.changeItemWithPayload(0, payload) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(adapter.payloads.size, `is`(1))
+        assertThat(adapter.payloads[0] as String, `is`(payload))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollAlongManAxis_direction_row() {
+        // This test verifies the scroll along the main axis if the width of the RecyclerView is
+        // larger than its parent when the main axis direction is horizontal (row)
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.wrapped_recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view = layoutManager.getChildAt(0)!!
+        assertThat(view.left, `is`(0))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        assertThat(view.left, `is`(not(0)))
+
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        assertThat(view.left, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollAlongManAxis_direction_column() {
+        // This test verifies the scroll along the main axis if the height of the RecyclerView is
+        // larger than its parent when the main axis direction is vertical (column).
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.wrapped_recyclerview_scroll_vertical)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 100)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view = layoutManager.getChildAt(0)!!
+        assertThat(view.top, `is`(0))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        assertThat(view.top, `is`(not(0)))
+
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        assertThat(view.top, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxLine() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.maxLine = 3
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 1..50) {
+                val lp = createLayoutParams(activity, 100, 70)
+                lp.flexShrink = 0f
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexLines.size, `is`(3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNowrap_justifyContentCenter_directionRow() {
+        // This is to fix https://github.com/google/flexbox-layout/issues/469
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val height = 70
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.flexWrap = FlexWrap.NOWRAP
+            layoutManager.justifyContent = JustifyContent.CENTER
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 1..3) {
+                val lp = createLayoutParams(activity, 100, height)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view1Bottom= layoutManager.getChildAt(0)!!.bottom
+        val view2Bottom = layoutManager.getChildAt(1)!!.bottom
+        val view3Bottom = layoutManager.getChildAt(2)!!.bottom
+        assertThat(view1Bottom, `is`(activity.dpToPixel(height)))
+        assertThat(view2Bottom, `is`(activity.dpToPixel(height)))
+        assertThat(view3Bottom, `is`(activity.dpToPixel(height)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNowrap_justifyContentCenter_directionColumn() {
+        // This is to fix https://github.com/google/flexbox-layout/issues/469
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val width = 100
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.flexWrap = FlexWrap.NOWRAP
+            layoutManager.justifyContent = JustifyContent.CENTER
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 1..3) {
+                val lp = createLayoutParams(activity, width, 70)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view1Right= layoutManager.getChildAt(0)!!.right
+        val view2Right = layoutManager.getChildAt(1)!!.right
+        val view3Right = layoutManager.getChildAt(2)!!.right
+        assertThat(view1Right, `is`(activity.dpToPixel(width)))
+        assertThat(view2Right, `is`(activity.dpToPixel(width)))
+        assertThat(view3Right, `is`(activity.dpToPixel(width)))
+    }
+
+    /**
+     * Creates a new flex item.
+     *
+     * @param context the context
+     * @param width   in DP
+     * @param height  in DP
+     * @return the created [FlexboxLayoutManager.LayoutParams] instance
+     */
+    private fun createLayoutParams(context: Context, width: Int,
+                                   height: Int): FlexboxLayoutManager.LayoutParams {
+        return FlexboxLayoutManager.LayoutParams(context.dpToPixel(width), context.dpToPixel(height))
+    }
+
+    private fun swipe(from: CoordinatesProvider, to: CoordinatesProvider): ViewAction {
+        return GeneralSwipeAction(Swipe.FAST, from, to, Press.FINGER)
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxTestActivity.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxTestActivity.kt
new file mode 100755
index 0000000..b7b81f0
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxTestActivity.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.app.Activity
+import com.google.android.flexbox.FlexboxLayout
+
+/**
+ * Activity for testing the [FlexboxLayout].
+ */
+class FlexboxTestActivity : Activity()
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/IsEqualAllowingError.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/IsEqualAllowingError.kt
new file mode 100755
index 0000000..68c74e8
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/IsEqualAllowingError.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import org.hamcrest.BaseMatcher
+import org.hamcrest.Description
+import org.hamcrest.Factory
+import org.hamcrest.Matcher
+import java.util.*
+
+/**
+ * Custom [BaseMatcher] that expects [Number] value allowing some errors to allow
+ * such as rounding errors.
+ */
+class IsEqualAllowingError<T : Number> private constructor(private val expected: Number, private val errorAllowed: Int) : BaseMatcher<T>() {
+
+    override fun matches(item: Any): Boolean {
+        if (item !is Number) {
+            return false
+        }
+        return expected.toInt() - errorAllowed <= item.toInt() && item.toInt() <= expected.toInt() + errorAllowed
+    }
+
+    override fun describeTo(description: Description) {
+        description.appendText(
+                String.format(Locale.US, "expected value is <%s> allowing error of <%s>.", expected,
+                        errorAllowed))
+    }
+
+    companion object {
+
+        @Factory
+        fun <T : Number> isEqualAllowingError(expected: T): Matcher<T> {
+            return IsEqualAllowingError(expected, 2)
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedInnerAdapter.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedInnerAdapter.kt
new file mode 100755
index 0000000..ea673cb
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedInnerAdapter.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * Adapter for the tests for nested RecyclerViews.
+ * This Adapter is used for the inner RecyclerView.
+ */
+internal class NestedInnerAdapter(private val innerPosition: Int, private val itemCount: Int)
+    : RecyclerView.Adapter<NestedInnerAdapter.InnerViewHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NestedInnerAdapter.InnerViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.viewholder_textview, parent, false)
+        return InnerViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: InnerViewHolder, position: Int) {
+        holder.textView.text = holder.textView.resources.getString(R.string.item_description, innerPosition, position)
+    }
+
+    override fun getItemCount() = itemCount
+
+    internal class InnerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        val textView: TextView = itemView.findViewById(R.id.textview)
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedOuterAdapter.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedOuterAdapter.kt
new file mode 100755
index 0000000..72e3cc8
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedOuterAdapter.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * Adapter for the tests for nested RecyclerViews.
+ * This Adapter is used for the outer RecyclerView.
+ */
+internal class NestedOuterAdapter(
+        @param:FlexDirection private val flexDirection: Int, private val innerAdapterItemCount: Int,
+        @param:LayoutRes private val viewHolderResId: Int
+) : RecyclerView.Adapter<NestedOuterAdapter.OuterViewHolder>() {
+
+    private val viewHolderList = mutableListOf<OuterViewHolder>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OuterViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(viewHolderResId, parent, false)
+        val holder = OuterViewHolder(view)
+        viewHolderList.add(holder)
+        return holder
+    }
+
+    override fun onBindViewHolder(holder: OuterViewHolder, position: Int) {
+        val layoutManager = FlexboxLayoutManager(holder.itemView.context)
+        layoutManager.flexDirection = flexDirection
+        holder.innerRecyclerView.layoutManager = layoutManager
+        holder.innerRecyclerView.adapter = NestedInnerAdapter(position, innerAdapterItemCount)
+    }
+
+    fun getViewHolder(position: Int) = viewHolderList[position]
+
+    override fun getItemCount() = ITEM_COUNT
+
+    internal class OuterViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val innerRecyclerView: RecyclerView = itemView.findViewById(R.id.recyclerview_inner)
+    }
+
+    companion object {
+        private const val ITEM_COUNT = 4
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt
new file mode 100755
index 0000000..361463e
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * [RecyclerView.Adapter] implementation for [TestViewHolder].
+ */
+internal class TestAdapter private constructor(
+        private val layoutParams: MutableList<FlexboxLayoutManager.LayoutParams>)
+    : RecyclerView.Adapter<TestViewHolder>() {
+
+    private val receivedPayloads = mutableListOf<Any>()
+
+    constructor() : this(mutableListOf<FlexboxLayoutManager.LayoutParams>())
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TestViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.recyclerview_viewholder, parent, false)
+        return TestViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: TestViewHolder, position: Int) {
+        holder.textView.text = (position + 1).toString()
+        holder.textView.setBackgroundResource(R.drawable.flex_item_background)
+        holder.textView.gravity = Gravity.CENTER
+        holder.textView.layoutParams = layoutParams[position]
+    }
+
+    override fun onBindViewHolder(holder: TestViewHolder, position: Int, payloads: List<Any>) {
+        receivedPayloads.addAll(payloads)
+        onBindViewHolder(holder, position)
+    }
+
+    fun addItem(position: Int, flexItem: FlexboxLayoutManager.LayoutParams) {
+        layoutParams.add(position, flexItem)
+        notifyItemInserted(position)
+    }
+
+    fun addItem(flexItem: FlexboxLayoutManager.LayoutParams) {
+        layoutParams.add(flexItem)
+        notifyItemInserted(layoutParams.size - 1)
+    }
+
+    fun changeItemWithPayload(position: Int, payload: Any) {
+        notifyItemChanged(position, payload)
+    }
+
+    val payloads get() = receivedPayloads.toList()
+
+    fun getItemAt(index: Int) = layoutParams[index]
+
+    override fun getItemCount() = layoutParams.size
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapterMultiViewTypes.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapterMultiViewTypes.kt
new file mode 100755
index 0000000..aa2cb13
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapterMultiViewTypes.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * [RecyclerView.Adapter] implementation for [TestViewHolder], which has multiple
+ * view types.
+ */
+internal class TestAdapterMultiViewTypes : RecyclerView.Adapter<TestViewHolder>() {
+
+    private val items = mutableListOf<Item>()
+
+    init {
+        for (i in 0 until ITEMS) {
+            val item = Item()
+            if (i == POSITION_MATCH_PARENT) {
+                item.viewType = VIEW_TYPE_MATCH_PARENT
+            }
+            item.value = i + 1
+            items.add(item)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TestViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.recyclerview_viewholder, parent, false)
+        if (viewType == VIEW_TYPE_MATCH_PARENT) {
+            val flexboxLp = view.layoutParams as FlexboxLayoutManager.LayoutParams
+            flexboxLp.flexBasisPercent = 90f
+            flexboxLp.flexGrow = 1f
+        }
+        return TestViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: TestViewHolder, position: Int) {
+        holder.textView.text = items[position].value.toString()
+        holder.textView.setBackgroundResource(R.drawable.flex_item_background)
+        holder.textView.gravity = Gravity.CENTER
+    }
+
+    override fun getItemViewType(position: Int) = items[position].viewType
+
+    fun addItemAt(position: Int, item: Item) {
+        items.add(position, item)
+        notifyItemInserted(position)
+    }
+
+    override fun getItemCount() = items.size
+
+    internal class Item {
+        internal var viewType = VIEW_TYPE_NORMAL
+        internal var value = 0
+    }
+
+    companion object {
+
+        internal const val POSITION_MATCH_PARENT = 3
+        private const val ITEMS = 50
+
+        private const val VIEW_TYPE_NORMAL = 0
+        private const val VIEW_TYPE_MATCH_PARENT = 1
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestUtil.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestUtil.kt
new file mode 100755
index 0000000..92c3c43
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestUtil.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+
+internal fun Context.dpToPixel(dp: Int): Int {
+    val displayMetrics = this.resources.displayMetrics
+    return if (dp < 0) dp else Math.round(dp * displayMetrics.density)
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestViewHolder.kt b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestViewHolder.kt
new file mode 100755
index 0000000..ded6c44
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestViewHolder.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * ViewHolder implementation for a flex item for testing.
+ */
+internal class TestViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    val textView: TextView = itemView.findViewById(R.id.textview)
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider.xml
new file mode 100755
index 0000000..ec793d2
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size
+        android:width="10dp"
+        android:height="15dp" />
+    <solid android:color="#44A444" />
+</shape>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider_thick.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider_thick.xml
new file mode 100755
index 0000000..8148332
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider_thick.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size
+        android:width="40dp"
+        android:height="42dp" />
+    <solid android:color="#44A444" />
+</shape>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/flex_item_background.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/flex_item_background.xml
new file mode 100755
index 0000000..e743ee1
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/flex_item_background.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="#11aabb" />
+    <stroke android:width="1dp" android:color="#888888"/>
+</shape>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test.xml
new file mode 100755
index 0000000..83103c5
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test_overflowed.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test_overflowed.xml
new file mode 100755
index 0000000..585c6f9
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test_overflowed.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap_reverse"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="5" />
+
+    <TextView
+        android:id="@+id/text6"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="6" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_test.xml
new file mode 100755
index 0000000..032f71c
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_test.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="baseline">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="1"
+        android:gravity="bottom" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="2"
+        android:gravity="top" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="3"
+        android:paddingTop="20dp"
+        android:gravity="center" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_wrap_content.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_wrap_content.xml
new file mode 100755
index 0000000..486b41d
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_wrap_content.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="baseline">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="1"
+        android:gravity="bottom" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="2"
+        android:gravity="top" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="3"
+        android:paddingTop="20dp"
+        android:gravity="center" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_parent_padding_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_parent_padding_test.xml
new file mode 100755
index 0000000..fca45a4
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_parent_padding_test.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    android:padding="16dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_end">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_test.xml
new file mode 100755
index 0000000..3b056b0
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="stretch"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_self_stretch_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_self_stretch_test.xml
new file mode 100755
index 0000000..097230b
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_self_stretch_test.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1"
+        app:layout_alignSelf="stretch" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_column.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_column.xml
new file mode 100755
index 0000000..7c44604
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_column.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_flexGrow="1.0" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_wrapBefore="true" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_row.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_row.xml
new file mode 100755
index 0000000..3e4903b
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_row.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        android:text="1"
+        app:layout_flexGrow="1.0" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:text="2"
+        app:layout_wrapBefore="true" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_column_align_items_center_margin_oneside.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_column_align_items_center_margin_oneside.xml
new file mode 100755
index 0000000..8cf9e46
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_column_align_items_center_margin_oneside.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="100dp"
+    android:layout_height="20dp"
+    app:flexDirection="column">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="20dp"
+        android:layout_height="match_parent"
+        android:layout_marginRight="20dp"
+        android:text="1"
+        app:layout_alignSelf="center" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_row_align_items_center_margin_oneside.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_row_align_items_center_margin_oneside.xml
new file mode 100755
index 0000000..f6d560c
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_row_align_items_center_margin_oneside.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="20dp"
+    android:layout_height="100dp"
+    app:flexDirection="row">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:layout_marginBottom="20dp"
+        android:text="1"
+        app:layout_alignSelf="center" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_column.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_column.xml
new file mode 100755
index 0000000..840521b
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_column.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:dividerDrawableHorizontal="@drawable/divider"
+    app:showDividerHorizontal="beginning">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="80dp"
+        android:layout_height="90dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="80dp"
+        android:layout_height="90dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="80dp"
+        android:layout_height="90dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="80dp"
+        android:layout_height="140dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="80dp"
+        android:layout_height="140dp"
+        android:text="5" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_row.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_row.xml
new file mode 100755
index 0000000..652ff7d
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_row.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:dividerDrawableVertical="@drawable/divider"
+    app:showDividerVertical="beginning">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="90dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="90dp"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="90dp"
+        android:layout_height="80dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="5" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_empty_children.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_empty_children.xml
new file mode 100755
index 0000000..55ae135
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_empty_children.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexWrap="wrap">
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_horizontal_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_horizontal_test.xml
new file mode 100755
index 0000000..0777747
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_horizontal_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="500dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="300dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_vertical_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_vertical_test.xml
new file mode 100755
index 0000000..7f3938c
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_vertical_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="500dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="6dp"
+        android:layout_height="300dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_first_line_single_item.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_first_line_single_item.xml
new file mode 100755
index 0000000..6de3ed9
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_first_line_single_item.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!--
+This layout verifies the case where the first view's visibility is gone and the second view is
+in the next flex line by setting the layout_wrapBefore="true"
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2"
+        app:layout_wrapBefore="true"
+    />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_wrapBefore="true"
+    />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_grow_set_for_rest.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_grow_set_for_rest.xml
new file mode 100755
index 0000000..228c916
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_grow_set_for_rest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!--
+This layout verifies the case where the first view's visibility is gone and the second view is
+in the next flex line by setting the layout_wrapBefore="true"
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2"
+        app:layout_wrapBefore="true"
+        app:layout_flexGrow="1" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_flexGrow="1"
+        app:layout_wrapBefore="true" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_shrink_set_for_rest.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_shrink_set_for_rest.xml
new file mode 100755
index 0000000..423614b
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_shrink_set_for_rest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!--
+This layout verifies the case where the first view's visibility is gone and the second view is
+in the next flex line by setting the layout_wrapBefore="true"
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2"
+        app:layout_wrapBefore="true"
+        app:layout_flexShrink="1" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_flexShrink="1"
+        app:layout_wrapBefore="true" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_basis_percent_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_basis_percent_test.xml
new file mode 100755
index 0000000..d75a1eb
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_basis_percent_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_flexBasisPercent="50%"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_flexBasisPercent="60%"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_grow_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_grow_test.xml
new file mode 100755
index 0000000..0616b39
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_grow_test.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent.xml
new file mode 100755
index 0000000..877fa74
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent_direction_column.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent_direction_column.xml
new file mode 100755
index 0000000..edcfc02
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent_direction_column.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_wrap_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_wrap_test.xml
new file mode 100755
index 0000000..a10ce38
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_wrap_test.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="300dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="1"
+        app:layout_flexShrink="0" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="2"
+        app:layout_flexShrink="0" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="3"
+        app:layout_flexShrink="0" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrap_content.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrap_content.xml
new file mode 100755
index 0000000..a2abbbb
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrap_content.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  --><!-- Set the layout_width and layout_height as wrap_content to test the behavior of
+     the situation MeasureSpec.AT_MOST is set as width/height mode -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_horizontalscrollview.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_horizontalscrollview.xml
new file mode 100755
index 0000000..137e6fd
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_horizontalscrollview.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!-- Wrap the FlexboxLayout with a Scrollview to test
+     the situation MeasureSpec.UNSPECIFIED is set as height mode -->
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.flexbox.FlexboxLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/flexbox_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="400dp"
+        app:flexDirection="column"
+        app:flexWrap="wrap">
+
+        <TextView
+            android:id="@+id/text1"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:text="1" />
+
+        <TextView
+            android:id="@+id/text2"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:text="2" />
+
+        <TextView
+            android:id="@+id/text3"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:text="3" />
+    </com.google.android.flexbox.FlexboxLayout>
+</HorizontalScrollView>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_scrollview.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_scrollview.xml
new file mode 100755
index 0000000..0d5d2f0
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_scrollview.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!-- Wrap the FlexboxLayout with a Scrollview to test
+     the situation MeasureSpec.UNSPECIFIED is set as height mode -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.flexbox.FlexboxLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/flexbox_layout"
+        android:layout_width="360dp"
+        android:layout_height="wrap_content"
+        app:flexDirection="row"
+        app:flexWrap="wrap">
+
+        <TextView
+            android:id="@+id/text1"
+            android:layout_width="140dp"
+            android:layout_height="500dp"
+            android:text="1" />
+
+        <TextView
+            android:id="@+id/text2"
+            android:layout_width="140dp"
+            android:layout_height="500dp"
+            android:text="2" />
+
+        <TextView
+            android:id="@+id/text3"
+            android:layout_width="140dp"
+            android:layout_height="500dp"
+            android:text="3" />
+    </com.google.android.flexbox.FlexboxLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_test.xml
new file mode 100755
index 0000000..4e72278
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_test.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:justifyContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_gone.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_gone.xml
new file mode 100755
index 0000000..e90f2e5
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_gone.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:justifyContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="2"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_parent_padding.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_parent_padding.xml
new file mode 100755
index 0000000..102f352
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_parent_padding.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/frame_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="24dp">
+
+    <com.google.android.flexbox.FlexboxLayout
+        android:id="@+id/flexbox_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="8dp"
+        app:flexDirection="row"
+        app:justifyContent="flex_start">
+
+        <TextView
+            android:id="@+id/text1"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:text="1" />
+
+        <TextView
+            android:id="@+id/text2"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:text="2" />
+
+        <TextView
+            android:id="@+id/text3"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:text="3" />
+    </com.google.android.flexbox.FlexboxLayout>
+</FrameLayout>
+
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_test.xml
new file mode 100755
index 0000000..031d2ae
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_test.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="150dp"
+        android:text="1"
+        app:layout_maxHeight="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_upper_bound_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_upper_bound_test.xml
new file mode 100755
index 0000000..a31320a
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_upper_bound_test.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        android:text="1"
+        app:layout_flexGrow="1"
+        app:layout_maxHeight="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        app:layout_flexGrow="1"
+        android:text="2" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_test.xml
new file mode 100755
index 0000000..949697b
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_maxWidth="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_upper_bound_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_upper_bound_test.xml
new file mode 100755
index 0000000..bb12f5b
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_upper_bound_test.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_flexGrow="1"
+        app:layout_maxWidth="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        app:layout_flexGrow="1"
+        android:text="2" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_lower_bound_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_lower_bound_test.xml
new file mode 100755
index 0000000..f42af2f
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_lower_bound_test.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="1"
+        app:layout_minHeight="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="4" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_test.xml
new file mode 100755
index 0000000..da613e4
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_test.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_minHeight="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_lower_bound_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_lower_bound_test.xml
new file mode 100755
index 0000000..c6e21ad
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_lower_bound_test.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_minWidth="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="4" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_test.xml
new file mode 100755
index 0000000..405144a
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_minWidth="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_order_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_order_test.xml
new file mode 100755
index 0000000..a5b6977
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_order_test.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_order="2" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_order="-1" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="3"
+        app:layout_order="0" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="4" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_simple.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_simple.xml
new file mode 100755
index 0000000..b88e0c5
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_simple.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row_reverse"
+    app:justifyContent="center"
+    app:alignContent="center"
+    app:alignItems="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_order="2"
+        app:layout_flexGrow="1"
+        app:layout_alignSelf="stretch" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_stretch_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_stretch_test.xml
new file mode 100755
index 0000000..78496cf
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_stretch_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="360dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_gone.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_gone.xml
new file mode 100755
index 0000000..ac02713
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_gone.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="300dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="2"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="5" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_invisible.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_invisible.xml
new file mode 100755
index 0000000..a5e2151
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_invisible.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="300dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="1"
+        android:visibility="invisible" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="2"
+        android:visibility="invisible" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_column.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_column.xml
new file mode 100755
index 0000000..011294c
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_column.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="360dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="160dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="160dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="160dp"
+        android:visibility="gone"
+        android:text="3" />
+
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_row.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_row.xml
new file mode 100755
index 0000000..84f50e7
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_row.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="wrap_content"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="wrap_content"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:text="3" />
+
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_before_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_before_test.xml
new file mode 100755
index 0000000..0df906c
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_before_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="2"
+        app:layout_wrapBefore="true" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="3"
+        app:layout_wrapBefore="true" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_horizontal_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_horizontal_test.xml
new file mode 100755
index 0000000..d95ab70
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_horizontal_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="280dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:layout_margin="32dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_vertical_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_vertical_test.xml
new file mode 100755
index 0000000..5e26469
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_vertical_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="360dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="80dp"
+        android:layout_height="280dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="80dp"
+        android:layout_height="30dp"
+        android:layout_margin="32dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_grow.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_grow.xml
new file mode 100755
index 0000000..e25531c
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_grow.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="24dp"
+        android:layout_height="0dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginRight="12dp"
+        android:text="1"
+        app:layout_flexBasisPercent="50%"
+        app:layout_flexGrow="1"
+        app:layout_flexShrink="0" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_shrink.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_shrink.xml
new file mode 100755
index 0000000..4cc389b
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_shrink.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="200dp"
+    app:flexDirection="column"
+    app:flexWrap="nowrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="24dp"
+        android:layout_height="150dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginRight="12dp"
+        android:text="1"
+        app:layout_flexShrink="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="12dp"
+        android:layout_height="100dp"
+        android:text="2"
+        app:layout_flexShrink="1" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_grow.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_grow.xml
new file mode 100755
index 0000000..5207d6a
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_grow.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexWrap="wrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="0dp"
+        android:layout_height="24dp"
+        android:layout_marginBottom="12dp"
+        android:text="test"
+        app:layout_flexBasisPercent="50%"
+        app:layout_flexGrow="1"
+        app:layout_flexShrink="0" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_shrink.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_shrink.xml
new file mode 100755
index 0000000..05be02a
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_shrink.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="200dp"
+    android:layout_height="wrap_content"
+    app:flexWrap="nowrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="150dp"
+        android:layout_height="24dp"
+        android:layout_marginBottom="12dp"
+        android:text="test1"
+        app:layout_flexShrink="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="100dp"
+        android:layout_height="12dp"
+        android:text="test2"
+        app:layout_flexShrink="1" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_horizontal_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_horizontal_test.xml
new file mode 100755
index 0000000..c4ac440
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_horizontal_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    android:padding="32dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="280dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_vertical_test.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_vertical_test.xml
new file mode 100755
index 0000000..69641cb
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_vertical_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="360dp"
+    android:padding="32dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="80dp"
+        android:layout_height="280dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="80dp"
+        android:layout_height="30dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_height_positive_flexgrow.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_height_positive_flexgrow.xml
new file mode 100755
index 0000000..4caeef7
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_height_positive_flexgrow.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="column"
+    app:alignItems="flex_start" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="1"
+        app:layout_flexGrow="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="2-some long text"
+        app:layout_flexGrow="1" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_width_positive_flexgrow.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_width_positive_flexgrow.xml
new file mode 100755
index 0000000..cd420b7
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_width_positive_flexgrow.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:alignItems="flex_start" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_flexGrow="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="2-some long text"
+        app:layout_flexGrow="1" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview.xml
new file mode 100755
index 0000000..1db3834
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- Some APIs in espresso requires the view being performed is at least 90% visible to the
+     user, using the small width so that low resolution devices are covered-->
+<androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="320dp"
+    android:layout_height="240dp" />
+
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_reverse.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_reverse.xml
new file mode 100755
index 0000000..9f5ba82
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_reverse.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    app:reverseLayout="true"
+    app:stackFromEnd="true"
+    app:layoutManager="com.google.android.flexbox.FlexboxLayoutManager" />
+
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_viewholder.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_viewholder.xml
new file mode 100755
index 0000000..f0f1f77
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_viewholder.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textview"
+    android:layout_width="120dp"
+    android:layout_height="80dp" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview.xml
new file mode 100755
index 0000000..48b633e
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- The nested RecyclerViews tests verify the wrap_content behavior -->
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recyclerview_inner"
+    android:layout_width="200dp"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="8dp" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview_wrap_horizontally.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview_wrap_horizontally.xml
new file mode 100755
index 0000000..294028c
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview_wrap_horizontally.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- The nested RecyclerViews tests verify the wrap_content behavior -->
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recyclerview_inner"
+    android:layout_width="wrap_content"
+    android:layout_height="200dp"
+    android:layout_marginBottom="8dp" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_textview.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_textview.xml
new file mode 100755
index 0000000..213409d
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_textview.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textview"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="4dp" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview.xml
new file mode 100755
index 0000000..3522d99
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- Some APIs in espresso requires the view being performed is at least 90% visible to the
+     user, using the small width so that low resolution devices are covered-->
+<FrameLayout android:id="@+id/container"
+             xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="320dp"
+             android:layout_height="240dp">
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+                                            android:layout_width="600dp"
+                                            android:layout_height="match_parent"/>
+</FrameLayout>
+
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview_scroll_vertical.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview_scroll_vertical.xml
new file mode 100755
index 0000000..797fdf2
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview_scroll_vertical.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- Some APIs in espresso requires the view being performed is at least 90% visible to the
+     user, using the small width so that low resolution devices are covered-->
+<FrameLayout android:id="@+id/container"
+             xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="320dp"
+             android:layout_height="240dp">
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+                                            android:layout_width="match_parent"
+                                            android:layout_height="600dp"/>
+</FrameLayout>
+
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/values/strings.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/values/strings.xml
new file mode 100755
index 0000000..706faa4
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/androidTest/res/values/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <string name="item_description">%1$s - %2$s</string>
+</resources>
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..beebcea
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<manifest package="com.google.android.flexbox" />
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignContent.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignContent.java
new file mode 100755
index 0000000..ac5e199
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignContent.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/** This attribute controls the alignment of the flex lines in the flex container. */
+@IntDef({AlignContent.FLEX_START, AlignContent.FLEX_END, AlignContent.CENTER,
+        AlignContent.SPACE_BETWEEN, AlignContent.SPACE_AROUND, AlignContent.STRETCH})
+@Retention(RetentionPolicy.SOURCE)
+public @interface AlignContent {
+
+    /** Flex lines are packed to the start of the flex container. */
+    int FLEX_START = 0;
+
+    /** Flex lines are packed to the end of the flex container. */
+    int FLEX_END = 1;
+
+    /** Flex lines are centered in the flex container. */
+    int CENTER = 2;
+
+    /**
+     * Flex lines are evenly distributed in the flex container. The first flex line is
+     * placed at the start of the flex container, the last flex line is placed at the
+     * end of the flex container.
+     */
+    int SPACE_BETWEEN = 3;
+
+    /**
+     * Flex lines are evenly distributed in the flex container with the same amount of spaces
+     * between the flex lines.
+     */
+    int SPACE_AROUND = 4;
+
+    /**
+     * Flex lines are stretched to fill the remaining space along the cross axis.
+     */
+    int STRETCH = 5;
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignItems.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignItems.java
new file mode 100755
index 0000000..8392ed1
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignItems.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/** This attribute controls the alignment along the cross axis. */
+@IntDef({AlignItems.FLEX_START, AlignItems.FLEX_END, AlignItems.CENTER,
+        AlignItems.BASELINE, AlignItems.STRETCH})
+@Retention(RetentionPolicy.SOURCE)
+public @interface AlignItems {
+
+    /** Flex item's edge is placed on the cross start line. */
+    int FLEX_START = 0;
+
+    /** Flex item's edge is placed on the cross end line. */
+    int FLEX_END = 1;
+
+    /** Flex item's edge is centered along the cross axis. */
+    int CENTER = 2;
+
+    /** Flex items are aligned based on their text's baselines. */
+    int BASELINE = 3;
+
+    /** Flex items are stretched to fill the flex line's cross size. */
+    int STRETCH = 4;
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignSelf.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignSelf.java
new file mode 100755
index 0000000..dff3fde
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignSelf.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/**
+ * This attribute controls the alignment along the cross axis.
+ * The alignment in the same direction can be determined by the {@link AlignItems} attribute in the
+ * parent, but if this is set to other than {@link AlignSelf#AUTO},
+ * the cross axis alignment is overridden for this child.
+ */
+@IntDef({AlignItems.FLEX_START, AlignItems.FLEX_END, AlignItems.CENTER,
+        AlignItems.BASELINE, AlignItems.STRETCH, AlignSelf.AUTO})
+@Retention(RetentionPolicy.SOURCE)
+public @interface AlignSelf {
+
+    /**
+     * The default value for the AlignSelf attribute, which means use the inherit
+     * the {@link AlignItems} attribute from its parent.
+     */
+    int AUTO = -1;
+
+    /** This item's edge is placed on the cross start line. */
+    int FLEX_START = AlignItems.FLEX_START;
+
+    /** This item's edge is placed on the cross end line. */
+    int FLEX_END = AlignItems.FLEX_END;
+
+    /** This item's edge is centered along the cross axis. */
+    int CENTER = AlignItems.CENTER;
+
+    /** This items is aligned based on their text's baselines. */
+    int BASELINE = AlignItems.BASELINE;
+
+    /** This item is stretched to fill the flex line's cross size. */
+    int STRETCH = AlignItems.STRETCH;
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexContainer.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexContainer.java
new file mode 100755
index 0000000..3421119
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexContainer.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.view.View;
+
+import java.util.List;
+
+/**
+ * An interface that has the common behavior as the flex container such as {@link FlexboxLayout}
+ * and {@link FlexboxLayoutManager}.
+ */
+interface FlexContainer {
+
+    int NOT_SET = -1;
+
+    /**
+     * @return the number of flex items contained in the flex container.
+     */
+    int getFlexItemCount();
+
+    /**
+     * Returns a flex item as a View at the given index.
+     *
+     * @param index the index
+     * @return the view at the index
+     */
+    View getFlexItemAt(int index);
+
+    /**
+     * Returns a flex item as a View, which is reordered by taking the order attribute into
+     * account.
+     *
+     * @param index the index of the view
+     * @return the reordered view, which order attribute is taken into account.
+     * If the index is negative or out of bounds of the number of contained views,
+     * returns {@code null}.
+     * @see FlexItem#getOrder()
+     */
+    View getReorderedFlexItemAt(int index);
+
+    /**
+     * Adds the view to the flex container as a flex item.
+     *
+     * @param view the view to be added
+     */
+    void addView(View view);
+
+    /**
+     * Adds the view to the specified index of the flex container.
+     *
+     * @param view  the view to be added
+     * @param index the index for the view to be added
+     */
+    void addView(View view, int index);
+
+    /**
+     * Removes all the views contained in the flex container.
+     */
+    void removeAllViews();
+
+    /**
+     * Removes the view at the specified index.
+     *
+     * @param index the index from which the view is removed.
+     */
+    void removeViewAt(int index);
+
+    /**
+     * @return the flex direction attribute of the flex container.
+     * @see FlexDirection
+     */
+    @FlexDirection
+    int getFlexDirection();
+
+    /**
+     * Sets the given flex direction attribute to the flex container.
+     *
+     * @param flexDirection the flex direction value
+     * @see FlexDirection
+     */
+    void setFlexDirection(@FlexDirection int flexDirection);
+
+    /**
+     * @return the flex wrap attribute of the flex container.
+     * @see FlexWrap
+     */
+    @FlexWrap
+    int getFlexWrap();
+
+    /**
+     * Sets the given flex wrap attribute to the flex container.
+     *
+     * @param flexWrap the flex wrap value
+     * @see FlexWrap
+     */
+    void setFlexWrap(@FlexWrap int flexWrap);
+
+    /**
+     * @return the justify content attribute of the flex container.
+     * @see JustifyContent
+     */
+    @JustifyContent
+    int getJustifyContent();
+
+    /**
+     * Sets the given justify content attribute to the flex container.
+     *
+     * @param justifyContent the justify content value
+     * @see JustifyContent
+     */
+    void setJustifyContent(@JustifyContent int justifyContent);
+
+    /**
+     * @return the align content attribute of the flex container.
+     * @see AlignContent
+     */
+    @AlignContent
+    int getAlignContent();
+
+    /**
+     * Sets the given align content attribute to the flex container.
+     *
+     * @param alignContent the align content value
+     */
+    void setAlignContent(@AlignContent int alignContent);
+
+    /**
+     * @return the align items attribute of the flex container.
+     * @see AlignItems
+     */
+    @AlignItems
+    int getAlignItems();
+
+    /**
+     * Sets the given align items attribute to the flex container.
+     *
+     * @param alignItems the align items value
+     * @see AlignItems
+     */
+    void setAlignItems(@AlignItems int alignItems);
+
+    /**
+     * @return the flex lines composing this flex container. The overridden method should return a
+     * copy of the original list excluding a dummy flex line (flex line that doesn't have any flex
+     * items in it but used for the alignment along the cross axis) so that any changes of the
+     * returned list are not reflected to the original list.
+     */
+    List<FlexLine> getFlexLines();
+
+    /**
+     * Returns true if the main axis is horizontal, false otherwise.
+     *
+     * @return true if the main axis is horizontal, false otherwise
+     */
+    boolean isMainAxisDirectionHorizontal();
+
+    /**
+     * Returns the length of decoration (such as dividers) of the flex item along the main axis.
+     *
+     * @param view            the view from which the length of the decoration is retrieved
+     * @param index           the absolute index of the flex item within the flex container
+     * @param indexInFlexLine the relative index of the flex item within the flex line
+     * @return the length of the decoration. Note that the length of the flex item itself is not
+     * included in the result.
+     */
+    int getDecorationLengthMainAxis(View view, int index, int indexInFlexLine);
+
+    /**
+     * Returns the length of decoration (such as dividers) of the flex item along the cross axis.
+     *
+     * @param view the view from which the length of the decoration is retrieved
+     * @return the length of the decoration. Note that the length of the flex item itself is not
+     * included in the result.
+     */
+    int getDecorationLengthCrossAxis(View view);
+
+    /**
+     * @return the top padding of the flex container.
+     */
+    int getPaddingTop();
+
+    /**
+     * @return the left padding of the flex container.
+     */
+    int getPaddingLeft();
+
+    /**
+     * @return the right padding of the flex container.
+     */
+    int getPaddingRight();
+
+    /**
+     * @return the bottom padding of the flex container.
+     */
+    int getPaddingBottom();
+
+    /**
+     * @return the start padding of this view depending on its resolved layout direction.
+     */
+    int getPaddingStart();
+
+    /**
+     * @return the end padding of this view depending on its resolved layout direction.
+     */
+    int getPaddingEnd();
+
+    /**
+     * Returns the child measure spec for its width.
+     *
+     * @param widthSpec      the measure spec for the width imposed by the parent
+     * @param padding        the padding along the width for the parent
+     * @param childDimension the value of the child dimension
+     */
+    int getChildWidthMeasureSpec(int widthSpec, int padding, int childDimension);
+
+    /**
+     * Returns the child measure spec for its height.
+     *
+     * @param heightSpec     the measure spec for the height imposed by the parent
+     * @param padding        the padding along the height for the parent
+     * @param childDimension the value of the child dimension
+     */
+    int getChildHeightMeasureSpec(int heightSpec, int padding, int childDimension);
+
+    /**
+     * @return the largest main size of all flex lines including decorator lengths.
+     */
+    int getLargestMainSize();
+
+    /**
+     * @return the sum of the cross sizes of all flex lines including decorator lengths.
+     */
+    int getSumOfCrossSize();
+
+    /**
+     * Callback when a new flex item is added to the current container
+     *
+     * @param view            the view as a flex item which is added
+     * @param index           the absolute index of the flex item added
+     * @param indexInFlexLine the relative index of the flex item added within the flex line
+     * @param flexLine        the flex line where the new flex item is added
+     */
+    void onNewFlexItemAdded(View view, int index, int indexInFlexLine, FlexLine flexLine);
+
+    /**
+     * Callback when a new flex line is added to the current container
+     *
+     * @param flexLine the new added flex line
+     */
+    void onNewFlexLineAdded(FlexLine flexLine);
+
+    /**
+     * Sets the list of the flex lines that compose the flex container to the one received as an
+     * argument.
+     *
+     * @param flexLines the list of flex lines
+     */
+    void setFlexLines(List<FlexLine> flexLines);
+
+    /**
+     * @return the current value of the maximum number of flex lines. If not set, {@link #NOT_SET}
+     * is returned.
+     */
+    int getMaxLine();
+
+    /**
+     *
+     * @param maxLine the int value, which specifies the maximum number of flex lines
+     */
+    void setMaxLine(int maxLine);
+
+    /**
+     * @return the list of the flex lines including dummy flex lines (flex line that doesn't have
+     * any flex items in it but used for the alignment along the cross axis), which aren't included
+     * in the {@link FlexContainer#getFlexLines()}.
+     */
+    List<FlexLine> getFlexLinesInternal();
+
+    /**
+     * Update the view cache in the flex container.
+     *
+     * @param position the position of the view to be updated
+     * @param view     the view instance
+     */
+    void updateViewCache(int position, View view);
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexDirection.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexDirection.java
new file mode 100755
index 0000000..a7b94d2
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexDirection.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/**
+ * The direction children items are placed inside the flex container, it determines the
+ * direction of the main axis (and the cross axis, perpendicular to the main axis).
+ */
+@IntDef({FlexDirection.ROW, FlexDirection.ROW_REVERSE, FlexDirection.COLUMN,
+        FlexDirection.COLUMN_REVERSE})
+@Retention(RetentionPolicy.SOURCE)
+public @interface FlexDirection {
+
+    /**
+     * Main axis direction -> horizontal. Main start to
+     * main end -> Left to right (in LTR languages).
+     * Cross start to cross end -> Top to bottom
+     */
+    int ROW = 0;
+
+    /**
+     * Main axis direction -> horizontal. Main start
+     * to main end -> Right to left (in LTR languages). Cross start to cross end ->
+     * Top to bottom.
+     */
+    int ROW_REVERSE = 1;
+
+    /**
+     * Main axis direction -> vertical. Main start
+     * to main end -> Top to bottom. Cross start to cross end ->
+     * Left to right (In LTR languages).
+     */
+    int COLUMN = 2;
+
+    /**
+     * Main axis direction -> vertical. Main start
+     * to main end -> Bottom to top. Cross start to cross end -> Left to right
+     * (In LTR languages)
+     */
+    int COLUMN_REVERSE = 3;
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexItem.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexItem.java
new file mode 100755
index 0000000..6258c9f
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexItem.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.os.Parcelable;
+import android.view.View;
+
+/**
+ * An interface that has the common behavior as a flex item contained in a flex container.
+ * Known classes that implement this interface are {@link FlexboxLayout.LayoutParams} and
+ * {@link FlexboxLayoutManager.LayoutParams}.
+ */
+interface FlexItem extends Parcelable {
+
+    /** The default value for the order attribute */
+    int ORDER_DEFAULT = 1;
+
+    /** The default value for the flex grow attribute */
+    float FLEX_GROW_DEFAULT = 0f;
+
+    /** The default value for the flex shrink attribute */
+    float FLEX_SHRINK_DEFAULT = 1f;
+
+    /** The value representing the flex shrink attribute is not set  */
+    float FLEX_SHRINK_NOT_SET = 0f;
+
+    /** The default value for the flex basis percent attribute */
+    float FLEX_BASIS_PERCENT_DEFAULT = -1f;
+
+    /** The maximum size of the max width and max height attributes */
+    int MAX_SIZE = Integer.MAX_VALUE & View.MEASURED_SIZE_MASK;
+
+    /**
+     * @return the width attribute of the flex item.
+     *
+     * The attribute is about how wide the view wants to be. Can be one of the
+     * constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    int getWidth();
+
+    /**
+     * Sets the width attribute of the flex item.
+     *
+     * @param width the width attribute. Can be one of the
+     *              constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    void setWidth(int width);
+
+    /**
+     * @return the height attribute of the flex item.
+     *
+     * The attribute is about how wide the view wants to be. Can be one of the
+     * constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    int getHeight();
+
+    /**
+     * Sets the height attribute of the flex item.
+     *
+     * @param height the height attribute. Can be one of the
+     *               constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    void setHeight(int height);
+
+    /**
+     * @return the order attribute of the flex item.
+     *
+     * The attribute can change the ordering of the children views are laid out.
+     * By default, children are displayed and laid out in the same order as they appear in the
+     * layout XML. If not specified, {@link #ORDER_DEFAULT} is set as a default value.
+     */
+    int getOrder();
+
+    /**
+     * Sets the order attribute to the flex item
+     *
+     * @param order the order attribute
+     */
+    void setOrder(int order);
+
+    /**
+     * @return the flex grow attribute of the flex item
+     *
+     * The attribute determines how much this child will grow if positive free space is
+     * distributed relative to the rest of other flex items included in the same flex line.
+     * If not specified, {@link #FLEX_GROW_DEFAULT} is set as a default value.
+     */
+    float getFlexGrow();
+
+    /**
+     * Sets the flex grow attribute to the flex item
+     *
+     * @param flexGrow the flex grow attribute
+     */
+    void setFlexGrow(float flexGrow);
+
+    /**
+     * @return the flex shrink attribute of the flex item
+     *
+     * The attribute determines how much this child will shrink if negative free space is
+     * distributed relative to the rest of other flex items included in the same flex line.
+     * If not specified, {@link #FLEX_SHRINK_DEFAULT} is set as a default value.
+     */
+    float getFlexShrink();
+
+    /**
+     * Sets the flex shrink attribute to the flex item
+     *
+     * @param flexShrink the flex shrink attribute
+     */
+    void setFlexShrink(float flexShrink);
+
+    /**
+     * @return the align self attribute of the flex item
+     *
+     * The attribute determines the alignment along the cross axis (perpendicular to the
+     * main axis). The alignment in the same direction can be determined by the
+     * align items attribute in the parent, but if this is set to other than
+     * {@link AlignSelf#AUTO}, the cross axis alignment is overridden for this child.
+     * The value needs to be one of the values in ({@link AlignSelf#AUTO},
+     * {@link AlignItems#STRETCH}, {@link AlignItems#FLEX_START}, {@link
+     * AlignItems#FLEX_END}, {@link AlignItems#CENTER}, or {@link AlignItems#BASELINE}).
+     * If not specified, {@link AlignSelf#AUTO} is set as a default value.
+     */
+    @AlignSelf
+    int getAlignSelf();
+
+    /**
+     * Sets the align self attribute to the flex item
+     *
+     * @param alignSelf the order attribute
+     */
+    void setAlignSelf(@AlignSelf int alignSelf);
+
+    /**
+     * @return the minimum width attribute of the flex item
+     *
+     * The attribute determines the minimum width the child can shrink to.
+     */
+    int getMinWidth();
+
+    /**
+     * Sets the minimum width attribute to the flex item
+     *
+     * @param minWidth the order attribute
+     */
+    void setMinWidth(int minWidth);
+
+    /**
+     * @return the minimum height attribute of the flex item
+     *
+     * The attribute determines the minimum height the child can shrink to.
+     */
+    int getMinHeight();
+
+    /**
+     * Sets the minimum height attribute to the flex item
+     *
+     * @param minHeight the order attribute
+     */
+    void setMinHeight(int minHeight);
+
+    /**
+     * @return the maximum width attribute of the flex item
+     *
+     * The attribute determines the maximum width the child can expand to.
+     */
+    int getMaxWidth();
+
+    /**
+     * Sets the maximum width attribute to the flex item
+     *
+     * @param maxWidth the order attribute
+     */
+    void setMaxWidth(int maxWidth);
+
+    /**
+     * @return the maximum height attribute of the flex item
+     */
+    int getMaxHeight();
+
+    /**
+     * Sets the maximum height attribute to the flex item
+     *
+     * @param maxHeight the order attribute
+     */
+    void setMaxHeight(int maxHeight);
+
+    /**
+     * @return the wrapBefore attribute of the flex item
+     *
+     * The attribute forces a flex line wrapping. i.e. if this is set to {@code true} for a
+     * flex item, the item will become the first item of the new flex line. (A wrapping happens
+     * regardless of the flex items being processed in the the previous flex line)
+     * This attribute is ignored if the flex_wrap attribute is set as nowrap.
+     * The equivalent attribute isn't defined in the original CSS Flexible Box Module
+     * specification, but having this attribute is useful for Android developers to flatten
+     * the layouts when building a grid like layout or for a situation where developers want
+     * to put a new flex line to make a semantic difference from the previous one, etc.
+     */
+    boolean isWrapBefore();
+
+    /**
+     * Sets the wrapBefore attribute to the flex item
+     *
+     * @param wrapBefore the order attribute
+     */
+    void setWrapBefore(boolean wrapBefore);
+
+    /**
+     * @return the flexBasisPercent attribute of the flex item
+     *
+     * The attribute determines the initial flex item length in a fraction format relative to its
+     * parent.
+     * The initial main size of this child View is trying to be expanded as the specified
+     * fraction against the parent main size.
+     * If this value is set, the length specified from layout_width
+     * (or layout_height) is overridden by the calculated value from this attribute.
+     * This attribute is only effective when the parent's MeasureSpec mode is
+     * MeasureSpec.EXACTLY. The default value is -1, which means not set.
+     */
+    float getFlexBasisPercent();
+
+    /**
+     * Sets the flex basis percent attribute to the flex item
+     *
+     * @param flexBasisPercent the order attribute
+     */
+    void setFlexBasisPercent(float flexBasisPercent);
+
+    /**
+     * @return the left margin of the flex item.
+     */
+    int getMarginLeft();
+
+    /**
+     * @return the top margin of the flex item.
+     */
+    int getMarginTop();
+
+    /**
+     * @return the right margin of the flex item.
+     */
+    int getMarginRight();
+
+    /**
+     * @return the bottom margin of the flex item.
+     */
+    int getMarginBottom();
+
+    /**
+     * @return the start margin of the flex item depending on its resolved layout direction.
+     */
+    int getMarginStart();
+
+    /**
+     * @return the end margin of the flex item depending on its resolved layout direction.
+     */
+    int getMarginEnd();
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexLine.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexLine.java
new file mode 100755
index 0000000..efb8f39
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexLine.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.view.View;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Holds properties related to a single flex line. This class is not expected to be changed outside
+ * of the {@link FlexboxLayout}, thus only exposing the getter methods that may be useful for
+ * other classes using the {@link FlexboxLayout}.
+ */
+public class FlexLine {
+
+    FlexLine() {
+    }
+
+    int mLeft = Integer.MAX_VALUE;
+
+    int mTop = Integer.MAX_VALUE;
+
+    int mRight = Integer.MIN_VALUE;
+
+    int mBottom = Integer.MIN_VALUE;
+
+    /** @see #getMainSize() */
+    int mMainSize;
+
+    /**
+     * The sum of the lengths of dividers along the main axis. This value should be lower
+     * than the value of {@link #mMainSize}.
+     */
+    int mDividerLengthInMainSize;
+
+    /** @see #getCrossSize() */
+    int mCrossSize;
+
+    /** @see #getItemCount() */
+    int mItemCount;
+
+    /** Holds the count of the views whose visibilities are gone */
+    int mGoneItemCount;
+
+    /** @see #getTotalFlexGrow() */
+    float mTotalFlexGrow;
+
+    /** @see #getTotalFlexShrink() */
+    float mTotalFlexShrink;
+
+    /**
+     * The largest value of the individual child's baseline (obtained by View#getBaseline()
+     * if the {@link FlexContainer#getAlignItems()} value is not {@link AlignItems#BASELINE}
+     * or the flex direction is vertical, this value is not used.
+     * If the alignment direction is from the bottom to top,
+     * (e.g. flexWrap == WRAP_REVERSE and flexDirection == ROW)
+     * store this value from the distance from the bottom of the view minus baseline.
+     * (Calculated as view.getMeasuredHeight() - view.getBaseline - LayoutParams.bottomMargin)
+     */
+    int mMaxBaseline;
+
+    /**
+     * The sum of the cross size used before this flex line.
+     */
+    int mSumCrossSizeBefore;
+
+    /**
+     * Store the indices of the children views whose alignSelf property is stretch.
+     * The stored indices are the absolute indices including all children in the Flexbox,
+     * not the relative indices in this flex line.
+     */
+    List<Integer> mIndicesAlignSelfStretch = new ArrayList<>();
+
+    int mFirstIndex;
+
+    int mLastIndex;
+
+    /**
+     * Set to true if any {@link FlexItem}s in this line have {@link FlexItem#getFlexGrow()}
+     * attributes set (have the value other than {@link FlexItem#FLEX_GROW_DEFAULT})
+     */
+    boolean mAnyItemsHaveFlexGrow;
+
+    /**
+     * Set to true if any {@link FlexItem}s in this line have {@link FlexItem#getFlexShrink()}
+     * attributes set (have the value other than {@link FlexItem#FLEX_SHRINK_NOT_SET})
+     */
+    boolean mAnyItemsHaveFlexShrink;
+
+    /**
+     * @return the size of the flex line in pixels along the main axis of the flex container.
+     */
+    public int getMainSize() {
+        return mMainSize;
+    }
+
+    /**
+     * @return the size of the flex line in pixels along the cross axis of the flex container.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int getCrossSize() {
+        return mCrossSize;
+    }
+
+    /**
+     * @return the count of the views contained in this flex line.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int getItemCount() {
+        return mItemCount;
+    }
+
+    /**
+     * @return the count of the views whose visibilities are not gone in this flex line.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int getItemCountNotGone() {
+        return mItemCount - mGoneItemCount;
+    }
+
+    /**
+     * @return the sum of the flexGrow properties of the children included in this flex line
+     */
+    @SuppressWarnings("WeakerAccess")
+    public float getTotalFlexGrow() {
+        return mTotalFlexGrow;
+    }
+
+    /**
+     * @return the sum of the flexShrink properties of the children included in this flex line
+     */
+    @SuppressWarnings("WeakerAccess")
+    public float getTotalFlexShrink() {
+        return mTotalFlexShrink;
+    }
+
+    /**
+     * @return the first view's index included in this flex line.
+     */
+    public int getFirstIndex() {
+        return mFirstIndex;
+    }
+
+    /**
+     * Updates the position of the flex line from the contained view.
+     *
+     * @param view             the view contained in this flex line
+     * @param leftDecoration   the length of the decoration on the left of the view
+     * @param topDecoration    the length of the decoration on the top of the view
+     * @param rightDecoration  the length of the decoration on the right of the view
+     * @param bottomDecoration the length of the decoration on the bottom of the view
+     */
+    void updatePositionFromView(View view, int leftDecoration, int topDecoration,
+            int rightDecoration, int bottomDecoration) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        mLeft = Math.min(mLeft, view.getLeft() - flexItem.getMarginLeft() - leftDecoration);
+        mTop = Math.min(mTop, view.getTop() - flexItem.getMarginTop() - topDecoration);
+        mRight = Math.max(mRight, view.getRight() + flexItem.getMarginRight() + rightDecoration);
+        mBottom = Math
+                .max(mBottom, view.getBottom() + flexItem.getMarginBottom() + bottomDecoration);
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexWrap.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexWrap.java
new file mode 100755
index 0000000..6604f33
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexWrap.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/**
+ * This attribute controls whether the flex container is single-line or multi-line, and the
+ * direction of the cross axis.
+ */
+@IntDef({FlexWrap.NOWRAP, FlexWrap.WRAP, FlexWrap.WRAP_REVERSE})
+@Retention(RetentionPolicy.SOURCE)
+public @interface FlexWrap {
+
+    /** The flex container is single-line. */
+    int NOWRAP = 0;
+
+    /** The flex container is multi-line. */
+    int WRAP = 1;
+
+    /**
+     * The flex container is multi-line. The direction of the
+     * cross axis is opposed to the direction as the {@link #WRAP}
+     */
+    int WRAP_REVERSE = 2;
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java
new file mode 100755
index 0000000..e271d8f
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java
@@ -0,0 +1,2065 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import static com.google.android.flexbox.FlexContainer.NOT_SET;
+import static com.google.android.flexbox.FlexItem.FLEX_BASIS_PERCENT_DEFAULT;
+import static com.google.android.flexbox.FlexItem.FLEX_GROW_DEFAULT;
+import static com.google.android.flexbox.FlexItem.FLEX_SHRINK_NOT_SET;
+
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
+
+import android.graphics.drawable.Drawable;
+import android.util.SparseIntArray;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.view.MarginLayoutParamsCompat;
+import androidx.core.widget.CompoundButtonCompat;
+
+/**
+ * Offers various calculations for Flexbox to use the common logic between the classes such as
+ * {@link FlexboxLayout} and {@link FlexboxLayoutManager}.
+ */
+class FlexboxHelper {
+
+    private static final int INITIAL_CAPACITY = 10;
+
+    private static final long MEASURE_SPEC_WIDTH_MASK = 0xffffffffL;
+
+    private final FlexContainer mFlexContainer;
+
+    /**
+     * Holds the 'frozen' state of children during measure. If a view is frozen it will no longer
+     * expand or shrink regardless of flex grow/flex shrink attributes.
+     */
+    private boolean[] mChildrenFrozen;
+
+    /**
+     * Map the view index to the flex line which contains the view represented by the index to
+     * look for a flex line from a given view index in a constant time.
+     * Key: index of the view
+     * Value: index of the flex line that contains the given view
+     *
+     * E.g. if we have following flex lines,
+     * <p>
+     * FlexLine(0): itemCount 3
+     * FlexLine(1): itemCount 2
+     * </p>
+     * this instance should have following entries
+     * <p>
+     * [0, 0, 0, 1, 1, ...]
+     * </p>
+     */
+    @Nullable
+    int[] mIndexToFlexLine;
+
+    /**
+     * Cache the measured spec. The first 32 bit represents the height measure spec, the last
+     * 32 bit represents the width measure spec of each flex item.
+     * E.g. an entry is created like {@code (long) heightMeasureSpec << 32 | widthMeasureSpec}
+     *
+     * To retrieve a widthMeasureSpec, call {@link #extractLowerInt(long)} or
+     * {@link #extractHigherInt(long)} for a heightMeasureSpec.
+     */
+    @Nullable
+    long[] mMeasureSpecCache;
+
+    /**
+     * Cache a flex item's measured width and height. The first 32 bit represents the height, the
+     * last 32 bit represents the width of each flex item.
+     * E.g. an entry is created like the following code.
+     * {@code (long) view.getMeasuredHeight() << 32 | view.getMeasuredWidth()}
+     *
+     * To retrieve a width value, call {@link #extractLowerInt(long)} or
+     * {@link #extractHigherInt(long)} for a height value.
+     */
+    @Nullable
+    private long[] mMeasuredSizeCache;
+
+    FlexboxHelper(FlexContainer flexContainer) {
+        mFlexContainer = flexContainer;
+    }
+
+    /**
+     * Create an array, which indicates the reordered indices that
+     * {@link FlexItem#getOrder()} attributes are taken into account.
+     * This method takes a View before that is added as the parent ViewGroup's children.
+     *
+     * @param viewBeforeAdded          the View instance before added to the array of children
+     *                                 Views of the parent ViewGroup
+     * @param indexForViewBeforeAdded  the index for the View before added to the array of the
+     *                                 parent ViewGroup
+     * @param paramsForViewBeforeAdded the layout parameters for the View before added to the array
+     *                                 of the parent ViewGroup
+     * @return an array which have the reordered indices
+     */
+    int[] createReorderedIndices(View viewBeforeAdded, int indexForViewBeforeAdded,
+            ViewGroup.LayoutParams paramsForViewBeforeAdded, SparseIntArray orderCache) {
+        int childCount = mFlexContainer.getFlexItemCount();
+        List<Order> orders = createOrders(childCount);
+        Order orderForViewToBeAdded = new Order();
+        if (viewBeforeAdded != null
+                && paramsForViewBeforeAdded instanceof FlexItem) {
+            orderForViewToBeAdded.order = ((FlexItem)
+                    paramsForViewBeforeAdded).getOrder();
+        } else {
+            orderForViewToBeAdded.order = FlexItem.ORDER_DEFAULT;
+        }
+
+        if (indexForViewBeforeAdded == -1 || indexForViewBeforeAdded == childCount) {
+            orderForViewToBeAdded.index = childCount;
+        } else if (indexForViewBeforeAdded < mFlexContainer.getFlexItemCount()) {
+            orderForViewToBeAdded.index = indexForViewBeforeAdded;
+            for (int i = indexForViewBeforeAdded; i < childCount; i++) {
+                orders.get(i).index++;
+            }
+        } else {
+            // This path is not expected since OutOfBoundException will be thrown in the ViewGroup
+            // But setting the index for fail-safe
+            orderForViewToBeAdded.index = childCount;
+        }
+        orders.add(orderForViewToBeAdded);
+
+        return sortOrdersIntoReorderedIndices(childCount + 1, orders, orderCache);
+    }
+
+    /**
+     * Create an array, which indicates the reordered indices that
+     * {@link FlexItem#getOrder()} attributes are taken into account.
+     *
+     * @return @return an array which have the reordered indices
+     */
+    int[] createReorderedIndices(SparseIntArray orderCache) {
+        int childCount = mFlexContainer.getFlexItemCount();
+        List<Order> orders = createOrders(childCount);
+        return sortOrdersIntoReorderedIndices(childCount, orders, orderCache);
+    }
+
+    @NonNull
+    private List<Order> createOrders(int childCount) {
+        List<Order> orders = new ArrayList<>(childCount);
+        for (int i = 0; i < childCount; i++) {
+            View child = mFlexContainer.getFlexItemAt(i);
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+            Order order = new Order();
+            order.order = flexItem.getOrder();
+            order.index = i;
+            orders.add(order);
+        }
+        return orders;
+    }
+
+    /**
+     * Returns if any of the children's {@link FlexItem#getOrder()} attributes are
+     * changed from the last measurement.
+     *
+     * @return {@code true} if changed from the last measurement, {@code false} otherwise.
+     */
+    boolean isOrderChangedFromLastMeasurement(SparseIntArray orderCache) {
+        int childCount = mFlexContainer.getFlexItemCount();
+        if (orderCache.size() != childCount) {
+            return true;
+        }
+        for (int i = 0; i < childCount; i++) {
+            View view = mFlexContainer.getFlexItemAt(i);
+            if (view == null) {
+                continue;
+            }
+            FlexItem flexItem = (FlexItem) view.getLayoutParams();
+            if (flexItem.getOrder() != orderCache.get(i)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private int[] sortOrdersIntoReorderedIndices(int childCount, List<Order> orders,
+            SparseIntArray orderCache) {
+        Collections.sort(orders);
+        orderCache.clear();
+        int[] reorderedIndices = new int[childCount];
+        int i = 0;
+        for (Order order : orders) {
+            reorderedIndices[i] = order.index;
+            orderCache.append(order.index, order.order);
+            i++;
+        }
+        return reorderedIndices;
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method should calculate all the flex lines from the existing flex items.
+     *
+     * @see #calculateFlexLines(FlexLinesResult, int, int, int, int, int, List)
+     */
+    void calculateHorizontalFlexLines(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec) {
+        calculateFlexLines(result, widthMeasureSpec, heightMeasureSpec, Integer.MAX_VALUE,
+                0, NO_POSITION, null);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * Stop calculating it if the calculated amount along the cross size reaches the argument
+     * as the needsCalcAmount.
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param fromIndex         the index of the child from which the calculation starts
+     * @param existingLines     If not null, calculated flex lines will be added to this instance
+     */
+    void calculateHorizontalFlexLines(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int fromIndex,
+            @Nullable List<FlexLine> existingLines) {
+        calculateFlexLines(result, widthMeasureSpec, heightMeasureSpec, needsCalcAmount,
+                fromIndex, NO_POSITION, existingLines);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method calculates the amount of pixels as the {@code needsCalcAmount} in addition to
+     * the
+     * flex lines which includes the view who has the index as the {@code toIndex} argument.
+     * (First calculate to the toIndex, then calculate the amount of pixels as needsCalcAmount)
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param toIndex           the index of the child to which the calculation ends (until the
+     *                          flex line which include the which who has that index). If this
+     *                          and needsCalcAmount are both set, first flex lines are calculated
+     *                          to the index, calculate the amount of pixels as the needsCalcAmount
+     *                          argument in addition to that
+     */
+    void calculateHorizontalFlexLinesToIndex(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int toIndex, List<FlexLine> existingLines) {
+        calculateFlexLines(result, widthMeasureSpec, heightMeasureSpec, needsCalcAmount,
+                0, toIndex, existingLines);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method should calculate all the flex lines from the existing flex items.
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @see #calculateFlexLines(FlexLinesResult, int, int, int, int, int, List)
+     */
+    void calculateVerticalFlexLines(FlexLinesResult result, int widthMeasureSpec, int heightMeasureSpec) {
+        calculateFlexLines(result, heightMeasureSpec, widthMeasureSpec, Integer.MAX_VALUE,
+                0, NO_POSITION, null);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * Stop calculating it if the calculated amount along the cross size reaches the argument
+     * as the needsCalcAmount.
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param fromIndex         the index of the child from which the calculation starts
+     * @param existingLines     If not null, calculated flex lines will be added to this instance
+     */
+    void calculateVerticalFlexLines(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int fromIndex,
+            @Nullable List<FlexLine> existingLines) {
+        calculateFlexLines(result, heightMeasureSpec, widthMeasureSpec, needsCalcAmount,
+                fromIndex, NO_POSITION, existingLines);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method calculates the amount of pixels as the {@code needsCalcAmount} in addition to
+     * the
+     * flex lines which includes the view who has the index as the {@code toIndex} argument.
+     * (First calculate to the toIndex, then calculate the amount of pixels as needsCalcAmount)
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param toIndex           the index of the child to which the calculation ends (until the
+     *                          flex line which include the which who has that index). If this
+     *                          and needsCalcAmount are both set, first flex lines are calculated
+     *                          to the index, calculate the amount of pixels as the needsCalcAmount
+     *                          argument in addition to that
+     */
+    void calculateVerticalFlexLinesToIndex(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int toIndex, List<FlexLine> existingLines) {
+        calculateFlexLines(result, heightMeasureSpec, widthMeasureSpec, needsCalcAmount,
+                0, toIndex, existingLines);
+    }
+
+
+    /**
+     * Calculates how many flex lines are needed in the flex container layout by measuring each
+     * child.
+     * Expanding or shrinking the flex items depending on the flex grow and flex shrink
+     * attributes are done in a later procedure, so the views' measured width and measured
+     * height may be changed in a later process.
+     *
+     * @param result           an instance of {@link FlexLinesResult} that is going to contain a
+     *                         list of flex lines and the child state used by
+     *                         {@link View#setMeasuredDimension(int, int)}.
+     * @param mainMeasureSpec  the main axis measure spec imposed by the flex container,
+     *                         width for horizontal direction, height otherwise
+     * @param crossMeasureSpec the cross axis measure spec imposed by the flex container,
+     *                         height for horizontal direction, width otherwise
+     * @param needsCalcAmount  the amount of pixels where flex line calculation should be stopped
+     *                         this is needed to avoid the expensive calculation if the
+     *                         calculation is needed only the small part of the entire flex
+     *                         container. (E.g. If the flex container is the
+     *                         {@link FlexboxLayoutManager}, the calculation only needs the
+     *                         visible area, imposing the entire calculation may cause bad
+     *                         performance
+     * @param fromIndex        the index of the child from which the calculation starts
+     * @param toIndex          the index of the child to which the calculation ends (until the
+     *                         flex line which include the which who has that index). If this
+     *                         and needsCalcAmount are both set, first flex lines are calculated
+     *                         to the index, calculate the amount of pixels as the needsCalcAmount
+     *                         argument in addition to that
+     * @param existingLines    If not null, calculated flex lines will be added to this instance
+     */
+    void calculateFlexLines(FlexLinesResult result, int mainMeasureSpec,
+            int crossMeasureSpec, int needsCalcAmount, int fromIndex, int toIndex,
+            @Nullable List<FlexLine> existingLines) {
+
+        boolean isMainHorizontal = mFlexContainer.isMainAxisDirectionHorizontal();
+
+        int mainMode = View.MeasureSpec.getMode(mainMeasureSpec);
+        int mainSize = View.MeasureSpec.getSize(mainMeasureSpec);
+
+        int childState = 0;
+
+        List<FlexLine> flexLines;
+        if (existingLines == null) {
+            flexLines = new ArrayList<>();
+        } else {
+            flexLines = existingLines;
+        }
+
+        result.mFlexLines = flexLines;
+
+        boolean reachedToIndex = toIndex == NO_POSITION;
+
+        int mainPaddingStart = getPaddingStartMain(isMainHorizontal);
+        int mainPaddingEnd = getPaddingEndMain(isMainHorizontal);
+        int crossPaddingStart = getPaddingStartCross(isMainHorizontal);
+        int crossPaddingEnd = getPaddingEndCross(isMainHorizontal);
+
+        int largestSizeInCross = Integer.MIN_VALUE;
+
+        // The amount of cross size calculated in this method call.
+        int sumCrossSize = 0;
+
+        // The index of the view in the flex line.
+        int indexInFlexLine = 0;
+
+        FlexLine flexLine = new FlexLine();
+        flexLine.mFirstIndex = fromIndex;
+        flexLine.mMainSize = mainPaddingStart + mainPaddingEnd;
+
+        int childCount = mFlexContainer.getFlexItemCount();
+        for (int i = fromIndex; i < childCount; i++) {
+            View child = mFlexContainer.getReorderedFlexItemAt(i);
+
+            if (child == null) {
+                if (isLastFlexItem(i, childCount, flexLine)) {
+                    addFlexLine(flexLines, flexLine, i, sumCrossSize);
+                }
+                continue;
+            } else if (child.getVisibility() == View.GONE) {
+                flexLine.mGoneItemCount++;
+                flexLine.mItemCount++;
+                if (isLastFlexItem(i, childCount, flexLine)) {
+                    addFlexLine(flexLines, flexLine, i, sumCrossSize);
+                }
+                continue;
+            } else if (child instanceof CompoundButton) {
+                evaluateMinimumSizeForCompoundButton((CompoundButton) child);
+            }
+
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+
+            if (flexItem.getAlignSelf() == AlignItems.STRETCH) {
+                flexLine.mIndicesAlignSelfStretch.add(i);
+            }
+
+            int childMainSize = getFlexItemSizeMain(flexItem, isMainHorizontal);
+
+            if (flexItem.getFlexBasisPercent() != FLEX_BASIS_PERCENT_DEFAULT
+                    && mainMode == View.MeasureSpec.EXACTLY) {
+                childMainSize = Math.round(mainSize * flexItem.getFlexBasisPercent());
+                // Use the dimension from the layout if the mainMode is not
+                // MeasureSpec.EXACTLY even if any fraction value is set to
+                // layout_flexBasisPercent.
+            }
+
+            int childMainMeasureSpec;
+            int childCrossMeasureSpec;
+            if (isMainHorizontal) {
+                childMainMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(mainMeasureSpec,
+                        mainPaddingStart + mainPaddingEnd +
+                                getFlexItemMarginStartMain(flexItem, true) +
+                                getFlexItemMarginEndMain(flexItem, true),
+                        childMainSize);
+                childCrossMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(crossMeasureSpec,
+                        crossPaddingStart + crossPaddingEnd +
+                                getFlexItemMarginStartCross(flexItem, true) +
+                                getFlexItemMarginEndCross(flexItem, true)
+                                + sumCrossSize,
+                        getFlexItemSizeCross(flexItem, true));
+                child.measure(childMainMeasureSpec, childCrossMeasureSpec);
+                updateMeasureCache(i, childMainMeasureSpec, childCrossMeasureSpec, child);
+            } else {
+                childCrossMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(crossMeasureSpec,
+                        crossPaddingStart + crossPaddingEnd +
+                                getFlexItemMarginStartCross(flexItem, false) +
+                                getFlexItemMarginEndCross(flexItem, false) + sumCrossSize,
+                        getFlexItemSizeCross(flexItem, false));
+                childMainMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(mainMeasureSpec,
+                        mainPaddingStart + mainPaddingEnd +
+                                getFlexItemMarginStartMain(flexItem, false) +
+                                getFlexItemMarginEndMain(flexItem, false),
+                        childMainSize);
+                child.measure(childCrossMeasureSpec, childMainMeasureSpec);
+                updateMeasureCache(i, childCrossMeasureSpec, childMainMeasureSpec, child);
+            }
+            mFlexContainer.updateViewCache(i, child);
+
+            // Check the size constraint after the first measurement for the child
+            // To prevent the child's width/height violate the size constraints imposed by the
+            // {@link FlexItem#getMinWidth()}, {@link FlexItem#getMinHeight()},
+            // {@link FlexItem#getMaxWidth()} and {@link FlexItem#getMaxHeight()} attributes.
+            // E.g. When the child's layout_width is wrap_content the measured width may be
+            // less than the min width after the first measurement.
+            checkSizeConstraints(child, i);
+
+            childState = View.combineMeasuredStates(
+                    childState, child.getMeasuredState());
+
+            if (isWrapRequired(child, mainMode, mainSize, flexLine.mMainSize,
+                    getViewMeasuredSizeMain(child, isMainHorizontal)
+                            + getFlexItemMarginStartMain(flexItem, isMainHorizontal) +
+                            getFlexItemMarginEndMain(flexItem, isMainHorizontal),
+                    flexItem, i, indexInFlexLine, flexLines.size())) {
+                if (flexLine.getItemCountNotGone() > 0) {
+                    addFlexLine(flexLines, flexLine, i > 0 ? i - 1 : 0, sumCrossSize);
+                    sumCrossSize += flexLine.mCrossSize;
+                }
+
+                if (isMainHorizontal) {
+                    if (flexItem.getHeight() == ViewGroup.LayoutParams.MATCH_PARENT) {
+                        // This case takes care of the corner case where the cross size of the
+                        // child is affected by the just added flex line.
+                        // E.g. when the child's layout_height is set to match_parent, the height
+                        // of that child needs to be determined taking the total cross size used
+                        // so far into account. In that case, the height of the child needs to be
+                        // measured again note that we don't need to judge if the wrapping occurs
+                        // because it doesn't change the size along the main axis.
+                        childCrossMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(
+                                crossMeasureSpec,
+                                mFlexContainer.getPaddingTop() + mFlexContainer.getPaddingBottom()
+                                        + flexItem.getMarginTop()
+                                        + flexItem.getMarginBottom() + sumCrossSize,
+                                flexItem.getHeight());
+                        child.measure(childMainMeasureSpec, childCrossMeasureSpec);
+                        checkSizeConstraints(child, i);
+                    }
+                } else {
+                    if (flexItem.getWidth() == ViewGroup.LayoutParams.MATCH_PARENT) {
+                        // This case takes care of the corner case where the cross size of the
+                        // child is affected by the just added flex line.
+                        // E.g. when the child's layout_width is set to match_parent, the width
+                        // of that child needs to be determined taking the total cross size used
+                        // so far into account. In that case, the width of the child needs to be
+                        // measured again note that we don't need to judge if the wrapping occurs
+                        // because it doesn't change the size along the main axis.
+                        childCrossMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(
+                                crossMeasureSpec,
+                                mFlexContainer.getPaddingLeft() + mFlexContainer.getPaddingRight()
+                                        + flexItem.getMarginLeft()
+                                        + flexItem.getMarginRight() + sumCrossSize,
+                                flexItem.getWidth());
+                        child.measure(childCrossMeasureSpec, childMainMeasureSpec);
+                        checkSizeConstraints(child, i);
+                    }
+                }
+
+                flexLine = new FlexLine();
+                flexLine.mItemCount = 1;
+                flexLine.mMainSize = mainPaddingStart + mainPaddingEnd;
+                flexLine.mFirstIndex = i;
+                indexInFlexLine = 0;
+                largestSizeInCross = Integer.MIN_VALUE;
+            } else {
+                flexLine.mItemCount++;
+                indexInFlexLine++;
+            }
+            flexLine.mAnyItemsHaveFlexGrow |= flexItem.getFlexGrow() != FLEX_GROW_DEFAULT;
+            flexLine.mAnyItemsHaveFlexShrink |= flexItem.getFlexShrink() != FLEX_SHRINK_NOT_SET;
+
+            if (mIndexToFlexLine != null) {
+                mIndexToFlexLine[i] = flexLines.size();
+            }
+            flexLine.mMainSize += getViewMeasuredSizeMain(child, isMainHorizontal)
+                    + getFlexItemMarginStartMain(flexItem, isMainHorizontal) +
+                    getFlexItemMarginEndMain(flexItem, isMainHorizontal);
+            flexLine.mTotalFlexGrow += flexItem.getFlexGrow();
+            flexLine.mTotalFlexShrink += flexItem.getFlexShrink();
+
+            mFlexContainer.onNewFlexItemAdded(child, i, indexInFlexLine, flexLine);
+
+            largestSizeInCross = Math.max(largestSizeInCross,
+                    getViewMeasuredSizeCross(child, isMainHorizontal) +
+                            getFlexItemMarginStartCross(flexItem, isMainHorizontal) +
+                            getFlexItemMarginEndCross(flexItem, isMainHorizontal) +
+                            mFlexContainer.getDecorationLengthCrossAxis(child));
+            // Temporarily set the cross axis length as the largest child in the flexLine
+            // Expand along the cross axis depending on the mAlignContent property if needed
+            // later
+            flexLine.mCrossSize = Math.max(flexLine.mCrossSize, largestSizeInCross);
+
+            if (isMainHorizontal) {
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    flexLine.mMaxBaseline = Math.max(flexLine.mMaxBaseline,
+                            child.getBaseline() + flexItem.getMarginTop());
+                } else {
+                    // if the flex wrap property is WRAP_REVERSE, calculate the
+                    // baseline as the distance from the cross end and the baseline
+                    // since the cross size calculation is based on the distance from the cross end
+                    flexLine.mMaxBaseline = Math.max(flexLine.mMaxBaseline,
+                            child.getMeasuredHeight() - child.getBaseline()
+                                    + flexItem.getMarginBottom());
+                }
+            }
+
+            if (isLastFlexItem(i, childCount, flexLine)) {
+                addFlexLine(flexLines, flexLine, i, sumCrossSize);
+                sumCrossSize += flexLine.mCrossSize;
+            }
+
+            if (toIndex != NO_POSITION
+                    && flexLines.size() > 0
+                    && flexLines.get(flexLines.size() - 1).mLastIndex >= toIndex
+                    && i >= toIndex
+                    && !reachedToIndex) {
+                // Calculated to include a flex line which includes the flex item having the
+                // toIndex.
+                // Let the sumCrossSize start from the negative value of the last flex line's
+                // cross size because otherwise flex lines aren't calculated enough to fill the
+                // visible area.
+                sumCrossSize = -flexLine.getCrossSize();
+                reachedToIndex = true;
+            }
+            if (sumCrossSize > needsCalcAmount && reachedToIndex) {
+                // Stop the calculation if the sum of cross size calculated reached to the point
+                // beyond the needsCalcAmount value to avoid unneeded calculation in a
+                // RecyclerView.
+                // To be precise, the decoration length may be added to the sumCrossSize,
+                // but we omit adding the decoration length because even without the decorator
+                // length, it's guaranteed that calculation is done at least beyond the
+                // needsCalcAmount
+                break;
+            }
+        }
+
+        result.mChildState = childState;
+    }
+
+    /**
+     * Compound buttons (ex. {{@link android.widget.CheckBox}}, {@link android.widget.ToggleButton})
+     * have a button drawable with minimum height and width specified for them.
+     * To align the behavior with CSS Flexbox we want to respect these minimum measurement to avoid
+     * these drawables from being cut off during calculation. When the compound button has a minimum
+     * width or height already specified we will not make any change since we assume those were
+     * voluntarily set by the user.
+     *
+     * @param compoundButton the compound button that need to be evaluated
+     */
+    private void evaluateMinimumSizeForCompoundButton(CompoundButton compoundButton) {
+        FlexItem flexItem = (FlexItem) compoundButton.getLayoutParams();
+        int minWidth = flexItem.getMinWidth();
+        int minHeight = flexItem.getMinHeight();
+
+        Drawable drawable = CompoundButtonCompat.getButtonDrawable(compoundButton);
+        int drawableMinWidth = drawable == null ? 0 : drawable.getMinimumWidth();
+        int drawableMinHeight = drawable == null ? 0 : drawable.getMinimumHeight();
+        flexItem.setMinWidth(minWidth == NOT_SET ? drawableMinWidth : minWidth);
+        flexItem.setMinHeight(minHeight == NOT_SET ? drawableMinHeight : minHeight);
+    }
+
+    /**
+     * Returns the container's start padding in the main axis. Either start or top.
+     *
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the start padding in the main axis
+     */
+    private int getPaddingStartMain(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingStart();
+        }
+
+        return mFlexContainer.getPaddingTop();
+    }
+
+    /**
+     * Returns the container's end padding in the main axis. Either end or bottom.
+     *
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the end padding in the main axis
+     */
+    private int getPaddingEndMain(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingEnd();
+        }
+
+        return mFlexContainer.getPaddingBottom();
+    }
+
+    /**
+     * Returns the container's start padding in the cross axis. Either start or top.
+     *
+     * @param isMainHorizontal is the main axis horizontal.
+     * @return the start padding in the cross axis
+     */
+    private int getPaddingStartCross(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingTop();
+        }
+
+        return mFlexContainer.getPaddingStart();
+    }
+
+    /**
+     * Returns the container's end padding in the cross axis. Either end or bottom.
+     *
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the end padding in the cross axis
+     */
+    private int getPaddingEndCross(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingBottom();
+        }
+
+        return mFlexContainer.getPaddingEnd();
+    }
+
+    /**
+     * Returns the view's measured size in the main axis. Either width or height.
+     *
+     * @param view             the view
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the view's measured size in the main axis
+     */
+    private int getViewMeasuredSizeMain(View view, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return view.getMeasuredWidth();
+        }
+
+        return view.getMeasuredHeight();
+    }
+
+    /**
+     * Returns the view's measured size in the cross axis. Either width or height.
+     *
+     * @param view             the view
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the view's measured size in the cross axis
+     */
+    private int getViewMeasuredSizeCross(View view, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return view.getMeasuredHeight();
+        }
+
+        return view.getMeasuredWidth();
+    }
+
+    /**
+     * Returns the flexItem's size in the main axis. Either width or height.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's size in the main axis
+     */
+    private int getFlexItemSizeMain(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getWidth();
+        }
+
+        return flexItem.getHeight();
+    }
+
+    /**
+     * Returns the flexItem's size in the cross axis. Either width or height.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's size in the cross axis
+     */
+    private int getFlexItemSizeCross(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getHeight();
+        }
+
+        return flexItem.getWidth();
+    }
+
+    /**
+     * Returns the flexItem's start margin in the main axis. Either start or top.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginLeft} (ViewGroup.MarginLayoutParams#getMarginStart isn't available
+     * in API level < 17). Thus this method needs to be used with {@link #getFlexItemMarginEndMain}
+     * not to misuse the margin in RTL.
+     *
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's start margin in the main axis
+     */
+    private int getFlexItemMarginStartMain(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginLeft();
+        }
+
+        return flexItem.getMarginTop();
+    }
+
+    /**
+     * Returns the flexItem's end margin in the main axis. Either end or bottom.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginRight} (ViewGroup.MarginLayoutParams#getMarginEnd isn't available
+     * in API level < 17). Thus this method needs to be used with
+     * {@link #getFlexItemMarginStartMain} not to misuse the margin in RTL.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's end margin in the main axis
+     */
+    private int getFlexItemMarginEndMain(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginRight();
+        }
+
+        return flexItem.getMarginBottom();
+    }
+
+    /**
+     * Returns the flexItem's start margin in the cross axis. Either start or top.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginLeft} (ViewGroup.MarginLayoutParams#getMarginStart isn't available
+     * in API level < 17). Thus this method needs to be used with
+     * {@link #getFlexItemMarginEndCross} to not to misuse the margin in RTL.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's start margin in the cross axis
+     */
+    private int getFlexItemMarginStartCross(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginTop();
+        }
+
+        return flexItem.getMarginLeft();
+    }
+
+    /**
+     * Returns the flexItem's end margin in the cross axis. Either end or bottom.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginRight} (ViewGroup.MarginLayoutParams#getMarginEnd isn't available
+     * in API level < 17). Thus this method needs to be used with
+     * {@link #getFlexItemMarginStartCross} to not to misuse the margin in RTL.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's end margin in the cross axis
+     */
+    private int getFlexItemMarginEndCross(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginBottom();
+        }
+
+        return flexItem.getMarginRight();
+    }
+
+    /**
+     * Determine if a wrap is required (add a new flex line).
+     *
+     * @param view          the view being judged if the wrap required
+     * @param mode          the width or height mode along the main axis direction
+     * @param maxSize       the max size along the main axis direction
+     * @param currentLength the accumulated current length
+     * @param childLength   the length of a child view which is to be collected to the flex line
+     * @param flexItem      the LayoutParams for the view being determined whether a new flex line
+     *                      is needed
+     * @param index         the index of the view being added within the entire flex container
+     * @param indexInFlexLine the index of the view being added within the current flex line
+     * @param flexLinesSize the number of the existing flexlines size
+     * @return {@code true} if a wrap is required, {@code false} otherwise
+     * @see FlexContainer#getFlexWrap()
+     * @see FlexContainer#setFlexWrap(int)
+     */
+    private boolean isWrapRequired(View view, int mode, int maxSize, int currentLength,
+            int childLength, FlexItem flexItem, int index, int indexInFlexLine, int flexLinesSize) {
+        if (mFlexContainer.getFlexWrap() == FlexWrap.NOWRAP) {
+            return false;
+        }
+        if (flexItem.isWrapBefore()) {
+            return true;
+        }
+        if (mode == View.MeasureSpec.UNSPECIFIED) {
+            return false;
+        }
+        int maxLine = mFlexContainer.getMaxLine();
+        // Judge the condition by adding 1 to the current flexLinesSize because the flex line
+        // being computed isn't added to the flexLinesSize.
+        if (maxLine != NOT_SET && maxLine <= flexLinesSize + 1) {
+            return false;
+        }
+        int decorationLength =
+                mFlexContainer.getDecorationLengthMainAxis(view, index, indexInFlexLine);
+        if (decorationLength > 0) {
+            childLength += decorationLength;
+        }
+        return maxSize < currentLength + childLength;
+    }
+
+    private boolean isLastFlexItem(int childIndex, int childCount,
+            FlexLine flexLine) {
+        return childIndex == childCount - 1 && flexLine.getItemCountNotGone() != 0;
+    }
+
+    private void addFlexLine(List<FlexLine> flexLines, FlexLine flexLine, int viewIndex,
+            int usedCrossSizeSoFar) {
+        flexLine.mSumCrossSizeBefore = usedCrossSizeSoFar;
+        mFlexContainer.onNewFlexLineAdded(flexLine);
+        flexLine.mLastIndex = viewIndex;
+        flexLines.add(flexLine);
+    }
+
+    /**
+     * Checks if the view's width/height don't violate the minimum/maximum size constraints imposed
+     * by the {@link FlexItem#getMinWidth()}, {@link FlexItem#getMinHeight()},
+     * {@link FlexItem#getMaxWidth()} and {@link FlexItem#getMaxHeight()} attributes.
+     *
+     * @param view  the view to be checked
+     * @param index index of the view
+     */
+    private void checkSizeConstraints(View view, int index) {
+        boolean needsMeasure = false;
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int childWidth = view.getMeasuredWidth();
+        int childHeight = view.getMeasuredHeight();
+
+        if (childWidth < flexItem.getMinWidth()) {
+            needsMeasure = true;
+            childWidth = flexItem.getMinWidth();
+        } else if (childWidth > flexItem.getMaxWidth()) {
+            needsMeasure = true;
+            childWidth = flexItem.getMaxWidth();
+        }
+
+        if (childHeight < flexItem.getMinHeight()) {
+            needsMeasure = true;
+            childHeight = flexItem.getMinHeight();
+        } else if (childHeight > flexItem.getMaxHeight()) {
+            needsMeasure = true;
+            childHeight = flexItem.getMaxHeight();
+        }
+        if (needsMeasure) {
+            int widthSpec = View.MeasureSpec.makeMeasureSpec(childWidth, View.MeasureSpec.EXACTLY);
+            int heightSpec = View.MeasureSpec
+                    .makeMeasureSpec(childHeight, View.MeasureSpec.EXACTLY);
+            view.measure(widthSpec, heightSpec);
+            updateMeasureCache(index, widthSpec, heightSpec, view);
+            mFlexContainer.updateViewCache(index, view);
+        }
+    }
+
+    /**
+     * @see #determineMainSize(int, int, int)
+     */
+    void determineMainSize(int widthMeasureSpec, int heightMeasureSpec) {
+        determineMainSize(widthMeasureSpec, heightMeasureSpec, 0);
+    }
+
+    /**
+     * Determine the main size by expanding (shrinking if negative remaining free space is given)
+     * an individual child in each flex line if any children's mFlexGrow (or mFlexShrink if
+     * remaining
+     * space is negative) properties are set to non-zero.
+     *
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexContainer#getFlexDirection()
+     */
+    void determineMainSize(int widthMeasureSpec, int heightMeasureSpec, int fromIndex) {
+        ensureChildrenFrozen(mFlexContainer.getFlexItemCount());
+        if (fromIndex >= mFlexContainer.getFlexItemCount()) {
+            return;
+        }
+        int mainSize;
+        int paddingAlongMainAxis;
+        int flexDirection = mFlexContainer.getFlexDirection();
+        switch (mFlexContainer.getFlexDirection()) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                int widthMode = View.MeasureSpec.getMode(widthMeasureSpec);
+                int widthSize = View.MeasureSpec.getSize(widthMeasureSpec);
+                int largestMainSize = mFlexContainer.getLargestMainSize();
+                if (widthMode == View.MeasureSpec.EXACTLY) {
+                    mainSize = widthSize;
+                } else {
+                    mainSize = Math.min(largestMainSize, widthSize);
+                }
+                paddingAlongMainAxis = mFlexContainer.getPaddingLeft()
+                        + mFlexContainer.getPaddingRight();
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                int heightMode = View.MeasureSpec.getMode(heightMeasureSpec);
+                int heightSize = View.MeasureSpec.getSize(heightMeasureSpec);
+                if (heightMode == View.MeasureSpec.EXACTLY) {
+                    mainSize = heightSize;
+                } else {
+                    mainSize = mFlexContainer.getLargestMainSize();
+                }
+                paddingAlongMainAxis = mFlexContainer.getPaddingTop()
+                        + mFlexContainer.getPaddingBottom();
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid flex direction: " + flexDirection);
+        }
+
+        int flexLineIndex = 0;
+        if (mIndexToFlexLine != null) {
+            flexLineIndex = mIndexToFlexLine[fromIndex];
+        }
+        List<FlexLine> flexLines = mFlexContainer.getFlexLinesInternal();
+        for (int i = flexLineIndex, size = flexLines.size(); i < size; i++) {
+            FlexLine flexLine = flexLines.get(i);
+            if (flexLine.mMainSize < mainSize && flexLine.mAnyItemsHaveFlexGrow) {
+                expandFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine,
+                        mainSize, paddingAlongMainAxis, false);
+            } else if (flexLine.mMainSize > mainSize && flexLine.mAnyItemsHaveFlexShrink) {
+                shrinkFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine,
+                        mainSize, paddingAlongMainAxis, false);
+            }
+        }
+    }
+
+    private void ensureChildrenFrozen(int size) {
+        if (mChildrenFrozen == null) {
+            mChildrenFrozen = new boolean[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mChildrenFrozen.length < size) {
+            int newCapacity = mChildrenFrozen.length * 2;
+            mChildrenFrozen = new boolean[Math.max(newCapacity, size)];
+        } else {
+            Arrays.fill(mChildrenFrozen, false);
+        }
+    }
+
+    /**
+     * Expand the flex items along the main axis based on the individual mFlexGrow attribute.
+     *
+     * @param widthMeasureSpec     the horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec    the vertical space requirements as imposed by the parent
+     * @param flexLine             the flex line to which flex items belong
+     * @param maxMainSize          the maximum main size. Expanded main size will be this size
+     * @param paddingAlongMainAxis the padding value along the main axis
+     * @param calledRecursively    true if this method is called recursively, false otherwise
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexItem#getFlexGrow()
+     */
+    private void expandFlexItems(int widthMeasureSpec, int heightMeasureSpec, FlexLine flexLine,
+            int maxMainSize, int paddingAlongMainAxis, boolean calledRecursively) {
+        if (flexLine.mTotalFlexGrow <= 0 || maxMainSize < flexLine.mMainSize) {
+            return;
+        }
+        int sizeBeforeExpand = flexLine.mMainSize;
+        boolean needsReexpand = false;
+        float unitSpace = (maxMainSize - flexLine.mMainSize) / flexLine.mTotalFlexGrow;
+        flexLine.mMainSize = paddingAlongMainAxis + flexLine.mDividerLengthInMainSize;
+
+        // Setting the cross size of the flex line as the temporal value since the cross size of
+        // each flex item may be changed from the initial calculation
+        // (in the measureHorizontal/measureVertical method) even this method is part of the main
+        // size determination.
+        // E.g. If a TextView's layout_width is set to 0dp, layout_height is set to wrap_content,
+        // and layout_flexGrow is set to 1, the TextView is trying to expand to the vertical
+        // direction to enclose its content (in the measureHorizontal method), but
+        // the width will be expanded in this method. In that case, the height needs to be measured
+        // again with the expanded width.
+        int largestCrossSize = 0;
+        if (!calledRecursively) {
+            flexLine.mCrossSize = Integer.MIN_VALUE;
+        }
+        float accumulatedRoundError = 0;
+        for (int i = 0; i < flexLine.mItemCount; i++) {
+            int index = flexLine.mFirstIndex + i;
+            View child = mFlexContainer.getReorderedFlexItemAt(index);
+            if (child == null || child.getVisibility() == View.GONE) {
+                continue;
+            }
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+            int flexDirection = mFlexContainer.getFlexDirection();
+            if (flexDirection == FlexDirection.ROW || flexDirection == FlexDirection.ROW_REVERSE) {
+                // The direction of the main axis is horizontal
+
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured width from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredWidth returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, the case happens
+                    // frequently
+                    childMeasuredWidth = extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured height from the cache
+                    childMeasuredHeight = extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexGrow() > 0f) {
+                    float rawCalculatedWidth = childMeasuredWidth
+                            + unitSpace * flexItem.getFlexGrow();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedWidth += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newWidth = Math.round(rawCalculatedWidth);
+                    if (newWidth > flexItem.getMaxWidth()) {
+                        // This means the child can't expand beyond the value of the mMaxWidth
+                        // attribute.
+                        // To adjust the flex line length to the size of maxMainSize, remaining
+                        // positive free space needs to be re-distributed to other flex items
+                        // (children views). In that case, invoke this method again with the same
+                        // fromIndex.
+                        needsReexpand = true;
+                        newWidth = flexItem.getMaxWidth();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexGrow -= flexItem.getFlexGrow();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedWidth - newWidth);
+                        if (accumulatedRoundError > 1.0) {
+                            newWidth += 1;
+                            accumulatedRoundError -= 1.0;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newWidth -= 1;
+                            accumulatedRoundError += 1.0;
+                        }
+                    }
+                    int childHeightMeasureSpec = getChildHeightMeasureSpecInternal(
+                            heightMeasureSpec, flexItem, flexLine.mSumCrossSizeBefore);
+                    int childWidthMeasureSpec = View.MeasureSpec.makeMeasureSpec(newWidth,
+                            View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredHeight
+                        + flexItem.getMarginTop() + flexItem.getMarginBottom()
+                        + mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredWidth + flexItem.getMarginLeft()
+                        + flexItem.getMarginRight();
+            } else {
+                // The direction of the main axis is vertical
+
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured height from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredHeight returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, that case happens
+                    // frequently
+                    childMeasuredHeight =
+                            extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured width from the cache
+                    childMeasuredWidth =
+                            extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexGrow() > 0f) {
+                    float rawCalculatedHeight = childMeasuredHeight
+                            + unitSpace * flexItem.getFlexGrow();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedHeight += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newHeight = Math.round(rawCalculatedHeight);
+                    if (newHeight > flexItem.getMaxHeight()) {
+                        // This means the child can't expand beyond the value of the mMaxHeight
+                        // attribute.
+                        // To adjust the flex line length to the size of maxMainSize, remaining
+                        // positive free space needs to be re-distributed to other flex items
+                        // (children views). In that case, invoke this method again with the same
+                        // fromIndex.
+                        needsReexpand = true;
+                        newHeight = flexItem.getMaxHeight();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexGrow -= flexItem.getFlexGrow();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedHeight - newHeight);
+                        if (accumulatedRoundError > 1.0) {
+                            newHeight += 1;
+                            accumulatedRoundError -= 1.0;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newHeight -= 1;
+                            accumulatedRoundError += 1.0;
+                        }
+                    }
+                    int childWidthMeasureSpec = getChildWidthMeasureSpecInternal(widthMeasureSpec,
+                            flexItem, flexLine.mSumCrossSizeBefore);
+                    int childHeightMeasureSpec = View.MeasureSpec.makeMeasureSpec(newHeight,
+                            View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredWidth
+                        + flexItem.getMarginLeft() + flexItem.getMarginRight()
+                        + mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredHeight + flexItem.getMarginTop()
+                        + flexItem.getMarginBottom();
+            }
+            flexLine.mCrossSize = Math.max(flexLine.mCrossSize, largestCrossSize);
+        }
+
+        if (needsReexpand && sizeBeforeExpand != flexLine.mMainSize) {
+            // Re-invoke the method with the same flex line to distribute the positive free space
+            // that wasn't fully distributed (because of maximum length constraint)
+            expandFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine, maxMainSize,
+                    paddingAlongMainAxis, true);
+        }
+    }
+
+    /**
+     * Shrink the flex items along the main axis based on the individual mFlexShrink attribute.
+     *
+     * @param widthMeasureSpec     the horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec    the vertical space requirements as imposed by the parent
+     * @param flexLine             the flex line to which flex items belong
+     * @param maxMainSize          the maximum main size. Shrank main size will be this size
+     * @param paddingAlongMainAxis the padding value along the main axis
+     * @param calledRecursively    true if this method is called recursively, false otherwise
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexItem#getFlexShrink()
+     */
+    private void shrinkFlexItems(int widthMeasureSpec, int heightMeasureSpec, FlexLine flexLine,
+            int maxMainSize, int paddingAlongMainAxis, boolean calledRecursively) {
+        int sizeBeforeShrink = flexLine.mMainSize;
+        if (flexLine.mTotalFlexShrink <= 0 || maxMainSize > flexLine.mMainSize) {
+            return;
+        }
+        boolean needsReshrink = false;
+        float unitShrink = (flexLine.mMainSize - maxMainSize) / flexLine.mTotalFlexShrink;
+        float accumulatedRoundError = 0;
+        flexLine.mMainSize = paddingAlongMainAxis + flexLine.mDividerLengthInMainSize;
+
+        // Setting the cross size of the flex line as the temporal value since the cross size of
+        // each flex item may be changed from the initial calculation
+        // (in the measureHorizontal/measureVertical method) even this method is part of the main
+        // size determination.
+        // E.g. If a TextView's layout_width is set to 0dp, layout_height is set to wrap_content,
+        // and layout_flexGrow is set to 1, the TextView is trying to expand to the vertical
+        // direction to enclose its content (in the measureHorizontal method), but
+        // the width will be expanded in this method. In that case, the height needs to be measured
+        // again with the expanded width.
+        int largestCrossSize = 0;
+        if (!calledRecursively) {
+            flexLine.mCrossSize = Integer.MIN_VALUE;
+        }
+        for (int i = 0; i < flexLine.mItemCount; i++) {
+            int index = flexLine.mFirstIndex + i;
+            View child = mFlexContainer.getReorderedFlexItemAt(index);
+            if (child == null || child.getVisibility() == View.GONE) {
+                continue;
+            }
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+            int flexDirection = mFlexContainer.getFlexDirection();
+            if (flexDirection == FlexDirection.ROW || flexDirection == FlexDirection.ROW_REVERSE) {
+                // The direction of main axis is horizontal
+
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured width from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredWidth returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, the case happens
+                    // frequently
+                    childMeasuredWidth = extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured height from the cache
+                    childMeasuredHeight = extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexShrink() > 0f) {
+                    float rawCalculatedWidth = childMeasuredWidth
+                            - unitShrink * flexItem.getFlexShrink();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedWidth += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newWidth = Math.round(rawCalculatedWidth);
+                    if (newWidth < flexItem.getMinWidth()) {
+                        // This means the child doesn't have enough space to distribute the negative
+                        // free space. To adjust the flex line length down to the maxMainSize,
+                        // remaining
+                        // negative free space needs to be re-distributed to other flex items
+                        // (children views). In that case, invoke this method again with the same
+                        // fromIndex.
+                        needsReshrink = true;
+                        newWidth = flexItem.getMinWidth();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexShrink -= flexItem.getFlexShrink();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedWidth - newWidth);
+                        if (accumulatedRoundError > 1.0) {
+                            newWidth += 1;
+                            accumulatedRoundError -= 1;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newWidth -= 1;
+                            accumulatedRoundError += 1;
+                        }
+                    }
+                    int childHeightMeasureSpec = getChildHeightMeasureSpecInternal(
+                            heightMeasureSpec, flexItem, flexLine.mSumCrossSizeBefore);
+                    int childWidthMeasureSpec =
+                            View.MeasureSpec.makeMeasureSpec(newWidth, View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredHeight +
+                        flexItem.getMarginTop() + flexItem.getMarginBottom() +
+                        mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredWidth + flexItem.getMarginLeft()
+                        + flexItem.getMarginRight();
+            } else {
+                // The direction of main axis is vertical
+
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured height from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredHeight returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, that case happens
+                    // frequently
+                    childMeasuredHeight =
+                            extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured width from the cache
+                    childMeasuredWidth =
+                            extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexShrink() > 0f) {
+                    float rawCalculatedHeight = childMeasuredHeight
+                            - unitShrink * flexItem.getFlexShrink();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedHeight += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newHeight = Math.round(rawCalculatedHeight);
+                    if (newHeight < flexItem.getMinHeight()) {
+                        // Need to invoke this method again like the case flex direction is vertical
+                        needsReshrink = true;
+                        newHeight = flexItem.getMinHeight();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexShrink -= flexItem.getFlexShrink();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedHeight - newHeight);
+                        if (accumulatedRoundError > 1.0) {
+                            newHeight += 1;
+                            accumulatedRoundError -= 1;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newHeight -= 1;
+                            accumulatedRoundError += 1;
+                        }
+                    }
+                    int childWidthMeasureSpec = getChildWidthMeasureSpecInternal(widthMeasureSpec,
+                            flexItem, flexLine.mSumCrossSizeBefore);
+                    int childHeightMeasureSpec =
+                            View.MeasureSpec.makeMeasureSpec(newHeight, View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredWidth +
+                        flexItem.getMarginLeft() + flexItem.getMarginRight() +
+                        mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredHeight + flexItem.getMarginTop()
+                        + flexItem.getMarginBottom();
+            }
+            flexLine.mCrossSize = Math.max(flexLine.mCrossSize, largestCrossSize);
+        }
+
+        if (needsReshrink && sizeBeforeShrink != flexLine.mMainSize) {
+            // Re-invoke the method with the same fromIndex to distribute the negative free space
+            // that wasn't fully distributed (because some views length were not enough)
+            shrinkFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine,
+                    maxMainSize, paddingAlongMainAxis, true);
+        }
+    }
+
+    private int getChildWidthMeasureSpecInternal(int widthMeasureSpec, FlexItem flexItem,
+            int padding) {
+        int childWidthMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(widthMeasureSpec,
+                mFlexContainer.getPaddingLeft() + mFlexContainer.getPaddingRight() +
+                        flexItem.getMarginLeft() + flexItem.getMarginRight() + padding,
+                flexItem.getWidth());
+        int childWidth = View.MeasureSpec.getSize(childWidthMeasureSpec);
+        if (childWidth > flexItem.getMaxWidth()) {
+            childWidthMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMaxWidth(),
+                    View.MeasureSpec.getMode(childWidthMeasureSpec));
+        } else if (childWidth < flexItem.getMinWidth()) {
+            childWidthMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMinWidth(),
+                    View.MeasureSpec.getMode(childWidthMeasureSpec));
+        }
+        return childWidthMeasureSpec;
+    }
+
+    private int getChildHeightMeasureSpecInternal(int heightMeasureSpec, FlexItem flexItem,
+            int padding) {
+        int childHeightMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(heightMeasureSpec,
+                mFlexContainer.getPaddingTop() + mFlexContainer.getPaddingBottom()
+                        + flexItem.getMarginTop() + flexItem.getMarginBottom() + padding,
+                flexItem.getHeight());
+        int childHeight = View.MeasureSpec.getSize(childHeightMeasureSpec);
+        if (childHeight > flexItem.getMaxHeight()) {
+            childHeightMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMaxHeight(),
+                    View.MeasureSpec.getMode(childHeightMeasureSpec));
+        } else if (childHeight < flexItem.getMinHeight()) {
+            childHeightMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMinHeight(),
+                    View.MeasureSpec.getMode(childHeightMeasureSpec));
+        }
+        return childHeightMeasureSpec;
+    }
+
+    /**
+     * Determines the cross size (Calculate the length along the cross axis).
+     * Expand the cross size only if the height mode is MeasureSpec.EXACTLY, otherwise
+     * use the sum of cross sizes of all flex lines.
+     *
+     * @param widthMeasureSpec      horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec     vertical space requirements as imposed by the parent
+     * @param paddingAlongCrossAxis the padding value for the FlexboxLayout along the cross axis
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexContainer#getAlignContent()
+     * @see FlexContainer#setAlignContent(int)
+     */
+    void determineCrossSize(int widthMeasureSpec, int heightMeasureSpec,
+            int paddingAlongCrossAxis) {
+        // The MeasureSpec mode along the cross axis
+        int mode;
+        // The MeasureSpec size along the cross axis
+        int size;
+        int flexDirection = mFlexContainer.getFlexDirection();
+        switch (flexDirection) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                mode = View.MeasureSpec.getMode(heightMeasureSpec);
+                size = View.MeasureSpec.getSize(heightMeasureSpec);
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                mode = View.MeasureSpec.getMode(widthMeasureSpec);
+                size = View.MeasureSpec.getSize(widthMeasureSpec);
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid flex direction: " + flexDirection);
+        }
+        List<FlexLine> flexLines = mFlexContainer.getFlexLinesInternal();
+        if (mode == View.MeasureSpec.EXACTLY) {
+            int totalCrossSize = mFlexContainer.getSumOfCrossSize() + paddingAlongCrossAxis;
+            if (flexLines.size() == 1) {
+                flexLines.get(0).mCrossSize = size - paddingAlongCrossAxis;
+                // alignContent property is valid only if the Flexbox has at least two lines
+            } else if (flexLines.size() >= 2) {
+                switch (mFlexContainer.getAlignContent()) {
+                    case AlignContent.STRETCH: {
+                        if (totalCrossSize >= size) {
+                            break;
+                        }
+                        float freeSpaceUnit = (size - totalCrossSize) / (float) flexLines.size();
+                        float accumulatedError = 0;
+                        for (int i = 0, flexLinesSize = flexLines.size(); i < flexLinesSize; i++) {
+                            FlexLine flexLine = flexLines.get(i);
+                            float newCrossSizeAsFloat = flexLine.mCrossSize + freeSpaceUnit;
+                            if (i == flexLines.size() - 1) {
+                                newCrossSizeAsFloat += accumulatedError;
+                                accumulatedError = 0;
+                            }
+                            int newCrossSize = Math.round(newCrossSizeAsFloat);
+                            accumulatedError += (newCrossSizeAsFloat - newCrossSize);
+                            if (accumulatedError > 1) {
+                                newCrossSize += 1;
+                                accumulatedError -= 1;
+                            } else if (accumulatedError < -1) {
+                                newCrossSize -= 1;
+                                accumulatedError += 1;
+                            }
+                            flexLine.mCrossSize = newCrossSize;
+                        }
+                        break;
+                    }
+                    case AlignContent.SPACE_AROUND: {
+                        if (totalCrossSize >= size) {
+                            // If the size of the content is larger than the flex container, the
+                            // Flex lines should be aligned center like ALIGN_CONTENT_CENTER
+                            mFlexContainer.setFlexLines(
+                                    constructFlexLinesForAlignContentCenter(flexLines, size,
+                                            totalCrossSize));
+                            break;
+                        }
+                        // The value of free space along the cross axis which needs to be put on top
+                        // and below the bottom of each flex line.
+                        int spaceTopAndBottom = size - totalCrossSize;
+                        // The number of spaces along the cross axis
+                        int numberOfSpaces = flexLines.size() * 2;
+                        spaceTopAndBottom = spaceTopAndBottom / numberOfSpaces;
+                        List<FlexLine> newFlexLines = new ArrayList<>();
+                        FlexLine dummySpaceFlexLine = new FlexLine();
+                        dummySpaceFlexLine.mCrossSize = spaceTopAndBottom;
+                        for (FlexLine flexLine : flexLines) {
+                            newFlexLines.add(dummySpaceFlexLine);
+                            newFlexLines.add(flexLine);
+                            newFlexLines.add(dummySpaceFlexLine);
+                        }
+                        mFlexContainer.setFlexLines(newFlexLines);
+                        break;
+                    }
+                    case AlignContent.SPACE_BETWEEN: {
+                        if (totalCrossSize >= size) {
+                            break;
+                        }
+                        // The value of free space along the cross axis between each flex line.
+                        float spaceBetweenFlexLine = size - totalCrossSize;
+                        int numberOfSpaces = flexLines.size() - 1;
+                        spaceBetweenFlexLine = spaceBetweenFlexLine / (float) numberOfSpaces;
+                        float accumulatedError = 0;
+                        List<FlexLine> newFlexLines = new ArrayList<>();
+                        for (int i = 0, flexLineSize = flexLines.size(); i < flexLineSize; i++) {
+                            FlexLine flexLine = flexLines.get(i);
+                            newFlexLines.add(flexLine);
+
+                            if (i != flexLines.size() - 1) {
+                                FlexLine dummySpaceFlexLine = new FlexLine();
+                                if (i == flexLines.size() - 2) {
+                                    // The last dummy space block in the flex container.
+                                    // Adjust the cross size by the accumulated error.
+                                    dummySpaceFlexLine.mCrossSize = Math
+                                            .round(spaceBetweenFlexLine + accumulatedError);
+                                    accumulatedError = 0;
+                                } else {
+                                    dummySpaceFlexLine.mCrossSize = Math
+                                            .round(spaceBetweenFlexLine);
+                                }
+                                accumulatedError += (spaceBetweenFlexLine
+                                        - dummySpaceFlexLine.mCrossSize);
+                                if (accumulatedError > 1) {
+                                    dummySpaceFlexLine.mCrossSize += 1;
+                                    accumulatedError -= 1;
+                                } else if (accumulatedError < -1) {
+                                    dummySpaceFlexLine.mCrossSize -= 1;
+                                    accumulatedError += 1;
+                                }
+                                newFlexLines.add(dummySpaceFlexLine);
+                            }
+                        }
+                        mFlexContainer.setFlexLines(newFlexLines);
+                        break;
+                    }
+                    case AlignContent.CENTER: {
+                        mFlexContainer.setFlexLines(
+                                constructFlexLinesForAlignContentCenter(flexLines, size,
+                                        totalCrossSize));
+                        break;
+                    }
+                    case AlignContent.FLEX_END: {
+                        int spaceTop = size - totalCrossSize;
+                        FlexLine dummySpaceFlexLine = new FlexLine();
+                        dummySpaceFlexLine.mCrossSize = spaceTop;
+                        flexLines.add(0, dummySpaceFlexLine);
+                        break;
+                    }
+                    case AlignContent.FLEX_START:
+                        // No op. Just to cover the available switch statement options
+                        break;
+                }
+            }
+        }
+    }
+
+    private List<FlexLine> constructFlexLinesForAlignContentCenter(List<FlexLine> flexLines,
+            int size, int totalCrossSize) {
+        int spaceAboveAndBottom = size - totalCrossSize;
+        spaceAboveAndBottom = spaceAboveAndBottom / 2;
+        List<FlexLine> newFlexLines = new ArrayList<>();
+        FlexLine dummySpaceFlexLine = new FlexLine();
+        dummySpaceFlexLine.mCrossSize = spaceAboveAndBottom;
+        for (int i = 0, flexLineSize = flexLines.size(); i < flexLineSize; i++) {
+            if (i == 0) {
+                newFlexLines.add(dummySpaceFlexLine);
+            }
+            FlexLine flexLine = flexLines.get(i);
+            newFlexLines.add(flexLine);
+            if (i == flexLines.size() - 1) {
+                newFlexLines.add(dummySpaceFlexLine);
+            }
+        }
+        return newFlexLines;
+    }
+
+    void stretchViews() {
+        stretchViews(0);
+    }
+
+    /**
+     * Expand the view if the {@link FlexContainer#getAlignItems()} attribute is set to {@link
+     * AlignItems#STRETCH} or {@link FlexItem#getAlignSelf()} is set as
+     * {@link AlignItems#STRETCH}.
+     *
+     * @param fromIndex the index from which value, stretch is calculated
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexContainer#getAlignItems()
+     * @see FlexContainer#setAlignItems(int)
+     * @see FlexItem#getAlignSelf()
+     */
+    void stretchViews(int fromIndex) {
+        if (fromIndex >= mFlexContainer.getFlexItemCount()) {
+            return;
+        }
+        int flexDirection = mFlexContainer.getFlexDirection();
+        if (mFlexContainer.getAlignItems() == AlignItems.STRETCH) {
+            int flexLineIndex = 0;
+            if (mIndexToFlexLine != null) {
+                flexLineIndex = mIndexToFlexLine[fromIndex];
+            }
+            List<FlexLine> flexLines = mFlexContainer.getFlexLinesInternal();
+            for (int i = flexLineIndex, size = flexLines.size(); i < size; i++) {
+                FlexLine flexLine = flexLines.get(i);
+                for (int j = 0, itemCount = flexLine.mItemCount; j < itemCount; j++) {
+                    int viewIndex = flexLine.mFirstIndex + j;
+                    if (j >= mFlexContainer.getFlexItemCount()) {
+                        continue;
+                    }
+                    View view = mFlexContainer.getReorderedFlexItemAt(viewIndex);
+                    if (view == null || view.getVisibility() == View.GONE) {
+                        continue;
+                    }
+                    FlexItem flexItem = (FlexItem) view.getLayoutParams();
+                    if (flexItem.getAlignSelf() != AlignSelf.AUTO &&
+                            flexItem.getAlignSelf() != AlignItems.STRETCH) {
+                        continue;
+                    }
+                    switch (flexDirection) {
+                        case FlexDirection.ROW: // Intentional fall through
+                        case FlexDirection.ROW_REVERSE:
+                            stretchViewVertically(view, flexLine.mCrossSize, viewIndex);
+                            break;
+                        case FlexDirection.COLUMN:
+                        case FlexDirection.COLUMN_REVERSE:
+                            stretchViewHorizontally(view, flexLine.mCrossSize, viewIndex);
+                            break;
+                        default:
+                            throw new IllegalArgumentException(
+                                    "Invalid flex direction: " + flexDirection);
+                    }
+                }
+            }
+        } else {
+            for (FlexLine flexLine : mFlexContainer.getFlexLinesInternal()) {
+                for (Integer index : flexLine.mIndicesAlignSelfStretch) {
+                    View view = mFlexContainer.getReorderedFlexItemAt(index);
+                    switch (flexDirection) {
+                        case FlexDirection.ROW: // Intentional fall through
+                        case FlexDirection.ROW_REVERSE:
+                            stretchViewVertically(view, flexLine.mCrossSize, index);
+                            break;
+                        case FlexDirection.COLUMN:
+                        case FlexDirection.COLUMN_REVERSE:
+                            stretchViewHorizontally(view, flexLine.mCrossSize, index);
+                            break;
+                        default:
+                            throw new IllegalArgumentException(
+                                    "Invalid flex direction: " + flexDirection);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Expand the view vertically to the size of the crossSize (considering the view margins)
+     *
+     * @param view      the View to be stretched
+     * @param crossSize the cross size
+     * @param index     the index of the view
+     */
+    private void stretchViewVertically(View view, int crossSize, int index) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int newHeight = crossSize - flexItem.getMarginTop() - flexItem.getMarginBottom() -
+                mFlexContainer.getDecorationLengthCrossAxis(view);
+        newHeight = Math.max(newHeight, flexItem.getMinHeight());
+        newHeight = Math.min(newHeight, flexItem.getMaxHeight());
+        int childWidthSpec;
+        int measuredWidth;
+        if (mMeasuredSizeCache != null) {
+            // Retrieve the measured height from the cache because there
+            // are some cases that the view is re-created from the last measure, thus
+            // View#getMeasuredHeight returns 0.
+            // E.g. if the flex container is FlexboxLayoutManager, that case happens
+            // frequently
+            measuredWidth = extractLowerInt(mMeasuredSizeCache[index]);
+        } else {
+            measuredWidth = view.getMeasuredWidth();
+        }
+        childWidthSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth,
+                View.MeasureSpec.EXACTLY);
+
+        int childHeightSpec = View.MeasureSpec.makeMeasureSpec(newHeight, View.MeasureSpec.EXACTLY);
+        view.measure(childWidthSpec, childHeightSpec);
+
+        updateMeasureCache(index, childWidthSpec, childHeightSpec, view);
+        mFlexContainer.updateViewCache(index, view);
+    }
+
+    /**
+     * Expand the view horizontally to the size of the crossSize (considering the view margins)
+     *
+     * @param view      the View to be stretched
+     * @param crossSize the cross size
+     * @param index     the index of the view
+     */
+    private void stretchViewHorizontally(View view, int crossSize, int index) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int newWidth = crossSize - flexItem.getMarginLeft() - flexItem.getMarginRight()
+                - mFlexContainer.getDecorationLengthCrossAxis(view);
+        newWidth = Math.max(newWidth, flexItem.getMinWidth());
+        newWidth = Math.min(newWidth, flexItem.getMaxWidth());
+        int childHeightSpec;
+        int measuredHeight;
+        if (mMeasuredSizeCache != null) {
+            // Retrieve the measured height from the cache because there
+            // are some cases that the view is re-created from the last measure, thus
+            // View#getMeasuredHeight returns 0.
+            // E.g. if the flex container is FlexboxLayoutManager, that case happens
+            // frequently
+            measuredHeight = extractHigherInt(mMeasuredSizeCache[index]);
+        } else {
+            measuredHeight = view.getMeasuredHeight();
+        }
+        childHeightSpec = View.MeasureSpec.makeMeasureSpec(measuredHeight,
+                View.MeasureSpec.EXACTLY);
+        int childWidthSpec = View.MeasureSpec.makeMeasureSpec(newWidth, View.MeasureSpec.EXACTLY);
+        view.measure(childWidthSpec, childHeightSpec);
+
+        updateMeasureCache(index, childWidthSpec, childHeightSpec, view);
+        mFlexContainer.updateViewCache(index, view);
+    }
+
+    /**
+     * Place a single View when the layout direction is horizontal
+     * ({@link FlexContainer#getFlexDirection()} is either {@link FlexDirection#ROW} or
+     * {@link FlexDirection#ROW_REVERSE}).
+     *
+     * @param view     the View to be placed
+     * @param flexLine the {@link FlexLine} where the View belongs to
+     * @param left     the left position of the View, which the View's margin is already taken
+     *                 into account
+     * @param top      the top position of the flex line where the View belongs to. The actual
+     *                 View's top position is shifted depending on the flexWrap and alignItems
+     *                 attributes
+     * @param right    the right position of the View, which the View's margin is already taken
+     *                 into account
+     * @param bottom   the bottom position of the flex line where the View belongs to. The actual
+     *                 View's bottom position is shifted depending on the flexWrap and alignItems
+     *                 attributes
+     * @see FlexContainer#getAlignItems()
+     * @see FlexContainer#setAlignItems(int)
+     * @see FlexItem#getAlignSelf()
+     */
+    void layoutSingleChildHorizontal(View view, FlexLine flexLine, int left, int top, int right,
+            int bottom) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int alignItems = mFlexContainer.getAlignItems();
+        if (flexItem.getAlignSelf() != AlignSelf.AUTO) {
+            // Expecting the values for alignItems and mAlignSelf match except for ALIGN_SELF_AUTO.
+            // Assigning the mAlignSelf value as alignItems should work.
+            alignItems = flexItem.getAlignSelf();
+        }
+        int crossSize = flexLine.mCrossSize;
+        switch (alignItems) {
+            case AlignItems.FLEX_START: // Intentional fall through
+            case AlignItems.STRETCH:
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    view.layout(left, top + flexItem.getMarginTop(), right,
+                            bottom + flexItem.getMarginTop());
+                } else {
+                    view.layout(left, top - flexItem.getMarginBottom(), right,
+                            bottom - flexItem.getMarginBottom());
+                }
+                break;
+            case AlignItems.BASELINE:
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    int marginTop = flexLine.mMaxBaseline - view.getBaseline();
+                    marginTop = Math.max(marginTop, flexItem.getMarginTop());
+                    view.layout(left, top + marginTop, right, bottom + marginTop);
+                } else {
+                    int marginBottom = flexLine.mMaxBaseline - view.getMeasuredHeight() + view
+                            .getBaseline();
+                    marginBottom = Math.max(marginBottom, flexItem.getMarginBottom());
+                    view.layout(left, top - marginBottom, right, bottom - marginBottom);
+                }
+                break;
+            case AlignItems.FLEX_END:
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    view.layout(left,
+                            top + crossSize - view.getMeasuredHeight() - flexItem.getMarginBottom(),
+                            right, top + crossSize - flexItem.getMarginBottom());
+                } else {
+                    // If the flexWrap == WRAP_REVERSE, the direction of the
+                    // flexEnd is flipped (from top to bottom).
+                    view.layout(left,
+                            top - crossSize + view.getMeasuredHeight() + flexItem.getMarginTop(),
+                            right, bottom - crossSize + view.getMeasuredHeight() + flexItem
+                                    .getMarginTop());
+                }
+                break;
+            case AlignItems.CENTER:
+                int topFromCrossAxis = (crossSize - view.getMeasuredHeight()
+                        + flexItem.getMarginTop() - flexItem.getMarginBottom()) / 2;
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    view.layout(left, top + topFromCrossAxis,
+                            right, top + topFromCrossAxis + view.getMeasuredHeight());
+                } else {
+                    view.layout(left, top - topFromCrossAxis,
+                            right, top - topFromCrossAxis + view.getMeasuredHeight());
+                }
+                break;
+        }
+    }
+
+    /**
+     * Place a single View when the layout direction is vertical
+     * ({@link FlexContainer#getFlexDirection()} is either {@link FlexDirection#COLUMN} or
+     * {@link FlexDirection#COLUMN_REVERSE}).
+     *
+     * @param view     the View to be placed
+     * @param flexLine the {@link FlexLine} where the View belongs to
+     * @param isRtl    {@code true} if the layout direction is right to left, {@code false}
+     *                 otherwise
+     * @param left     the left position of the flex line where the View belongs to. The actual
+     *                 View's left position is shifted depending on the isLayoutRtl and alignItems
+     *                 attributes
+     * @param top      the top position of the View, which the View's margin is already taken
+     *                 into account
+     * @param right    the right position of the flex line where the View belongs to. The actual
+     *                 View's right position is shifted depending on the isLayoutRtl and alignItems
+     *                 attributes
+     * @param bottom   the bottom position of the View, which the View's margin is already taken
+     *                 into account
+     * @see FlexContainer#getAlignItems()
+     * @see FlexContainer#setAlignItems(int)
+     * @see FlexItem#getAlignSelf()
+     */
+    void layoutSingleChildVertical(View view, FlexLine flexLine, boolean isRtl,
+            int left, int top, int right, int bottom) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int alignItems = mFlexContainer.getAlignItems();
+        if (flexItem.getAlignSelf() != AlignSelf.AUTO) {
+            // Expecting the values for alignItems and mAlignSelf match except for ALIGN_SELF_AUTO.
+            // Assigning the mAlignSelf value as alignItems should work.
+            alignItems = flexItem.getAlignSelf();
+        }
+        int crossSize = flexLine.mCrossSize;
+        switch (alignItems) {
+            case AlignItems.FLEX_START: // Intentional fall through
+            case AlignItems.STRETCH: // Intentional fall through
+            case AlignItems.BASELINE:
+                if (!isRtl) {
+                    view.layout(left + flexItem.getMarginLeft(), top,
+                            right + flexItem.getMarginLeft(), bottom);
+                } else {
+                    view.layout(left - flexItem.getMarginRight(), top,
+                            right - flexItem.getMarginRight(), bottom);
+                }
+                break;
+            case AlignItems.FLEX_END:
+                if (!isRtl) {
+                    view.layout(
+                            left + crossSize - view.getMeasuredWidth() - flexItem.getMarginRight(),
+                            top,
+                            right + crossSize - view.getMeasuredWidth() - flexItem.getMarginRight(),
+                            bottom);
+                } else {
+                    // If the flexWrap == WRAP_REVERSE, the direction of the
+                    // flexEnd is flipped (from left to right).
+                    view.layout(
+                            left - crossSize + view.getMeasuredWidth() + flexItem.getMarginLeft(),
+                            top,
+                            right - crossSize + view.getMeasuredWidth() + flexItem.getMarginLeft(),
+                            bottom);
+                }
+                break;
+            case AlignItems.CENTER:
+                ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams)
+                        view.getLayoutParams();
+                int leftFromCrossAxis = (crossSize - view.getMeasuredWidth()
+                        + MarginLayoutParamsCompat.getMarginStart(lp)
+                        - MarginLayoutParamsCompat.getMarginEnd(lp)) / 2;
+                if (!isRtl) {
+                    view.layout(left + leftFromCrossAxis, top, right + leftFromCrossAxis, bottom);
+                } else {
+                    view.layout(left - leftFromCrossAxis, top, right - leftFromCrossAxis, bottom);
+                }
+                break;
+        }
+    }
+
+    void ensureMeasuredSizeCache(int size) {
+        if (mMeasuredSizeCache == null) {
+            mMeasuredSizeCache = new long[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mMeasuredSizeCache.length < size) {
+            int newCapacity = mMeasuredSizeCache.length * 2;
+            newCapacity = Math.max(newCapacity, size);
+            mMeasuredSizeCache = Arrays.copyOf(mMeasuredSizeCache, newCapacity);
+        }
+    }
+
+    void ensureMeasureSpecCache(int size) {
+        if (mMeasureSpecCache == null) {
+            mMeasureSpecCache = new long[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mMeasureSpecCache.length < size) {
+            int newCapacity = mMeasureSpecCache.length * 2;
+            newCapacity = Math.max(newCapacity, size);
+            mMeasureSpecCache = Arrays.copyOf(mMeasureSpecCache, newCapacity);
+        }
+    }
+
+    /**
+     * @param longValue the long value that consists of width and height measure specs
+     * @return the int value which consists from the lower 8 bits
+     * @see #makeCombinedLong(int, int)
+     */
+    int extractLowerInt(long longValue) {
+        return (int) longValue;
+    }
+
+    /**
+     * @param longValue the long value that consists of width and height measure specs
+     * @return the int value which consists from the higher 8 bits
+     * @see #makeCombinedLong(int, int)
+     */
+    int extractHigherInt(long longValue) {
+        return (int) (longValue >> 32);
+    }
+
+    /**
+     * Make a long value from the a width measure spec and a height measure spec.
+     * The first 32 bit is used for the height measure spec and the last 32 bit is used for the
+     * width measure spec.
+     *
+     * @param widthMeasureSpec  the width measure spec to consist the result long value
+     * @param heightMeasureSpec the height measure spec to consist the result long value
+     * @return the combined long value
+     * @see #extractLowerInt(long)
+     * @see #extractHigherInt(long)
+     */
+    @VisibleForTesting
+    long makeCombinedLong(int widthMeasureSpec, int heightMeasureSpec) {
+        // Suppress sign extension for the low bytes
+        return (long) heightMeasureSpec << 32 | (long) widthMeasureSpec & MEASURE_SPEC_WIDTH_MASK;
+    }
+
+    private void updateMeasureCache(int index, int widthMeasureSpec, int heightMeasureSpec,
+            View view) {
+        if (mMeasureSpecCache != null) {
+            mMeasureSpecCache[index] = makeCombinedLong(
+                    widthMeasureSpec,
+                    heightMeasureSpec);
+        }
+        if (mMeasuredSizeCache != null) {
+            mMeasuredSizeCache[index] = makeCombinedLong(
+                    view.getMeasuredWidth(),
+                    view.getMeasuredHeight());
+        }
+    }
+
+    void ensureIndexToFlexLine(int size) {
+        if (mIndexToFlexLine == null) {
+            mIndexToFlexLine = new int[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mIndexToFlexLine.length < size) {
+            int newCapacity = mIndexToFlexLine.length * 2;
+            newCapacity = Math.max(newCapacity, size);
+            mIndexToFlexLine = Arrays.copyOf(mIndexToFlexLine, newCapacity);
+        }
+    }
+
+    /**
+     * Clear the from flex lines and the caches from the index passed as an argument.
+     *
+     * @param flexLines    the flex lines to be cleared
+     * @param fromFlexItem the index from which, flex lines are cleared
+     */
+    void clearFlexLines(List<FlexLine> flexLines, int fromFlexItem) {
+        assert mIndexToFlexLine != null;
+        assert mMeasureSpecCache != null;
+
+        int fromFlexLine = mIndexToFlexLine[fromFlexItem];
+        if (fromFlexLine == NO_POSITION) {
+            fromFlexLine = 0;
+        }
+
+        // Deleting from the last to avoid unneeded copy it happens when deleting the middle of the
+        // item in the ArrayList
+        if (flexLines.size() > fromFlexLine) {
+            flexLines.subList(fromFlexLine, flexLines.size()).clear();
+        }
+
+        int fillTo = mIndexToFlexLine.length - 1;
+        if (fromFlexItem > fillTo) {
+            Arrays.fill(mIndexToFlexLine, NO_POSITION);
+        } else {
+            Arrays.fill(mIndexToFlexLine, fromFlexItem, fillTo, NO_POSITION);
+        }
+
+        fillTo = mMeasureSpecCache.length - 1;
+        if (fromFlexItem > fillTo) {
+            Arrays.fill(mMeasureSpecCache, 0);
+        } else {
+            Arrays.fill(mMeasureSpecCache, fromFlexItem, fillTo, 0);
+        }
+    }
+
+    /**
+     * A class that is used for calculating the view order which view's indices and order
+     * properties from Flexbox are taken into account.
+     */
+    private static class Order implements Comparable<Order> {
+
+        /** {@link View}'s index */
+        int index;
+
+        /** order property in the Flexbox */
+        int order;
+
+        @Override
+        public int compareTo(@NonNull Order another) {
+            if (order != another.order) {
+                return order - another.order;
+            }
+            return index - another.index;
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return "Order{" +
+                    "order=" + order +
+                    ", index=" + index +
+                    '}';
+        }
+    }
+
+    static class FlexLinesResult {
+
+        List<FlexLine> mFlexLines;
+
+        int mChildState;
+
+        void reset() {
+            mFlexLines = null;
+            mChildState = 0;
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxItemDecoration.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxItemDecoration.java
new file mode 100755
index 0000000..ad33332
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxItemDecoration.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * {@link RecyclerView.ItemDecoration} implementation that can be used as item decorations between
+ * view holders within the {@link FlexboxLayoutManager}.
+ *
+ * Orientation for the decoration can be either of:
+ * <ul>
+ * <li>Horizontal (setOrientation(HORIZONTAL)</li>
+ * <li>Vertical (setOrientation(VERTICAL)</li>
+ * <li>Both orientation (setOrientation(BOTH)</li>
+ * </ul>.
+ * The default value is set to both.
+ */
+public class FlexboxItemDecoration extends RecyclerView.ItemDecoration {
+
+    public static final int HORIZONTAL = 1;
+    public static final int VERTICAL = 1 << 1;
+    @SuppressWarnings("WeakerAccess")
+    public static final int BOTH = HORIZONTAL | VERTICAL;
+
+    private static final int[] LIST_DIVIDER_ATTRS = new int[]{android.R.attr.listDivider};
+
+    private Drawable mDrawable;
+
+    private int mOrientation;
+
+    public FlexboxItemDecoration(Context context) {
+        final TypedArray a = context.obtainStyledAttributes(LIST_DIVIDER_ATTRS);
+        mDrawable = a.getDrawable(0);
+        a.recycle();
+        setOrientation(BOTH);
+    }
+
+    /**
+     * Set the drawable used as the item decoration.
+     * If the drawable is not set, the default list divider is used as the
+     * item decoration.
+     */
+    public void setDrawable(Drawable drawable) {
+        if (drawable == null) {
+            throw new IllegalArgumentException("Drawable cannot be null.");
+        }
+        mDrawable = drawable;
+    }
+
+    /**
+     * Set the orientation for the decoration.
+     * Orientation for the decoration can be either of:
+     * <ul>
+     * <li>Horizontal (setOrientation(HORIZONTAL)</li>
+     * <li>Vertical (setOrientation(VERTICAL)</li>
+     * <li>Both orientation (setOrientation(BOTH)</li>
+     * </ul>.
+     */
+    public void setOrientation(int orientation) {
+        mOrientation = orientation;
+    }
+
+    @Override
+    public void onDraw(
+            @NonNull Canvas canvas,
+            @NonNull RecyclerView parent,
+            @NonNull RecyclerView.State state) {
+        drawHorizontalDecorations(canvas, parent);
+        drawVerticalDecorations(canvas, parent);
+    }
+
+    @Override
+    public void getItemOffsets(
+            @NonNull Rect outRect,
+            @NonNull View view,
+            RecyclerView parent,
+            @NonNull RecyclerView.State state) {
+        int position = parent.getChildAdapterPosition(view);
+        if (position == 0) {
+            return;
+        }
+        if (!needsHorizontalDecoration() && !needsVerticalDecoration()) {
+            outRect.set(0, 0, 0, 0);
+            return;
+        }
+        FlexboxLayoutManager layoutManager = (FlexboxLayoutManager) parent.getLayoutManager();
+        List<FlexLine> flexLines = layoutManager.getFlexLines();
+        int flexDirection = layoutManager.getFlexDirection();
+        setOffsetAlongMainAxis(outRect, position, layoutManager, flexLines, flexDirection);
+        setOffsetAlongCrossAxis(outRect, position, layoutManager, flexLines);
+    }
+
+    private void setOffsetAlongCrossAxis(Rect outRect, int position,
+            FlexboxLayoutManager layoutManager, List<FlexLine> flexLines) {
+        if (flexLines.size() == 0) {
+            return;
+        }
+        int flexLineIndex = layoutManager.getPositionToFlexLineIndex(position);
+        if (flexLineIndex == 0) {
+            return;
+        }
+
+        if (layoutManager.isMainAxisDirectionHorizontal()) {
+            if (!needsHorizontalDecoration()) {
+                outRect.top = 0;
+                outRect.bottom = 0;
+                return;
+            }
+            outRect.top = mDrawable.getIntrinsicHeight();
+            outRect.bottom = 0;
+        } else {
+            if (!needsVerticalDecoration()) {
+                return;
+            }
+            if (layoutManager.isLayoutRtl()) {
+                outRect.right = mDrawable.getIntrinsicWidth();
+                outRect.left = 0;
+            } else {
+                outRect.left = mDrawable.getIntrinsicWidth();
+                outRect.right = 0;
+            }
+        }
+
+    }
+
+    private void setOffsetAlongMainAxis(Rect outRect, int position,
+            FlexboxLayoutManager layoutManager, List<FlexLine> flexLines, int flexDirection) {
+        if (isFirstItemInLine(position, flexLines, layoutManager)) {
+            return;
+        }
+
+        if (layoutManager.isMainAxisDirectionHorizontal()) {
+            if (!needsVerticalDecoration()) {
+                outRect.left = 0;
+                outRect.right = 0;
+                return;
+            }
+            if (layoutManager.isLayoutRtl()) {
+                outRect.right = mDrawable.getIntrinsicWidth();
+                outRect.left = 0;
+            } else {
+                outRect.left = mDrawable.getIntrinsicWidth();
+                outRect.right = 0;
+            }
+        } else {
+            if (!needsHorizontalDecoration()) {
+                outRect.top = 0;
+                outRect.bottom = 0;
+                return;
+            }
+            if (flexDirection == FlexDirection.COLUMN_REVERSE) {
+                outRect.bottom = mDrawable.getIntrinsicHeight();
+                outRect.top = 0;
+            } else {
+                outRect.top = mDrawable.getIntrinsicHeight();
+                outRect.bottom = 0;
+            }
+        }
+
+    }
+
+    private void drawVerticalDecorations(Canvas canvas, RecyclerView parent) {
+        if (!needsVerticalDecoration()) {
+            return;
+        }
+        FlexboxLayoutManager layoutManager = (FlexboxLayoutManager) parent.getLayoutManager();
+        int parentTop = parent.getTop() - parent.getPaddingTop();
+        int parentBottom = parent.getBottom() + parent.getPaddingBottom();
+        int childCount = parent.getChildCount();
+        int flexDirection = layoutManager.getFlexDirection();
+        for (int i = 0; i < childCount; i++) {
+            View child = parent.getChildAt(i);
+
+            RecyclerView.LayoutParams lp = (RecyclerView.LayoutParams) child.getLayoutParams();
+
+            int left, right;
+            if (layoutManager.isLayoutRtl()) {
+                left = child.getRight() + lp.rightMargin;
+                right = left + mDrawable.getIntrinsicWidth();
+            } else {
+                right = child.getLeft() - lp.leftMargin;
+                left = right - mDrawable.getIntrinsicWidth();
+            }
+
+            int top, bottom;
+            if (layoutManager.isMainAxisDirectionHorizontal()) {
+                top = child.getTop() - lp.topMargin;
+                bottom = child.getBottom() + lp.bottomMargin;
+            } else {
+                if (flexDirection == FlexDirection.COLUMN_REVERSE) {
+                    bottom = child.getBottom() + lp.bottomMargin + mDrawable.getIntrinsicHeight();
+                    bottom = Math.min(bottom, parentBottom);
+                    top = child.getTop() - lp.topMargin;
+                } else {
+                    top = child.getTop() - lp.topMargin - mDrawable.getIntrinsicHeight();
+                    top = Math.max(top, parentTop);
+                    bottom = child.getBottom() + lp.bottomMargin;
+                }
+            }
+
+            mDrawable.setBounds(left, top, right, bottom);
+            mDrawable.draw(canvas);
+        }
+    }
+
+    private void drawHorizontalDecorations(Canvas canvas, RecyclerView parent) {
+        if (!needsHorizontalDecoration()) {
+            return;
+        }
+        FlexboxLayoutManager layoutManager = (FlexboxLayoutManager) parent.getLayoutManager();
+        int flexDirection = layoutManager.getFlexDirection();
+        int parentLeft = parent.getLeft() - parent.getPaddingLeft();
+        int parentRight = parent.getRight() + parent.getPaddingRight();
+        int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            View child = parent.getChildAt(i);
+            RecyclerView.LayoutParams lp = (RecyclerView.LayoutParams) child.getLayoutParams();
+
+            int top, bottom;
+            if (flexDirection == FlexDirection.COLUMN_REVERSE) {
+                top = child.getBottom() + lp.bottomMargin;
+                bottom = top + mDrawable.getIntrinsicHeight();
+            } else {
+                bottom = child.getTop() - lp.topMargin;
+                top = bottom - mDrawable.getIntrinsicHeight();
+            }
+
+            int left, right;
+            if (layoutManager.isMainAxisDirectionHorizontal()) {
+                if (layoutManager.isLayoutRtl()) {
+                    right = child.getRight() + lp.rightMargin + mDrawable.getIntrinsicWidth();
+                    right = Math.min(right, parentRight);
+                    left = child.getLeft() - lp.leftMargin;
+                } else {
+                    left = child.getLeft() - lp.leftMargin - mDrawable.getIntrinsicWidth();
+                    left = Math.max(left, parentLeft);
+                    right = child.getRight() + lp.rightMargin;
+                }
+            } else {
+                left = child.getLeft() - lp.leftMargin;
+                right = child.getRight() + lp.rightMargin;
+            }
+            mDrawable.setBounds(left, top, right, bottom);
+            mDrawable.draw(canvas);
+        }
+    }
+
+    private boolean needsHorizontalDecoration() {
+        return (mOrientation & HORIZONTAL) > 0;
+    }
+
+    private boolean needsVerticalDecoration() {
+        return (mOrientation & VERTICAL) > 0;
+    }
+
+    /**
+     * @return {@code true} if the given position is the first item in a flex line.
+     */
+    private boolean isFirstItemInLine(int position, List<FlexLine> flexLines,
+            FlexboxLayoutManager layoutManager) {
+        int flexLineIndex = layoutManager.getPositionToFlexLineIndex(position);
+        if (flexLineIndex != NO_POSITION &&
+                flexLineIndex < layoutManager.getFlexLinesInternal().size() &&
+                layoutManager.getFlexLinesInternal().get(flexLineIndex).mFirstIndex == position) {
+            return true;
+        }
+        if (position == 0) {
+            return true;
+        }
+        if (flexLines.size() == 0) {
+            return false;
+        }
+        // Check if the position is the "lastIndex + 1" of the last line in case the FlexLine which
+        // has the View, whose index is position is not included in the flexLines. (E.g. flexLines
+        // is being calculated
+        FlexLine lastLine = flexLines.get(flexLines.size() - 1);
+        return lastLine.mLastIndex == position - 1;
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
new file mode 100755
index 0000000..12c3e8a
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
@@ -0,0 +1,1878 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.util.SparseIntArray;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+
+/**
+ * A layout that arranges its children in a way its attributes can be specified like the
+ * CSS Flexible Box Layout Module.
+ * This class extends the {@link ViewGroup} like other layout classes such as {@link LinearLayout}
+ * or {@link RelativeLayout}, the attributes can be specified from a layout XML or from code.
+ *
+ * The supported attributes that you can use are:
+ * <ul>
+ * <li>{@code flexDirection}</li>
+ * <li>{@code flexWrap}</li>
+ * <li>{@code justifyContent}</li>
+ * <li>{@code alignItems}</li>
+ * <li>{@code alignContent}</li>
+ * <li>{@code showDivider}</li>
+ * <li>{@code showDividerHorizontal}</li>
+ * <li>{@code showDividerVertical}</li>
+ * <li>{@code dividerDrawable}</li>
+ * <li>{@code dividerDrawableHorizontal}</li>
+ * <li>{@code dividerDrawableVertical}</li>
+ * <li>{@code maxLine}</li>
+ * </ul>
+ * for the FlexboxLayout.
+ *
+ * And for the children of the FlexboxLayout, you can use:
+ * <ul>
+ * <li>{@code layout_order}</li>
+ * <li>{@code layout_flexGrow}</li>
+ * <li>{@code layout_flexShrink}</li>
+ * <li>{@code layout_flexBasisPercent}</li>
+ * <li>{@code layout_alignSelf}</li>
+ * <li>{@code layout_minWidth}</li>
+ * <li>{@code layout_minHeight}</li>
+ * <li>{@code layout_maxWidth}</li>
+ * <li>{@code layout_maxHeight}</li>
+ * <li>{@code layout_wrapBefore}</li>
+ * </ul>
+ */
+public class FlexboxLayout extends ViewGroup implements FlexContainer {
+
+    /**
+     * The current value of the {@link FlexDirection}, the default value is {@link
+     * FlexDirection#ROW}.
+     *
+     * @see FlexDirection
+     */
+    private int mFlexDirection;
+
+    /**
+     * The current value of the {@link FlexWrap}, the default value is {@link FlexWrap#NOWRAP}.
+     *
+     * @see FlexWrap
+     */
+    private int mFlexWrap;
+
+    /**
+     * The current value of the {@link JustifyContent}, the default value is
+     * {@link JustifyContent#FLEX_START}.
+     *
+     * @see JustifyContent
+     */
+    private int mJustifyContent;
+
+    /**
+     * The current value of the {@link AlignItems}, the default value is
+     * {@link AlignItems#FLEX_START}.
+     *
+     * @see AlignItems
+     */
+    private int mAlignItems;
+
+    /**
+     * The current value of the {@link AlignContent}, the default value is
+     * {@link AlignContent#FLEX_START}.
+     *
+     * @see AlignContent
+     */
+    private int mAlignContent;
+
+    /**
+     * The current value of the maxLine attribute, which specifies the maximum number of flex lines.
+     */
+    private int mMaxLine = NOT_SET;
+
+    /**
+     * The int definition to be used as the arguments for the {@link #setShowDivider(int)},
+     * {@link #setShowDividerHorizontal(int)} or {@link #setShowDividerVertical(int)}.
+     * One or more of the values (such as
+     * {@link #SHOW_DIVIDER_BEGINNING} | {@link #SHOW_DIVIDER_MIDDLE}) can be passed to those set
+     * methods.
+     */
+    @IntDef(flag = true,
+            value = {
+                    SHOW_DIVIDER_NONE,
+                    SHOW_DIVIDER_BEGINNING,
+                    SHOW_DIVIDER_MIDDLE,
+                    SHOW_DIVIDER_END
+            })
+    @Retention(RetentionPolicy.SOURCE)
+    @SuppressWarnings("WeakerAccess")
+    public @interface DividerMode {
+
+    }
+
+    /** Constant to show no dividers */
+    public static final int SHOW_DIVIDER_NONE = 0;
+
+    /** Constant to show a divider at the beginning of the flex lines (or flex items). */
+    public static final int SHOW_DIVIDER_BEGINNING = 1;
+
+    /** Constant to show dividers between flex lines or flex items. */
+    public static final int SHOW_DIVIDER_MIDDLE = 1 << 1;
+
+    /** Constant to show a divider at the end of the flex lines or flex items. */
+    public static final int SHOW_DIVIDER_END = 1 << 2;
+
+    /** The drawable to be drawn for the horizontal dividers. */
+    @Nullable
+    private Drawable mDividerDrawableHorizontal;
+
+    /** The drawable to be drawn for the vertical dividers. */
+    @Nullable
+    private Drawable mDividerDrawableVertical;
+
+    /**
+     * Indicates the divider mode for the {@link #mDividerDrawableHorizontal}. The value needs to
+     * be the combination of the value of {@link #SHOW_DIVIDER_NONE},
+     * {@link #SHOW_DIVIDER_BEGINNING}, {@link #SHOW_DIVIDER_MIDDLE} and {@link #SHOW_DIVIDER_END}
+     */
+    private int mShowDividerHorizontal;
+
+    /**
+     * Indicates the divider mode for the {@link #mDividerDrawableVertical}. The value needs to
+     * be the combination of the value of {@link #SHOW_DIVIDER_NONE},
+     * {@link #SHOW_DIVIDER_BEGINNING}, {@link #SHOW_DIVIDER_MIDDLE} and {@link #SHOW_DIVIDER_END}
+     */
+    private int mShowDividerVertical;
+
+    /** The height of the {@link #mDividerDrawableHorizontal}. */
+    private int mDividerHorizontalHeight;
+
+    /** The width of the {@link #mDividerDrawableVertical}. */
+    private int mDividerVerticalWidth;
+
+    /**
+     * Holds reordered indices, which {@link FlexItem#getOrder()} parameters are taken
+     * into account
+     */
+    private int[] mReorderedIndices;
+
+    /**
+     * Caches the {@link FlexItem#getOrder()} attributes for children views.
+     * Key: the index of the view reordered indices using the {@link FlexItem#getOrder()}
+     * isn't taken into account)
+     * Value: the value for the order attribute
+     */
+    private SparseIntArray mOrderCache;
+
+    private FlexboxHelper mFlexboxHelper = new FlexboxHelper(this);
+
+    private List<FlexLine> mFlexLines = new ArrayList<>();
+
+    /**
+     * Used for receiving the calculation of the flex results to avoid creating a new instance
+     * every time flex lines are calculated.
+     */
+    private FlexboxHelper.FlexLinesResult mFlexLinesResult = new FlexboxHelper.FlexLinesResult();
+
+    public FlexboxLayout(Context context) {
+        this(context, null);
+    }
+
+    public FlexboxLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public FlexboxLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        TypedArray a = context.obtainStyledAttributes(
+                attrs, R.styleable.FlexboxLayout, defStyleAttr, 0);
+        mFlexDirection = a
+                .getInt(R.styleable.FlexboxLayout_flexDirection, FlexDirection.ROW);
+        mFlexWrap = a.getInt(R.styleable.FlexboxLayout_flexWrap, FlexWrap.NOWRAP);
+        mJustifyContent = a
+                .getInt(R.styleable.FlexboxLayout_justifyContent, JustifyContent.FLEX_START);
+        mAlignItems = a.getInt(R.styleable.FlexboxLayout_alignItems, AlignItems.FLEX_START);
+        mAlignContent = a.getInt(R.styleable.FlexboxLayout_alignContent, AlignContent.FLEX_START);
+        mMaxLine = a.getInt(R.styleable.FlexboxLayout_maxLine, NOT_SET);
+        Drawable drawable = a.getDrawable(R.styleable.FlexboxLayout_dividerDrawable);
+        if (drawable != null) {
+            setDividerDrawableHorizontal(drawable);
+            setDividerDrawableVertical(drawable);
+        }
+        Drawable drawableHorizontal = a
+                .getDrawable(R.styleable.FlexboxLayout_dividerDrawableHorizontal);
+        if (drawableHorizontal != null) {
+            setDividerDrawableHorizontal(drawableHorizontal);
+        }
+        Drawable drawableVertical = a
+                .getDrawable(R.styleable.FlexboxLayout_dividerDrawableVertical);
+        if (drawableVertical != null) {
+            setDividerDrawableVertical(drawableVertical);
+        }
+        int dividerMode = a.getInt(R.styleable.FlexboxLayout_showDivider, SHOW_DIVIDER_NONE);
+        if (dividerMode != SHOW_DIVIDER_NONE) {
+            mShowDividerVertical = dividerMode;
+            mShowDividerHorizontal = dividerMode;
+        }
+        int dividerModeVertical = a
+                .getInt(R.styleable.FlexboxLayout_showDividerVertical, SHOW_DIVIDER_NONE);
+        if (dividerModeVertical != SHOW_DIVIDER_NONE) {
+            mShowDividerVertical = dividerModeVertical;
+        }
+        int dividerModeHorizontal = a
+                .getInt(R.styleable.FlexboxLayout_showDividerHorizontal, SHOW_DIVIDER_NONE);
+        if (dividerModeHorizontal != SHOW_DIVIDER_NONE) {
+            mShowDividerHorizontal = dividerModeHorizontal;
+        }
+        a.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (mOrderCache == null) {
+            mOrderCache = new SparseIntArray(getChildCount());
+        }
+        if (mFlexboxHelper.isOrderChangedFromLastMeasurement(mOrderCache)) {
+            mReorderedIndices = mFlexboxHelper.createReorderedIndices(mOrderCache);
+        }
+
+        // TODO: Only calculate the children views which are affected from the last measure.
+
+        switch (mFlexDirection) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                measureHorizontal(widthMeasureSpec, heightMeasureSpec);
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                measureVertical(widthMeasureSpec, heightMeasureSpec);
+                break;
+            default:
+                throw new IllegalStateException(
+                        "Invalid value for the flex direction is set: " + mFlexDirection);
+        }
+    }
+
+    @Override
+    public int getFlexItemCount() {
+        return getChildCount();
+    }
+
+    @Override
+    public View getFlexItemAt(int index) {
+        return getChildAt(index);
+    }
+
+    /**
+     * Returns a View, which is reordered by taking {@link LayoutParams#mOrder} parameters
+     * into account.
+     *
+     * @param index the index of the view
+     * @return the reordered view, which {@link LayoutParams@order} is taken into account.
+     * If the index is negative or out of bounds of the number of contained views,
+     * returns {@code null}.
+     */
+    public View getReorderedChildAt(int index) {
+        if (index < 0 || index >= mReorderedIndices.length) {
+            return null;
+        }
+        return getChildAt(mReorderedIndices[index]);
+    }
+
+    @Override
+    public View getReorderedFlexItemAt(int index) {
+        return getReorderedChildAt(index);
+    }
+
+    @Override
+    public void addView(View child, int index, ViewGroup.LayoutParams params) {
+        if (mOrderCache == null) {
+            mOrderCache = new SparseIntArray(getChildCount());
+        }
+        // Create an array for the reordered indices before the View is added in the parent
+        // ViewGroup since otherwise reordered indices won't be in effect before the
+        // FlexboxLayout's onMeasure is called.
+        // Because requestLayout is requested in the super.addView method.
+        mReorderedIndices = mFlexboxHelper
+                .createReorderedIndices(child, index, params, mOrderCache);
+        super.addView(child, index, params);
+    }
+
+    /**
+     * Sub method for {@link #onMeasure(int, int)}, when the main axis direction is horizontal
+     * (either left to right or right to left).
+     *
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @see #onMeasure(int, int)
+     * @see #setFlexDirection(int)
+     * @see #setFlexWrap(int)
+     * @see #setAlignItems(int)
+     * @see #setAlignContent(int)
+     */
+    private void measureHorizontal(int widthMeasureSpec, int heightMeasureSpec) {
+        mFlexLines.clear();
+
+        mFlexLinesResult.reset();
+        mFlexboxHelper
+                .calculateHorizontalFlexLines(mFlexLinesResult, widthMeasureSpec,
+                        heightMeasureSpec);
+        mFlexLines = mFlexLinesResult.mFlexLines;
+
+        mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec);
+
+        // TODO: Consider the case any individual child's mAlignSelf is set to ALIGN_SELF_BASELINE
+        if (mAlignItems == AlignItems.BASELINE) {
+            for (FlexLine flexLine : mFlexLines) {
+                // The largest height value that also take the baseline shift into account
+                int largestHeightInLine = Integer.MIN_VALUE;
+                for (int i = 0; i < flexLine.mItemCount; i++) {
+                    int viewIndex = flexLine.mFirstIndex + i;
+                    View child = getReorderedChildAt(viewIndex);
+                    if (child == null || child.getVisibility() == View.GONE) {
+                        continue;
+                    }
+                    LayoutParams lp = (LayoutParams) child.getLayoutParams();
+                    if (mFlexWrap != FlexWrap.WRAP_REVERSE) {
+                        int marginTop = flexLine.mMaxBaseline - child.getBaseline();
+                        marginTop = Math.max(marginTop, lp.topMargin);
+                        largestHeightInLine = Math.max(largestHeightInLine,
+                                child.getMeasuredHeight() + marginTop + lp.bottomMargin);
+                    } else {
+                        int marginBottom = flexLine.mMaxBaseline - child.getMeasuredHeight() +
+                                child.getBaseline();
+                        marginBottom = Math.max(marginBottom, lp.bottomMargin);
+                        largestHeightInLine = Math.max(largestHeightInLine,
+                                child.getMeasuredHeight() + lp.topMargin + marginBottom);
+                    }
+                }
+                flexLine.mCrossSize = largestHeightInLine;
+            }
+        }
+
+        mFlexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec,
+                getPaddingTop() + getPaddingBottom());
+        // Now cross size for each flex line is determined.
+        // Expand the views if alignItems (or mAlignSelf in each child view) is set to stretch
+        mFlexboxHelper.stretchViews();
+        setMeasuredDimensionForFlex(mFlexDirection, widthMeasureSpec, heightMeasureSpec,
+                mFlexLinesResult.mChildState);
+    }
+
+    /**
+     * Sub method for {@link #onMeasure(int, int)} when the main axis direction is vertical
+     * (either from top to bottom or bottom to top).
+     *
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @see #onMeasure(int, int)
+     * @see #setFlexDirection(int)
+     * @see #setFlexWrap(int)
+     * @see #setAlignItems(int)
+     * @see #setAlignContent(int)
+     */
+    private void measureVertical(int widthMeasureSpec, int heightMeasureSpec) {
+        mFlexLines.clear();
+        mFlexLinesResult.reset();
+        mFlexboxHelper.calculateVerticalFlexLines(mFlexLinesResult, widthMeasureSpec,
+                heightMeasureSpec);
+        mFlexLines = mFlexLinesResult.mFlexLines;
+
+        mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec);
+        mFlexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec,
+                getPaddingLeft() + getPaddingRight());
+        // Now cross size for each flex line is determined.
+        // Expand the views if alignItems (or mAlignSelf in each child view) is set to stretch
+        mFlexboxHelper.stretchViews();
+        setMeasuredDimensionForFlex(mFlexDirection, widthMeasureSpec, heightMeasureSpec,
+                mFlexLinesResult.mChildState);
+    }
+
+    /**
+     * Set this FlexboxLayouts' width and height depending on the calculated size of main axis and
+     * cross axis.
+     *
+     * @param flexDirection     the value of the flex direction
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @param childState        the child state of the View
+     * @see #getFlexDirection()
+     * @see #setFlexDirection(int)
+     */
+    private void setMeasuredDimensionForFlex(@FlexDirection int flexDirection, int widthMeasureSpec,
+            int heightMeasureSpec, int childState) {
+        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+        int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+        int calculatedMaxHeight;
+        int calculatedMaxWidth;
+        switch (flexDirection) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                calculatedMaxHeight = getSumOfCrossSize() + getPaddingTop()
+                        + getPaddingBottom();
+                calculatedMaxWidth = getLargestMainSize();
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                calculatedMaxHeight = getLargestMainSize();
+                calculatedMaxWidth = getSumOfCrossSize() + getPaddingLeft() + getPaddingRight();
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid flex direction: " + flexDirection);
+        }
+
+        int widthSizeAndState;
+        switch (widthMode) {
+            case MeasureSpec.EXACTLY:
+                if (widthSize < calculatedMaxWidth) {
+                    childState = View
+                            .combineMeasuredStates(childState, View.MEASURED_STATE_TOO_SMALL);
+                }
+                widthSizeAndState = View.resolveSizeAndState(widthSize, widthMeasureSpec,
+                        childState);
+                break;
+            case MeasureSpec.AT_MOST: {
+                if (widthSize < calculatedMaxWidth) {
+                    childState = View
+                            .combineMeasuredStates(childState, View.MEASURED_STATE_TOO_SMALL);
+                } else {
+                    widthSize = calculatedMaxWidth;
+                }
+                widthSizeAndState = View.resolveSizeAndState(widthSize, widthMeasureSpec,
+                        childState);
+                break;
+            }
+            case MeasureSpec.UNSPECIFIED: {
+                widthSizeAndState = View
+                        .resolveSizeAndState(calculatedMaxWidth, widthMeasureSpec, childState);
+                break;
+            }
+            default:
+                throw new IllegalStateException("Unknown width mode is set: " + widthMode);
+        }
+        int heightSizeAndState;
+        switch (heightMode) {
+            case MeasureSpec.EXACTLY:
+                if (heightSize < calculatedMaxHeight) {
+                    childState = View.combineMeasuredStates(childState,
+                            View.MEASURED_STATE_TOO_SMALL
+                                    >> View.MEASURED_HEIGHT_STATE_SHIFT);
+                }
+                heightSizeAndState = View.resolveSizeAndState(heightSize, heightMeasureSpec,
+                        childState);
+                break;
+            case MeasureSpec.AT_MOST: {
+                if (heightSize < calculatedMaxHeight) {
+                    childState = View.combineMeasuredStates(childState,
+                            View.MEASURED_STATE_TOO_SMALL
+                                    >> View.MEASURED_HEIGHT_STATE_SHIFT);
+                } else {
+                    heightSize = calculatedMaxHeight;
+                }
+                heightSizeAndState = View.resolveSizeAndState(heightSize, heightMeasureSpec,
+                        childState);
+                break;
+            }
+            case MeasureSpec.UNSPECIFIED: {
+                heightSizeAndState = View.resolveSizeAndState(calculatedMaxHeight,
+                        heightMeasureSpec, childState);
+                break;
+            }
+            default:
+                throw new IllegalStateException("Unknown height mode is set: " + heightMode);
+        }
+        setMeasuredDimension(widthSizeAndState, heightSizeAndState);
+    }
+
+    @Override
+    public int getLargestMainSize() {
+        int largestSize = Integer.MIN_VALUE;
+        for (FlexLine flexLine : mFlexLines) {
+            largestSize = Math.max(largestSize, flexLine.mMainSize);
+        }
+        return largestSize;
+    }
+
+    @Override
+    public int getSumOfCrossSize() {
+        int sum = 0;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+
+            // Judge if the beginning or middle dividers are required
+            if (hasDividerBeforeFlexLine(i)) {
+                if (isMainAxisDirectionHorizontal()) {
+                    sum += mDividerHorizontalHeight;
+                } else {
+                    sum += mDividerVerticalWidth;
+                }
+            }
+
+            // Judge if the end divider is required
+            if (hasEndDividerAfterFlexLine(i)) {
+                if (isMainAxisDirectionHorizontal()) {
+                    sum += mDividerHorizontalHeight;
+                } else {
+                    sum += mDividerVerticalWidth;
+                }
+            }
+            sum += flexLine.mCrossSize;
+        }
+        return sum;
+    }
+
+    @Override
+    public boolean isMainAxisDirectionHorizontal() {
+        return mFlexDirection == FlexDirection.ROW || mFlexDirection == FlexDirection.ROW_REVERSE;
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        int layoutDirection = ViewCompat.getLayoutDirection(this);
+        boolean isRtl;
+        switch (mFlexDirection) {
+            case FlexDirection.ROW:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                layoutHorizontal(isRtl, left, top, right, bottom);
+                break;
+            case FlexDirection.ROW_REVERSE:
+                isRtl = layoutDirection != ViewCompat.LAYOUT_DIRECTION_RTL;
+                layoutHorizontal(isRtl, left, top, right, bottom);
+                break;
+            case FlexDirection.COLUMN:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                layoutVertical(isRtl, false, left, top, right, bottom);
+                break;
+            case FlexDirection.COLUMN_REVERSE:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                layoutVertical(isRtl, true, left, top, right, bottom);
+                break;
+            default:
+                throw new IllegalStateException("Invalid flex direction is set: " + mFlexDirection);
+        }
+    }
+
+    /**
+     * Sub method for {@link #onLayout(boolean, int, int, int, int)} when the
+     * {@link #mFlexDirection} is either {@link FlexDirection#ROW} or
+     * {@link FlexDirection#ROW_REVERSE}.
+     *
+     * @param isRtl  {@code true} if the horizontal layout direction is right to left, {@code
+     *               false} otherwise.
+     * @param left   the left position of this View
+     * @param top    the top position of this View
+     * @param right  the right position of this View
+     * @param bottom the bottom position of this View
+     * @see #getFlexWrap()
+     * @see #setFlexWrap(int)
+     * @see #getJustifyContent()
+     * @see #setJustifyContent(int)
+     * @see #getAlignItems()
+     * @see #setAlignItems(int)
+     * @see LayoutParams#mAlignSelf
+     */
+    private void layoutHorizontal(boolean isRtl, int left, int top, int right, int bottom) {
+        int paddingLeft = getPaddingLeft();
+        int paddingRight = getPaddingRight();
+        // Use float to reduce the round error that may happen in when justifyContent ==
+        // SPACE_BETWEEN or SPACE_AROUND
+        float childLeft;
+
+        int height = bottom - top;
+        int width = right - left;
+        // childBottom is used if the mFlexWrap is WRAP_REVERSE otherwise
+        // childTop is used to align the vertical position of the children views.
+        int childBottom = height - getPaddingBottom();
+        int childTop = getPaddingTop();
+
+        // Used only for RTL layout
+        // Use float to reduce the round error that may happen in when justifyContent ==
+        // SPACE_BETWEEN or SPACE_AROUND
+        float childRight;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            if (hasDividerBeforeFlexLine(i)) {
+                childBottom -= mDividerHorizontalHeight;
+                childTop += mDividerHorizontalHeight;
+            }
+            float spaceBetweenItem = 0f;
+            switch (mJustifyContent) {
+                case JustifyContent.FLEX_START:
+                    childLeft = paddingLeft;
+                    childRight = width - paddingRight;
+                    break;
+                case JustifyContent.FLEX_END:
+                    childLeft = width - flexLine.mMainSize + paddingRight;
+                    childRight = flexLine.mMainSize - paddingLeft;
+                    break;
+                case JustifyContent.CENTER:
+                    childLeft = paddingLeft + (width - flexLine.mMainSize) / 2f;
+                    childRight = width - paddingRight - (width - flexLine.mMainSize) / 2f;
+                    break;
+                case JustifyContent.SPACE_AROUND: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (width - flexLine.mMainSize)
+                                / (float) visibleCount;
+                    }
+                    childLeft = paddingLeft + spaceBetweenItem / 2f;
+                    childRight = width - paddingRight - spaceBetweenItem / 2f;
+                    break;
+                }
+                case JustifyContent.SPACE_BETWEEN: {
+                    childLeft = paddingLeft;
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    float denominator = visibleCount != 1 ? visibleCount - 1 : 1f;
+                    spaceBetweenItem = (width - flexLine.mMainSize) / denominator;
+                    childRight = width - paddingRight;
+                    break;
+                }
+                case JustifyContent.SPACE_EVENLY: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (width - flexLine.mMainSize)
+                                / (float) (visibleCount + 1);
+                    }
+                    childLeft = paddingLeft + spaceBetweenItem;
+                    childRight = width - paddingRight - spaceBetweenItem;
+                    break;
+                }
+                default:
+                    throw new IllegalStateException(
+                            "Invalid justifyContent is set: " + mJustifyContent);
+            }
+            spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int index = flexLine.mFirstIndex + j;
+                View child = getReorderedChildAt(index);
+                if (child == null || child.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = ((LayoutParams) child.getLayoutParams());
+                childLeft += lp.leftMargin;
+                childRight -= lp.rightMargin;
+                int beforeDividerLength = 0;
+                int endDividerLength = 0;
+                if (hasDividerBeforeChildAtAlongMainAxis(index, j)) {
+                    beforeDividerLength = mDividerVerticalWidth;
+                    childLeft += beforeDividerLength;
+                    childRight -= beforeDividerLength;
+                }
+                if (j == flexLine.mItemCount - 1 && (mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                    endDividerLength = mDividerVerticalWidth;
+                }
+
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    if (isRtl) {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childRight) - child.getMeasuredWidth(),
+                                childBottom - child.getMeasuredHeight(), Math.round(childRight),
+                                childBottom);
+                    } else {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childLeft), childBottom - child.getMeasuredHeight(),
+                                Math.round(childLeft) + child.getMeasuredWidth(), childBottom);
+                    }
+                } else {
+                    if (isRtl) {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childRight) - child.getMeasuredWidth(),
+                                childTop, Math.round(childRight),
+                                childTop + child.getMeasuredHeight());
+                    } else {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childLeft), childTop,
+                                Math.round(childLeft) + child.getMeasuredWidth(),
+                                childTop + child.getMeasuredHeight());
+                    }
+                }
+                childLeft += child.getMeasuredWidth() + spaceBetweenItem + lp.rightMargin;
+                childRight -= child.getMeasuredWidth() + spaceBetweenItem + lp.leftMargin;
+
+                if (isRtl) {
+                    flexLine.updatePositionFromView(child, /*leftDecoration*/endDividerLength, 0,
+                            /*rightDecoration*/ beforeDividerLength, 0);
+                } else {
+                    flexLine.updatePositionFromView(child, /*leftDecoration*/beforeDividerLength, 0,
+                            /*rightDecoration*/ endDividerLength, 0);
+                }
+            }
+            childTop += flexLine.mCrossSize;
+            childBottom -= flexLine.mCrossSize;
+        }
+    }
+
+    /**
+     * Sub method for {@link #onLayout(boolean, int, int, int, int)} when the
+     * {@link #mFlexDirection} is either {@link FlexDirection#COLUMN} or
+     * {@link FlexDirection#COLUMN_REVERSE}.
+     *
+     * @param isRtl           {@code true} if the horizontal layout direction is right to left,
+     *                        {@code false}
+     *                        otherwise
+     * @param fromBottomToTop {@code true} if the layout direction is bottom to top, {@code false}
+     *                        otherwise
+     * @param left            the left position of this View
+     * @param top             the top position of this View
+     * @param right           the right position of this View
+     * @param bottom          the bottom position of this View
+     * @see #getFlexWrap()
+     * @see #setFlexWrap(int)
+     * @see #getJustifyContent()
+     * @see #setJustifyContent(int)
+     * @see #getAlignItems()
+     * @see #setAlignItems(int)
+     * @see LayoutParams#mAlignSelf
+     */
+    private void layoutVertical(boolean isRtl, boolean fromBottomToTop, int left, int top,
+            int right, int bottom) {
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+
+        int paddingRight = getPaddingRight();
+        int childLeft = getPaddingLeft();
+
+        int width = right - left;
+        int height = bottom - top;
+        // childRight is used if the mFlexWrap is WRAP_REVERSE otherwise
+        // childLeft is used to align the horizontal position of the children views.
+        int childRight = width - paddingRight;
+
+        // Use float to reduce the round error that may happen in when justifyContent ==
+        // SPACE_BETWEEN or SPACE_AROUND
+        float childTop;
+
+        // Used only for if the direction is from bottom to top
+        float childBottom;
+
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            if (hasDividerBeforeFlexLine(i)) {
+                childLeft += mDividerVerticalWidth;
+                childRight -= mDividerVerticalWidth;
+            }
+            float spaceBetweenItem = 0f;
+            switch (mJustifyContent) {
+                case JustifyContent.FLEX_START:
+                    childTop = paddingTop;
+                    childBottom = height - paddingBottom;
+                    break;
+                case JustifyContent.FLEX_END:
+                    childTop = height - flexLine.mMainSize + paddingBottom;
+                    childBottom = flexLine.mMainSize - paddingTop;
+                    break;
+                case JustifyContent.CENTER:
+                    childTop = paddingTop + (height - flexLine.mMainSize) / 2f;
+                    childBottom = height - paddingBottom - (height - flexLine.mMainSize) / 2f;
+                    break;
+                case JustifyContent.SPACE_AROUND: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (height - flexLine.mMainSize)
+                                / (float) visibleCount;
+                    }
+                    childTop = paddingTop + spaceBetweenItem / 2f;
+                    childBottom = height - paddingBottom - spaceBetweenItem / 2f;
+                    break;
+                }
+                case JustifyContent.SPACE_BETWEEN: {
+                    childTop = paddingTop;
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    float denominator = visibleCount != 1 ? visibleCount - 1 : 1f;
+                    spaceBetweenItem = (height - flexLine.mMainSize) / denominator;
+                    childBottom = height - paddingBottom;
+                    break;
+                }
+                case JustifyContent.SPACE_EVENLY: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (height - flexLine.mMainSize)
+                                / (float) (visibleCount + 1);
+                    }
+                    childTop = paddingTop + spaceBetweenItem;
+                    childBottom = height - paddingBottom - spaceBetweenItem;
+                    break;
+                }
+                default:
+                    throw new IllegalStateException(
+                            "Invalid justifyContent is set: " + mJustifyContent);
+            }
+            spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int index = flexLine.mFirstIndex + j;
+                View child = getReorderedChildAt(index);
+                if (child == null || child.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = ((LayoutParams) child.getLayoutParams());
+                childTop += lp.topMargin;
+                childBottom -= lp.bottomMargin;
+                int beforeDividerLength = 0;
+                int endDividerLength = 0;
+                if (hasDividerBeforeChildAtAlongMainAxis(index, j)) {
+                    beforeDividerLength = mDividerHorizontalHeight;
+                    childTop += beforeDividerLength;
+                    childBottom -= beforeDividerLength;
+                }
+                if (j == flexLine.mItemCount - 1
+                        && (mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                    endDividerLength = mDividerHorizontalHeight;
+                }
+                if (isRtl) {
+                    if (fromBottomToTop) {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, true,
+                                childRight - child.getMeasuredWidth(),
+                                Math.round(childBottom) - child.getMeasuredHeight(), childRight,
+                                Math.round(childBottom));
+                    } else {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, true,
+                                childRight - child.getMeasuredWidth(), Math.round(childTop),
+                                childRight, Math.round(childTop) + child.getMeasuredHeight());
+                    }
+                } else {
+                    if (fromBottomToTop) {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, false,
+                                childLeft, Math.round(childBottom) - child.getMeasuredHeight(),
+                                childLeft + child.getMeasuredWidth(), Math.round(childBottom));
+                    } else {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, false,
+                                childLeft, Math.round(childTop),
+                                childLeft + child.getMeasuredWidth(),
+                                Math.round(childTop) + child.getMeasuredHeight());
+                    }
+                }
+                childTop += child.getMeasuredHeight() + spaceBetweenItem + lp.bottomMargin;
+                childBottom -= child.getMeasuredHeight() + spaceBetweenItem + lp.topMargin;
+
+                if (fromBottomToTop) {
+                    flexLine.updatePositionFromView(child, 0, /*topDecoration*/endDividerLength, 0,
+                            /*bottomDecoration*/ beforeDividerLength);
+                } else {
+                    flexLine.updatePositionFromView(child, 0, /*topDecoration*/beforeDividerLength,
+                            0, /*bottomDecoration*/endDividerLength);
+                }
+            }
+            childLeft += flexLine.mCrossSize;
+            childRight -= flexLine.mCrossSize;
+        }
+    }
+
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (mDividerDrawableVertical == null && mDividerDrawableHorizontal == null) {
+            return;
+        }
+        if (mShowDividerHorizontal == SHOW_DIVIDER_NONE
+                && mShowDividerVertical == SHOW_DIVIDER_NONE) {
+            return;
+        }
+
+        int layoutDirection = ViewCompat.getLayoutDirection(this);
+        boolean isRtl;
+        boolean fromBottomToTop = false;
+        switch (mFlexDirection) {
+            case FlexDirection.ROW:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    fromBottomToTop = true;
+                }
+                drawDividersHorizontal(canvas, isRtl, fromBottomToTop);
+                break;
+            case FlexDirection.ROW_REVERSE:
+                isRtl = layoutDirection != ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    fromBottomToTop = true;
+                }
+                drawDividersHorizontal(canvas, isRtl, fromBottomToTop);
+                break;
+            case FlexDirection.COLUMN:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                drawDividersVertical(canvas, isRtl, false);
+                break;
+            case FlexDirection.COLUMN_REVERSE:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                drawDividersVertical(canvas, isRtl, true);
+                break;
+        }
+    }
+
+    /**
+     * Sub method for {@link #onDraw(Canvas)} when the main axis direction is horizontal
+     * ({@link #mFlexDirection} is either of {@link FlexDirection#ROW} or
+     * {@link FlexDirection#ROW_REVERSE}.
+     *
+     * @param canvas          the canvas on which the background will be drawn
+     * @param isRtl           {@code true} when the horizontal layout direction is right to left,
+     *                        {@code false} otherwise
+     * @param fromBottomToTop {@code true} when the vertical layout direction is bottom to top,
+     *                        {@code false} otherwise
+     */
+    private void drawDividersHorizontal(Canvas canvas, boolean isRtl, boolean fromBottomToTop) {
+        int paddingLeft = getPaddingLeft();
+        int paddingRight = getPaddingRight();
+        int horizontalDividerLength = Math.max(0, getWidth() - paddingRight - paddingLeft);
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int viewIndex = flexLine.mFirstIndex + j;
+                View view = getReorderedChildAt(viewIndex);
+                if (view == null || view.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = (LayoutParams) view.getLayoutParams();
+
+                // Judge if the beginning or middle divider is needed
+                if (hasDividerBeforeChildAtAlongMainAxis(viewIndex, j)) {
+                    int dividerLeft;
+                    if (isRtl) {
+                        dividerLeft = view.getRight() + lp.rightMargin;
+                    } else {
+                        dividerLeft = view.getLeft() - lp.leftMargin - mDividerVerticalWidth;
+                    }
+
+                    drawVerticalDivider(canvas, dividerLeft, flexLine.mTop, flexLine.mCrossSize);
+                }
+
+                // Judge if the end divider is needed
+                if (j == flexLine.mItemCount - 1) {
+                    if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                        int dividerLeft;
+                        if (isRtl) {
+                            dividerLeft = view.getLeft() - lp.leftMargin - mDividerVerticalWidth;
+                        } else {
+                            dividerLeft = view.getRight() + lp.rightMargin;
+                        }
+
+                        drawVerticalDivider(canvas, dividerLeft, flexLine.mTop,
+                                flexLine.mCrossSize);
+                    }
+                }
+            }
+
+            // Judge if the beginning or middle dividers are needed before the flex line
+            if (hasDividerBeforeFlexLine(i)) {
+                int horizontalDividerTop;
+                if (fromBottomToTop) {
+                    horizontalDividerTop = flexLine.mBottom;
+                } else {
+                    horizontalDividerTop = flexLine.mTop - mDividerHorizontalHeight;
+                }
+                drawHorizontalDivider(canvas, paddingLeft, horizontalDividerTop,
+                        horizontalDividerLength);
+            }
+            // Judge if the end divider is needed before the flex line
+            if (hasEndDividerAfterFlexLine(i)) {
+                if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                    int horizontalDividerTop;
+                    if (fromBottomToTop) {
+                        horizontalDividerTop = flexLine.mTop - mDividerHorizontalHeight;
+                    } else {
+                        horizontalDividerTop = flexLine.mBottom;
+                    }
+                    drawHorizontalDivider(canvas, paddingLeft, horizontalDividerTop,
+                            horizontalDividerLength);
+                }
+            }
+        }
+    }
+
+    /**
+     * Sub method for {@link #onDraw(Canvas)} when the main axis direction is vertical
+     * ({@link #mFlexDirection} is either of {@link FlexDirection#COLUMN} or
+     * {@link FlexDirection#COLUMN_REVERSE}.
+     *
+     * @param canvas          the canvas on which the background will be drawn
+     * @param isRtl           {@code true} when the horizontal layout direction is right to left,
+     *                        {@code false} otherwise
+     * @param fromBottomToTop {@code true} when the vertical layout direction is bottom to top,
+     *                        {@code false} otherwise
+     */
+    private void drawDividersVertical(Canvas canvas, boolean isRtl, boolean fromBottomToTop) {
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+        int verticalDividerLength = Math.max(0, getHeight() - paddingBottom - paddingTop);
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+
+            // Draw horizontal dividers if needed
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int viewIndex = flexLine.mFirstIndex + j;
+                View view = getReorderedChildAt(viewIndex);
+                if (view == null || view.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = (LayoutParams) view.getLayoutParams();
+
+                // Judge if the beginning or middle divider is needed
+                if (hasDividerBeforeChildAtAlongMainAxis(viewIndex, j)) {
+                    int dividerTop;
+                    if (fromBottomToTop) {
+                        dividerTop = view.getBottom() + lp.bottomMargin;
+                    } else {
+                        dividerTop = view.getTop() - lp.topMargin - mDividerHorizontalHeight;
+                    }
+
+                    drawHorizontalDivider(canvas, flexLine.mLeft, dividerTop, flexLine.mCrossSize);
+                }
+
+                // Judge if the end divider is needed
+                if (j == flexLine.mItemCount - 1) {
+                    if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                        int dividerTop;
+                        if (fromBottomToTop) {
+                            dividerTop = view.getTop() - lp.topMargin - mDividerHorizontalHeight;
+                        } else {
+                            dividerTop = view.getBottom() + lp.bottomMargin;
+                        }
+
+                        drawHorizontalDivider(canvas, flexLine.mLeft, dividerTop,
+                                flexLine.mCrossSize);
+                    }
+                }
+            }
+
+            // Judge if the beginning or middle dividers are needed before the flex line
+            if (hasDividerBeforeFlexLine(i)) {
+                int verticalDividerLeft;
+                if (isRtl) {
+                    verticalDividerLeft = flexLine.mRight;
+                } else {
+                    verticalDividerLeft = flexLine.mLeft - mDividerVerticalWidth;
+                }
+                drawVerticalDivider(canvas, verticalDividerLeft, paddingTop,
+                        verticalDividerLength);
+            }
+            if (hasEndDividerAfterFlexLine(i)) {
+                if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                    int verticalDividerLeft;
+                    if (isRtl) {
+                        verticalDividerLeft = flexLine.mLeft - mDividerVerticalWidth;
+                    } else {
+                        verticalDividerLeft = flexLine.mRight;
+                    }
+                    drawVerticalDivider(canvas, verticalDividerLeft, paddingTop,
+                            verticalDividerLength);
+                }
+            }
+        }
+    }
+
+    private void drawVerticalDivider(Canvas canvas, int left, int top, int length) {
+        if (mDividerDrawableVertical == null) {
+            return;
+        }
+        mDividerDrawableVertical.setBounds(left, top, left + mDividerVerticalWidth, top + length);
+        mDividerDrawableVertical.draw(canvas);
+    }
+
+    private void drawHorizontalDivider(Canvas canvas, int left, int top, int length) {
+        if (mDividerDrawableHorizontal == null) {
+            return;
+        }
+        mDividerDrawableHorizontal
+                .setBounds(left, top, left + length, top + mDividerHorizontalHeight);
+        mDividerDrawableHorizontal.draw(canvas);
+    }
+
+    @Override
+    protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+        return p instanceof FlexboxLayout.LayoutParams;
+    }
+
+    @Override
+    public LayoutParams generateLayoutParams(AttributeSet attrs) {
+        return new FlexboxLayout.LayoutParams(getContext(), attrs);
+    }
+
+    @Override
+    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {
+        if (lp instanceof FlexboxLayout.LayoutParams) {
+            return new FlexboxLayout.LayoutParams((FlexboxLayout.LayoutParams) lp);
+        } else if (lp instanceof MarginLayoutParams) {
+            return new FlexboxLayout.LayoutParams((MarginLayoutParams) lp);
+        }
+        return new LayoutParams(lp);
+    }
+
+    @FlexDirection
+    @Override
+    public int getFlexDirection() {
+        return mFlexDirection;
+    }
+
+    @Override
+    public void setFlexDirection(@FlexDirection int flexDirection) {
+        if (mFlexDirection != flexDirection) {
+            mFlexDirection = flexDirection;
+            requestLayout();
+        }
+    }
+
+    @FlexWrap
+    @Override
+    public int getFlexWrap() {
+        return mFlexWrap;
+    }
+
+    @Override
+    public void setFlexWrap(@FlexWrap int flexWrap) {
+        if (mFlexWrap != flexWrap) {
+            mFlexWrap = flexWrap;
+            requestLayout();
+        }
+    }
+
+    @JustifyContent
+    @Override
+    public int getJustifyContent() {
+        return mJustifyContent;
+    }
+
+    @Override
+    public void setJustifyContent(@JustifyContent int justifyContent) {
+        if (mJustifyContent != justifyContent) {
+            mJustifyContent = justifyContent;
+            requestLayout();
+        }
+    }
+
+    @AlignItems
+    @Override
+    public int getAlignItems() {
+        return mAlignItems;
+    }
+
+    @Override
+    public void setAlignItems(@AlignItems int alignItems) {
+        if (mAlignItems != alignItems) {
+            mAlignItems = alignItems;
+            requestLayout();
+        }
+    }
+
+    @AlignContent
+    @Override
+    public int getAlignContent() {
+        return mAlignContent;
+    }
+
+    @Override
+    public void setAlignContent(@AlignContent int alignContent) {
+        if (mAlignContent != alignContent) {
+            mAlignContent = alignContent;
+            requestLayout();
+        }
+    }
+
+    @Override
+    public int getMaxLine() {
+        return mMaxLine;
+    }
+
+    @Override
+    public void setMaxLine(int maxLine) {
+        if (mMaxLine != maxLine) {
+            mMaxLine = maxLine;
+            requestLayout();
+        }
+    }
+
+    /**
+     * @return the flex lines composing this flex container. This method returns a copy of the
+     * original list excluding a dummy flex line (flex line that doesn't have any flex items in it
+     * but used for the alignment along the cross axis).
+     * Thus any changes of the returned list are not reflected to the original list.
+     */
+    @Override
+    public List<FlexLine> getFlexLines() {
+        List<FlexLine> result = new ArrayList<>(mFlexLines.size());
+        for (FlexLine flexLine : mFlexLines) {
+            if (flexLine.getItemCountNotGone() == 0) {
+                continue;
+            }
+            result.add(flexLine);
+        }
+        return result;
+    }
+
+    @Override
+    public int getDecorationLengthMainAxis(View view, int index, int indexInFlexLine) {
+        int decorationLength = 0;
+        if (isMainAxisDirectionHorizontal()) {
+            if (hasDividerBeforeChildAtAlongMainAxis(index, indexInFlexLine)) {
+                decorationLength += mDividerVerticalWidth;
+            }
+            if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                decorationLength += mDividerVerticalWidth;
+            }
+        } else {
+            if (hasDividerBeforeChildAtAlongMainAxis(index, indexInFlexLine)) {
+                decorationLength += mDividerHorizontalHeight;
+            }
+            if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                decorationLength += mDividerHorizontalHeight;
+            }
+        }
+        return decorationLength;
+    }
+
+    @Override
+    public int getDecorationLengthCrossAxis(View view) {
+        // Decoration along the cross axis for an individual view is not supported in the
+        // FlexboxLayout.
+        return 0;
+    }
+
+    @Override
+    public void onNewFlexLineAdded(FlexLine flexLine) {
+        // The size of the end divider isn't added until the flexLine is added to the flex container
+        // take the divider width (or height) into account when adding the flex line.
+        if (isMainAxisDirectionHorizontal()) {
+            if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                flexLine.mMainSize += mDividerVerticalWidth;
+                flexLine.mDividerLengthInMainSize += mDividerVerticalWidth;
+            }
+        } else {
+            if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                flexLine.mMainSize += mDividerHorizontalHeight;
+                flexLine.mDividerLengthInMainSize += mDividerHorizontalHeight;
+            }
+        }
+    }
+
+    @Override
+    public int getChildWidthMeasureSpec(int widthSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(widthSpec, padding, childDimension);
+    }
+
+    @Override
+    public int getChildHeightMeasureSpec(int heightSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(heightSpec, padding, childDimension);
+    }
+
+    @Override
+    public void onNewFlexItemAdded(View view, int index, int indexInFlexLine, FlexLine flexLine) {
+        // Check if the beginning or middle divider is required for the flex item
+        if (hasDividerBeforeChildAtAlongMainAxis(index, indexInFlexLine)) {
+            if (isMainAxisDirectionHorizontal()) {
+                flexLine.mMainSize += mDividerVerticalWidth;
+                flexLine.mDividerLengthInMainSize += mDividerVerticalWidth;
+            } else {
+                flexLine.mMainSize += mDividerHorizontalHeight;
+                flexLine.mDividerLengthInMainSize += mDividerHorizontalHeight;
+            }
+        }
+    }
+
+    @Override
+    public void setFlexLines(List<FlexLine> flexLines) {
+        mFlexLines = flexLines;
+    }
+
+    @Override
+    public List<FlexLine> getFlexLinesInternal() {
+        return mFlexLines;
+    }
+
+    @Override
+    public void updateViewCache(int position, View view) {
+        // No op
+    }
+
+    /**
+     * @return the horizontal divider drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setDividerDrawableHorizontal(Drawable)
+     */
+    @Nullable
+    @SuppressWarnings("UnusedDeclaration")
+    public Drawable getDividerDrawableHorizontal() {
+        return mDividerDrawableHorizontal;
+    }
+
+    /**
+     * @return the vertical divider drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setDividerDrawableVertical(Drawable)
+     */
+    @Nullable
+    @SuppressWarnings("UnusedDeclaration")
+    public Drawable getDividerDrawableVertical() {
+        return mDividerDrawableVertical;
+    }
+
+    /**
+     * Set a drawable to be used as a divider between items. The drawable is used for both
+     * horizontal and vertical dividers.
+     *
+     * @param divider Drawable that will divide each item for both horizontally and vertically.
+     * @see #setShowDivider(int)
+     */
+    public void setDividerDrawable(Drawable divider) {
+        setDividerDrawableHorizontal(divider);
+        setDividerDrawableVertical(divider);
+    }
+
+    /**
+     * Set a drawable to be used as a horizontal divider between items.
+     *
+     * @param divider Drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setShowDivider(int)
+     * @see #setShowDividerHorizontal(int)
+     */
+    public void setDividerDrawableHorizontal(@Nullable Drawable divider) {
+        if (divider == mDividerDrawableHorizontal) {
+            return;
+        }
+        mDividerDrawableHorizontal = divider;
+        if (divider != null) {
+            mDividerHorizontalHeight = divider.getIntrinsicHeight();
+        } else {
+            mDividerHorizontalHeight = 0;
+        }
+        setWillNotDrawFlag();
+        requestLayout();
+    }
+
+    /**
+     * Set a drawable to be used as a vertical divider between items.
+     *
+     * @param divider Drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setShowDivider(int)
+     * @see #setShowDividerVertical(int)
+     */
+    public void setDividerDrawableVertical(@Nullable Drawable divider) {
+        if (divider == mDividerDrawableVertical) {
+            return;
+        }
+        mDividerDrawableVertical = divider;
+        if (divider != null) {
+            mDividerVerticalWidth = divider.getIntrinsicWidth();
+        } else {
+            mDividerVerticalWidth = 0;
+        }
+        setWillNotDrawFlag();
+        requestLayout();
+    }
+
+    @FlexboxLayout.DividerMode
+    public int getShowDividerVertical() {
+        return mShowDividerVertical;
+    }
+
+    @FlexboxLayout.DividerMode
+    public int getShowDividerHorizontal() {
+        return mShowDividerHorizontal;
+    }
+
+    /**
+     * Set how dividers should be shown between items in this layout. This method sets the
+     * divider mode for both horizontally and vertically.
+     *
+     * @param dividerMode One or more of {@link #SHOW_DIVIDER_BEGINNING},
+     *                    {@link #SHOW_DIVIDER_MIDDLE}, or {@link #SHOW_DIVIDER_END},
+     *                    or {@link #SHOW_DIVIDER_NONE} to show no dividers.
+     * @see #setShowDividerVertical(int)
+     * @see #setShowDividerHorizontal(int)
+     */
+    public void setShowDivider(@DividerMode int dividerMode) {
+        setShowDividerVertical(dividerMode);
+        setShowDividerHorizontal(dividerMode);
+    }
+
+    /**
+     * Set how vertical dividers should be shown between items in this layout
+     *
+     * @param dividerMode One or more of {@link #SHOW_DIVIDER_BEGINNING},
+     *                    {@link #SHOW_DIVIDER_MIDDLE}, or {@link #SHOW_DIVIDER_END},
+     *                    or {@link #SHOW_DIVIDER_NONE} to show no dividers.
+     * @see #setShowDivider(int)
+     */
+    public void setShowDividerVertical(@DividerMode int dividerMode) {
+        if (dividerMode != mShowDividerVertical) {
+            mShowDividerVertical = dividerMode;
+            requestLayout();
+        }
+    }
+
+    /**
+     * Set how horizontal dividers should be shown between items in this layout.
+     *
+     * @param dividerMode One or more of {@link #SHOW_DIVIDER_BEGINNING},
+     *                    {@link #SHOW_DIVIDER_MIDDLE}, or {@link #SHOW_DIVIDER_END},
+     *                    or {@link #SHOW_DIVIDER_NONE} to show no dividers.
+     * @see #setShowDivider(int)
+     */
+    public void setShowDividerHorizontal(@DividerMode int dividerMode) {
+        if (dividerMode != mShowDividerHorizontal) {
+            mShowDividerHorizontal = dividerMode;
+            requestLayout();
+        }
+    }
+
+    private void setWillNotDrawFlag() {
+        if (mDividerDrawableHorizontal == null && mDividerDrawableVertical == null) {
+            setWillNotDraw(true);
+        } else {
+            setWillNotDraw(false);
+        }
+    }
+
+    /**
+     * Check if a divider is needed before the view whose indices are passed as arguments.
+     *
+     * @param index           the absolute index of the view to be judged
+     * @param indexInFlexLine the relative index in the flex line where the view
+     *                        belongs
+     * @return {@code true} if a divider is needed, {@code false} otherwise
+     */
+    private boolean hasDividerBeforeChildAtAlongMainAxis(int index, int indexInFlexLine) {
+        if (allViewsAreGoneBefore(index, indexInFlexLine)) {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerVertical & SHOW_DIVIDER_BEGINNING) != 0;
+            } else {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_BEGINNING) != 0;
+            }
+        } else {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerVertical & SHOW_DIVIDER_MIDDLE) != 0;
+            } else {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_MIDDLE) != 0;
+            }
+        }
+    }
+
+    private boolean allViewsAreGoneBefore(int index, int indexInFlexLine) {
+        for (int i = 1; i <= indexInFlexLine; i++) {
+            View view = getReorderedChildAt(index - i);
+            if (view != null && view.getVisibility() != View.GONE) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check if a divider is needed before the flex line whose index is passed as an argument.
+     *
+     * @param flexLineIndex the index of the flex line to be checked
+     * @return {@code true} if a divider is needed, {@code false} otherwise
+     */
+    private boolean hasDividerBeforeFlexLine(int flexLineIndex) {
+        if (flexLineIndex < 0 || flexLineIndex >= mFlexLines.size()) {
+            return false;
+        }
+        if (allFlexLinesAreDummyBefore(flexLineIndex)) {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_BEGINNING) != 0;
+            } else {
+                return (mShowDividerVertical & SHOW_DIVIDER_BEGINNING) != 0;
+            }
+        } else {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_MIDDLE) != 0;
+            } else {
+                return (mShowDividerVertical & SHOW_DIVIDER_MIDDLE) != 0;
+            }
+        }
+    }
+
+    private boolean allFlexLinesAreDummyBefore(int flexLineIndex) {
+        for (int i = 0; i < flexLineIndex; i++) {
+            if (mFlexLines.get(i).getItemCountNotGone() > 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check if a end divider is needed after the flex line whose index is passed as an argument.
+     *
+     * @param flexLineIndex the index of the flex line to be checked
+     * @return {@code true} if a divider is needed, {@code false} otherwise
+     */
+    private boolean hasEndDividerAfterFlexLine(int flexLineIndex) {
+        if (flexLineIndex < 0 || flexLineIndex >= mFlexLines.size()) {
+            return false;
+        }
+
+        for (int i = flexLineIndex + 1; i < mFlexLines.size(); i++) {
+            if (mFlexLines.get(i).getItemCountNotGone() > 0) {
+                return false;
+            }
+        }
+        if (isMainAxisDirectionHorizontal()) {
+            return (mShowDividerHorizontal & SHOW_DIVIDER_END) != 0;
+        } else {
+            return (mShowDividerVertical & SHOW_DIVIDER_END) != 0;
+        }
+
+    }
+
+    /**
+     * Per child parameters for children views of the {@link FlexboxLayout}.
+     *
+     * Note that some parent fields (which are not primitive nor a class implements
+     * {@link Parcelable}) are not included as the stored/restored fields after this class
+     * is serialized/de-serialized as an {@link Parcelable}.
+     */
+    public static class LayoutParams extends ViewGroup.MarginLayoutParams implements FlexItem {
+
+        /**
+         * @see FlexItem#getOrder()
+         */
+        private int mOrder = FlexItem.ORDER_DEFAULT;
+
+        /**
+         * @see FlexItem#getFlexGrow()
+         */
+        private float mFlexGrow = FlexItem.FLEX_GROW_DEFAULT;
+
+        /**
+         * @see FlexItem#getFlexShrink()
+         */
+        private float mFlexShrink = FlexItem.FLEX_SHRINK_DEFAULT;
+
+        /**
+         * @see FlexItem#getAlignSelf()
+         */
+        private int mAlignSelf = AlignSelf.AUTO;
+
+        /**
+         * @see FlexItem#getFlexBasisPercent()
+         */
+        private float mFlexBasisPercent = FlexItem.FLEX_BASIS_PERCENT_DEFAULT;
+
+        /**
+         * @see FlexItem#getMinWidth()
+         */
+        private int mMinWidth = NOT_SET;
+
+        /**
+         * @see FlexItem#getMinHeight()
+         */
+        private int mMinHeight = NOT_SET;
+
+        /**
+         * @see FlexItem#getMaxWidth()
+         */
+        private int mMaxWidth = MAX_SIZE;
+
+        /**
+         * @see FlexItem#getMaxHeight()
+         */
+        private int mMaxHeight = MAX_SIZE;
+
+        /**
+         * @see FlexItem#isWrapBefore()
+         */
+        private boolean mWrapBefore;
+
+        public LayoutParams(Context context, AttributeSet attrs) {
+            super(context, attrs);
+
+            TypedArray a = context
+                    .obtainStyledAttributes(attrs, R.styleable.FlexboxLayout_Layout);
+            mOrder = a.getInt(R.styleable.FlexboxLayout_Layout_layout_order, ORDER_DEFAULT);
+            mFlexGrow = a
+                    .getFloat(R.styleable.FlexboxLayout_Layout_layout_flexGrow, FLEX_GROW_DEFAULT);
+            mFlexShrink = a.getFloat(R.styleable.FlexboxLayout_Layout_layout_flexShrink,
+                    FLEX_SHRINK_DEFAULT);
+            mAlignSelf = a
+                    .getInt(R.styleable.FlexboxLayout_Layout_layout_alignSelf, AlignSelf.AUTO);
+            mFlexBasisPercent = a
+                    .getFraction(R.styleable.FlexboxLayout_Layout_layout_flexBasisPercent, 1, 1,
+                            FLEX_BASIS_PERCENT_DEFAULT);
+            mMinWidth = a
+                    .getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_minWidth, NOT_SET);
+            mMinHeight = a
+                    .getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_minHeight, NOT_SET);
+            mMaxWidth = a.getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_maxWidth,
+                    MAX_SIZE);
+            mMaxHeight = a.getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_maxHeight,
+                    MAX_SIZE);
+            mWrapBefore = a.getBoolean(R.styleable.FlexboxLayout_Layout_layout_wrapBefore, false);
+            a.recycle();
+        }
+
+        public LayoutParams(LayoutParams source) {
+            super(source);
+
+            mOrder = source.mOrder;
+            mFlexGrow = source.mFlexGrow;
+            mFlexShrink = source.mFlexShrink;
+            mAlignSelf = source.mAlignSelf;
+            mFlexBasisPercent = source.mFlexBasisPercent;
+            mMinWidth = source.mMinWidth;
+            mMinHeight = source.mMinHeight;
+            mMaxWidth = source.mMaxWidth;
+            mMaxHeight = source.mMaxHeight;
+            mWrapBefore = source.mWrapBefore;
+        }
+
+        public LayoutParams(ViewGroup.LayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(int width, int height) {
+            super(new ViewGroup.LayoutParams(width, height));
+        }
+
+        public LayoutParams(MarginLayoutParams source) {
+            super(source);
+        }
+
+        @Override
+        public int getWidth() {
+            return width;
+        }
+
+        @Override
+        public void setWidth(int width) {
+            this.width = width;
+        }
+
+        @Override
+        public int getHeight() {
+            return height;
+        }
+
+        @Override
+        public void setHeight(int height) {
+            this.height = height;
+        }
+
+        @Override
+        public int getOrder() {
+            return mOrder;
+        }
+
+        @Override
+        public void setOrder(int order) {
+            mOrder = order;
+        }
+
+        @Override
+        public float getFlexGrow() {
+            return mFlexGrow;
+        }
+
+        @Override
+        public void setFlexGrow(float flexGrow) {
+            this.mFlexGrow = flexGrow;
+        }
+
+        @Override
+        public float getFlexShrink() {
+            return mFlexShrink;
+        }
+
+        @Override
+        public void setFlexShrink(float flexShrink) {
+            this.mFlexShrink = flexShrink;
+        }
+
+        @AlignSelf
+        @Override
+        public int getAlignSelf() {
+            return mAlignSelf;
+        }
+
+        @Override
+        public void setAlignSelf(@AlignSelf int alignSelf) {
+            this.mAlignSelf = alignSelf;
+        }
+
+        @Override
+        public int getMinWidth() {
+            return mMinWidth;
+        }
+
+        @Override
+        public void setMinWidth(int minWidth) {
+            this.mMinWidth = minWidth;
+        }
+
+        @Override
+        public int getMinHeight() {
+            return mMinHeight;
+        }
+
+        @Override
+        public void setMinHeight(int minHeight) {
+            this.mMinHeight = minHeight;
+        }
+
+        @Override
+        public int getMaxWidth() {
+            return mMaxWidth;
+        }
+
+        @Override
+        public void setMaxWidth(int maxWidth) {
+            this.mMaxWidth = maxWidth;
+        }
+
+        @Override
+        public int getMaxHeight() {
+            return mMaxHeight;
+        }
+
+        @Override
+        public void setMaxHeight(int maxHeight) {
+            this.mMaxHeight = maxHeight;
+        }
+
+        @Override
+        public boolean isWrapBefore() {
+            return mWrapBefore;
+        }
+
+        @Override
+        public void setWrapBefore(boolean wrapBefore) {
+            this.mWrapBefore = wrapBefore;
+        }
+
+        @Override
+        public float getFlexBasisPercent() {
+            return mFlexBasisPercent;
+        }
+
+        @Override
+        public void setFlexBasisPercent(float flexBasisPercent) {
+            this.mFlexBasisPercent = flexBasisPercent;
+        }
+
+        @Override
+        public int getMarginLeft() {
+            return leftMargin;
+        }
+
+        @Override
+        public int getMarginTop() {
+            return topMargin;
+        }
+
+        @Override
+        public int getMarginRight() {
+            return rightMargin;
+        }
+
+        @Override
+        public int getMarginBottom() {
+            return bottomMargin;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(this.mOrder);
+            dest.writeFloat(this.mFlexGrow);
+            dest.writeFloat(this.mFlexShrink);
+            dest.writeInt(this.mAlignSelf);
+            dest.writeFloat(this.mFlexBasisPercent);
+            dest.writeInt(this.mMinWidth);
+            dest.writeInt(this.mMinHeight);
+            dest.writeInt(this.mMaxWidth);
+            dest.writeInt(this.mMaxHeight);
+            dest.writeByte(this.mWrapBefore ? (byte) 1 : (byte) 0);
+            dest.writeInt(this.bottomMargin);
+            dest.writeInt(this.leftMargin);
+            dest.writeInt(this.rightMargin);
+            dest.writeInt(this.topMargin);
+            dest.writeInt(this.height);
+            dest.writeInt(this.width);
+        }
+
+        protected LayoutParams(Parcel in) {
+            // Passing a resolved value to resolve a lint warning
+            // height and width are set in this method anyway.
+            super(0, 0);
+            this.mOrder = in.readInt();
+            this.mFlexGrow = in.readFloat();
+            this.mFlexShrink = in.readFloat();
+            this.mAlignSelf = in.readInt();
+            this.mFlexBasisPercent = in.readFloat();
+            this.mMinWidth = in.readInt();
+            this.mMinHeight = in.readInt();
+            this.mMaxWidth = in.readInt();
+            this.mMaxHeight = in.readInt();
+            this.mWrapBefore = in.readByte() != 0;
+            this.bottomMargin = in.readInt();
+            this.leftMargin = in.readInt();
+            this.rightMargin = in.readInt();
+            this.topMargin = in.readInt();
+            this.height = in.readInt();
+            this.width = in.readInt();
+        }
+
+        public static final Parcelable.Creator<LayoutParams> CREATOR
+                = new Parcelable.Creator<LayoutParams>() {
+            @Override
+            public LayoutParams createFromParcel(Parcel source) {
+                return new LayoutParams(source);
+            }
+
+            @Override
+            public LayoutParams[] newArray(int size) {
+                return new LayoutParams[size];
+            }
+        };
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
new file mode 100755
index 0000000..21ea733
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
@@ -0,0 +1,3112 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import static androidx.recyclerview.widget.LinearLayoutManager.INVALID_OFFSET;
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
+
+import android.content.Context;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSmoothScroller;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * LayoutManager for the {@link RecyclerView}. This class is intended to be used within a
+ * {@link RecyclerView} and offers the same capabilities of measure/layout its children
+ * as the {@link FlexboxLayout}.
+ */
+public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements FlexContainer,
+        RecyclerView.SmoothScroller.ScrollVectorProvider {
+
+    private static final String TAG = "FlexboxLayoutManager";
+
+    /**
+     * Temporary Rect instance to be passed to
+     * {@link RecyclerView.LayoutManager#calculateItemDecorationsForChild}
+     * to avoid creating a Rect instance every time.
+     */
+    private static final Rect TEMP_RECT = new Rect();
+
+    private static final boolean DEBUG = false;
+
+    /**
+     * The current value of the {@link FlexDirection}, the default value is {@link
+     * FlexDirection#ROW}.
+     *
+     * @see FlexContainer#getFlexDirection()
+     */
+    private int mFlexDirection;
+
+    /**
+     * The current value of the {@link FlexWrap}, the default value is {@link FlexWrap#WRAP}.
+     *
+     * @see FlexContainer#getFlexWrap()
+     */
+    private int mFlexWrap;
+
+    /**
+     * The current value of the {@link JustifyContent}, the default value is
+     * {@link JustifyContent#FLEX_START}.
+     *
+     * @see FlexContainer#getJustifyContent()
+     */
+    private int mJustifyContent;
+
+    /**
+     * The current value of the {@link AlignItems}, the default value is
+     * {@link AlignItems#STRETCH}.
+     *
+     * @see FlexContainer#getAlignItems()
+     */
+    private int mAlignItems;
+
+    private int mMaxLine = NOT_SET;
+
+    /**
+     * True if the layout direction is right to left, false otherwise.
+     */
+    private boolean mIsRtl;
+
+    /**
+     * True if the layout direction is bottom to top, false otherwise.
+     */
+    private boolean mFromBottomToTop;
+
+    private List<FlexLine> mFlexLines = new ArrayList<>();
+
+    private final FlexboxHelper mFlexboxHelper = new FlexboxHelper(this);
+
+    /**
+     * A snapshot of the {@link RecyclerView.Recycler} instance at a given moment.
+     * It's not guaranteed that this instance has a reference to the latest Recycler.
+     * When you want to use the latest Recycler, use the one passed as an method argument
+     * (such as the one in {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     */
+    private RecyclerView.Recycler mRecycler;
+
+    /**
+     * A snapshot of the {@link RecyclerView.State} instance at a given moment.
+     * It's not guaranteed that this instance has a reference to the latest State.
+     * When you want to use the latest State, use the one passed as an method argument
+     * (such as the one in {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     */
+    private RecyclerView.State mState;
+
+    private LayoutState mLayoutState;
+
+    private AnchorInfo mAnchorInfo = new AnchorInfo();
+
+    /**
+     * {@link OrientationHelper} along cross axis, which will be the primary scrolling direction.
+     * e.g. If the flex direction is set to {@link FlexDirection#ROW} and flex wrap is set to
+     * {@link FlexWrap#WRAP}, the RecyclerView scrolls vertically (along the cross axis).
+     */
+    private OrientationHelper mOrientationHelper;
+
+    /**
+     * {@link OrientationHelper} along the main axis, which will be the secondary scrolling
+     * direction if the size of the main size is larger than the parent of the RecyclerView.
+     */
+    private OrientationHelper mSubOrientationHelper;
+
+    private SavedState mPendingSavedState;
+
+    /**
+     * The position to which the next layout should start from this adapter position.
+     * This value is set either from the {@link #mPendingSavedState} when a configuration change
+     * happens or programmatically such as when the {@link #scrollToPosition(int)} is called.
+     */
+    private int mPendingScrollPosition = NO_POSITION;
+
+    /**
+     * The offset by which the next layout should be offset.
+     */
+    private int mPendingScrollPositionOffset = INVALID_OFFSET;
+
+    /**
+     * The width value used in the last {@link #onLayoutChildren} method.
+     */
+    private int mLastWidth = Integer.MIN_VALUE;
+
+    /**
+     * The height value used in the last {@link #onLayoutChildren} method.
+     */
+    private int mLastHeight = Integer.MIN_VALUE;
+
+    /**
+     * If set to {@code true}, this LayoutManager tries to recycle the children when detached from
+     * the RecyclerView so that recycled views can be reused using RecycledViewPool.
+     */
+    private boolean mRecycleChildrenOnDetach;
+
+    /**
+     * View cache within this LayoutManager. This is used to avoid the same ViewHolder is created
+     * multiple times in the same layout pass (onLayoutChildren or scrollHorizontally or
+     * scrollVertically).
+     * The keys and values in this cache needs to be cleared at the end of each layout pass.
+     */
+    private SparseArray<View> mViewCache = new SparseArray<>();
+
+    private final Context mContext;
+
+    /** The reference to the parent of the RecyclerView */
+    private View mParent;
+
+    /**
+     * Indicates the position that the view position that the flex line which has the view having
+     * this position needs to be recomputed before the next layout.
+     * For example, this is updated when a new View is inserted into the position before the
+     * first visible position.
+     */
+    private int mDirtyPosition = NO_POSITION;
+
+    /**
+     * Used for storing the results of calculation of flex lines to avoid creating a new instance
+     * every time the calculation happens.
+     */
+    private FlexboxHelper.FlexLinesResult mFlexLinesResult = new FlexboxHelper.FlexLinesResult();
+
+    /**
+     * Creates a default FlexboxLayoutManager.
+     */
+    public FlexboxLayoutManager(Context context) {
+        this(context, FlexDirection.ROW, FlexWrap.WRAP);
+    }
+
+    /**
+     * Creates a FlexboxLayoutManager with the flexDirection specified.
+     *
+     * @param flexDirection the flex direction attribute
+     */
+    public FlexboxLayoutManager(Context context, @FlexDirection int flexDirection) {
+        this(context, flexDirection, FlexWrap.WRAP);
+    }
+
+    /**
+     * Creates a FlexboxLayoutManager with the flexDirection and flexWrap attributes specified.
+     *
+     * @param flexDirection the flex direction attribute
+     * @param flexWrap      the flex wrap attribute
+     */
+    public FlexboxLayoutManager(Context context, @FlexDirection int flexDirection,
+            @FlexWrap int flexWrap) {
+        setFlexDirection(flexDirection);
+        setFlexWrap(flexWrap);
+        setAlignItems(AlignItems.STRETCH);
+        mContext = context;
+    }
+
+    /**
+     * Constructor used when layout manager is set in XML by RecyclerView attribute
+     * "layoutManager". No corresponding attributes for the {@code orientation},
+     * {@code reverseLayout} and {@code stackFromEnd} exist in Flexbox, thus map the similar
+     * attributes from Flexbox that behave similarly for each of them.
+     *
+     * {@code android:orientation} maps to the {@link FlexDirection},
+     * HORIZONTAL -> {@link FlexDirection#ROW}, VERTICAL -> {@link FlexDirection#COLUMN}.
+     *
+     * {@code android.support.v7.recyclerview:reverseLayout} reverses the direction of the
+     * {@link FlexDirection}, i.e. if reverseLayout is {@code true}, {@link FlexDirection#ROW} is
+     * changed to {@link FlexDirection#ROW_REVERSE}. Similarly {@link FlexDirection#COLUMN} is
+     * changed to {@link FlexDirection#COLUMN_REVERSE}.
+     */
+    public FlexboxLayoutManager(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        Properties properties = getProperties(context, attrs, defStyleAttr, defStyleRes);
+        switch (properties.orientation) {
+            case LinearLayoutManager.HORIZONTAL:
+                if (properties.reverseLayout) {
+                    setFlexDirection(FlexDirection.ROW_REVERSE);
+                } else {
+                    setFlexDirection(FlexDirection.ROW);
+                }
+                break;
+            case LinearLayoutManager.VERTICAL:
+                if (properties.reverseLayout) {
+                    setFlexDirection(FlexDirection.COLUMN_REVERSE);
+                } else {
+                    setFlexDirection(FlexDirection.COLUMN);
+                }
+                break;
+        }
+        setFlexWrap(FlexWrap.WRAP);
+        setAlignItems(AlignItems.STRETCH);
+        mContext = context;
+    }
+
+    @Override
+    public boolean isAutoMeasureEnabled() {
+        return true;
+    }
+
+    // From here, methods from FlexContainer
+    @FlexDirection
+    @Override
+    public int getFlexDirection() {
+        return mFlexDirection;
+    }
+
+    @Override
+    public void setFlexDirection(@FlexDirection int flexDirection) {
+        if (mFlexDirection != flexDirection) {
+            // Remove the existing views even if the direction changes from
+            // row -> row_reverse or column -> column_reverse to make the item decorations dirty
+            // state
+            removeAllViews();
+            mFlexDirection = flexDirection;
+            mOrientationHelper = null;
+            mSubOrientationHelper = null;
+            clearFlexLines();
+            requestLayout();
+        }
+    }
+
+    @Override
+    @FlexWrap
+    public int getFlexWrap() {
+        return mFlexWrap;
+    }
+
+    @Override
+    public void setFlexWrap(@FlexWrap int flexWrap) {
+        if (flexWrap == FlexWrap.WRAP_REVERSE) {
+            throw new UnsupportedOperationException("wrap_reverse is not supported in "
+                    + "FlexboxLayoutManager");
+        }
+        if (mFlexWrap != flexWrap) {
+            if (mFlexWrap == FlexWrap.NOWRAP || flexWrap == FlexWrap.NOWRAP) {
+                removeAllViews();
+                clearFlexLines();
+            }
+            mFlexWrap = flexWrap;
+            mOrientationHelper = null;
+            mSubOrientationHelper = null;
+            requestLayout();
+        }
+    }
+
+    @JustifyContent
+    @Override
+    public int getJustifyContent() {
+        return mJustifyContent;
+    }
+
+    @Override
+    public void setJustifyContent(@JustifyContent int justifyContent) {
+        if (mJustifyContent != justifyContent) {
+            mJustifyContent = justifyContent;
+            requestLayout();
+        }
+    }
+
+    @AlignItems
+    @Override
+    public int getAlignItems() {
+        return mAlignItems;
+    }
+
+    @Override
+    public void setAlignItems(@AlignItems int alignItems) {
+        if (mAlignItems != alignItems) {
+            if (mAlignItems == AlignItems.STRETCH || alignItems == AlignItems.STRETCH) {
+                removeAllViews();
+                clearFlexLines();
+            }
+            mAlignItems = alignItems;
+            requestLayout();
+        }
+    }
+
+    @AlignContent
+    @Override
+    public int getAlignContent() {
+        return AlignContent.STRETCH;
+    }
+
+    @Override
+    public void setAlignContent(@AlignContent int alignContent) {
+        throw new UnsupportedOperationException("Setting the alignContent in the "
+                + "FlexboxLayoutManager is not supported. Use FlexboxLayout "
+                + "if you need to use this attribute.");
+    }
+
+    @Override
+    public int getMaxLine() {
+        return mMaxLine;
+    }
+
+    @Override
+    public void setMaxLine(int maxLine) {
+        if (mMaxLine != maxLine) {
+            mMaxLine = maxLine;
+            requestLayout();
+        }
+    }
+
+    @Override
+    @NonNull
+    public List<FlexLine> getFlexLines() {
+        List<FlexLine> result = new ArrayList<>(mFlexLines.size());
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            if (flexLine.getItemCount() == 0) {
+                continue;
+            }
+            result.add(flexLine);
+        }
+        return result;
+    }
+
+    @Override
+    public int getDecorationLengthMainAxis(View view, int index, int indexInFlexLine) {
+        if (isMainAxisDirectionHorizontal()) {
+            return getLeftDecorationWidth(view) + getRightDecorationWidth(view);
+        } else {
+            return getTopDecorationHeight(view) + getBottomDecorationHeight(view);
+        }
+    }
+
+    @Override
+    public int getDecorationLengthCrossAxis(View view) {
+        if (isMainAxisDirectionHorizontal()) {
+            return getTopDecorationHeight(view) + getBottomDecorationHeight(view);
+        } else {
+            return getLeftDecorationWidth(view) + getRightDecorationWidth(view);
+        }
+    }
+
+    @Override
+    public void onNewFlexItemAdded(View view, int index, int indexInFlexLine, FlexLine flexLine) {
+        // To avoid creating a new Rect instance every time, passing the same Rect instance
+        // since calculated decorations are assigned to view's LayoutParams inside the
+        // calculateItemDecorationsForChild method anyway.
+        calculateItemDecorationsForChild(view, TEMP_RECT);
+        if (isMainAxisDirectionHorizontal()) {
+            int decorationWidth = getLeftDecorationWidth(view) + getRightDecorationWidth(view);
+            flexLine.mMainSize += decorationWidth;
+            flexLine.mDividerLengthInMainSize += decorationWidth;
+        } else {
+            int decorationHeight = getTopDecorationHeight(view) + getBottomDecorationHeight(view);
+            flexLine.mMainSize += decorationHeight;
+            flexLine.mDividerLengthInMainSize += decorationHeight;
+        }
+    }
+
+    /**
+     * @return the number of flex items contained in the flex container.
+     * This method doesn't always reflect the latest state of the adapter.
+     * If you want to access the latest state of the adapter, use the {@link RecyclerView.State}
+     * instance passed as an argument for some methods (such as
+     * {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     *
+     * This method is used to avoid the implementation of the similar method.
+     * i.e. {@link FlexboxLayoutManager#getChildCount()} returns the child count, but it doesn't
+     * include the children that are detached or scrapped.
+     */
+    @Override
+    public int getFlexItemCount() {
+        return mState.getItemCount();
+    }
+
+    /**
+     * @return the flex item as a view specified as the index.
+     * This method doesn't always return the latest state of the view in the adapter.
+     * If you want to access the latest state, use the {@link RecyclerView.Recycler}
+     * instance passed as an argument for some methods (such as
+     * {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     *
+     * This method is used to avoid the implementation of the similar method.
+     * i.e. {@link FlexboxLayoutManager#getChildAt(int)} returns a view for the given index,
+     * but the index is based on the layout position, not based on the adapter position, which
+     * isn't desired given the usage of this method.
+     */
+    @Override
+    public View getFlexItemAt(int index) {
+        // Look up the cache within the LayoutManager first, since it's the most light operation.
+        View cachedView = mViewCache.get(index);
+        if (cachedView != null) {
+            return cachedView;
+        }
+        return mRecycler.getViewForPosition(index);
+    }
+
+    /**
+     * Returns a View for the given index.
+     * The order attribute ({@link FlexItem#getOrder()}) is not supported by this class since
+     * otherwise all view holders need to be inflated at least once even though only the visible
+     * part of the layout is needed.
+     * Implementing this method just to make this class conform to the
+     * {@link FlexContainer} interface.
+     *
+     * @param index the index of the view
+     * @return the view for the given index.
+     * If the index is negative or out of bounds of the number of contained views,
+     * returns {@code null}.
+     */
+    @Override
+    public View getReorderedFlexItemAt(int index) {
+        return getFlexItemAt(index);
+    }
+
+    @Override
+    public void onNewFlexLineAdded(FlexLine flexLine) {
+        // No op
+    }
+
+    @Override
+    public int getChildWidthMeasureSpec(int widthSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(getWidth(), getWidthMode(), padding, childDimension,
+                canScrollHorizontally());
+    }
+
+    @Override
+    public int getChildHeightMeasureSpec(int heightSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(getHeight(), getHeightMode(), padding, childDimension,
+                canScrollVertically());
+    }
+
+    @Override
+    public int getLargestMainSize() {
+        if (mFlexLines.size() == 0) {
+            return 0;
+        }
+        int largestSize = Integer.MIN_VALUE;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            largestSize = Math.max(largestSize, flexLine.mMainSize);
+        }
+        return largestSize;
+    }
+
+    @Override
+    public int getSumOfCrossSize() {
+        int sum = 0;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            // TODO: Consider adding decorator between flex lines.
+            sum += flexLine.mCrossSize;
+        }
+        return sum;
+    }
+
+    @Override
+    public void setFlexLines(List<FlexLine> flexLines) {
+        mFlexLines = flexLines;
+    }
+
+    @Override
+    public List<FlexLine> getFlexLinesInternal() {
+        return mFlexLines;
+    }
+
+    @Override
+    public void updateViewCache(int position, View view) {
+        mViewCache.put(position, view);
+    }
+    // The end of methods from FlexContainer
+
+    // ScrollVectorProvider method
+    @Override
+    public PointF computeScrollVectorForPosition(int targetPosition) {
+        if (getChildCount() == 0) {
+            return null;
+        }
+        View view = getChildAt(0);
+        if (view == null) {
+            return null;
+        }
+        int firstChildPos = getPosition(view);
+        int direction = targetPosition < firstChildPos ? -1 : 1;
+        if (isMainAxisDirectionHorizontal()) {
+            return new PointF(0, direction);
+        } else {
+            return new PointF(direction, 0);
+        }
+    }
+
+    @Override
+    public RecyclerView.LayoutParams generateDefaultLayoutParams() {
+        return new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+    }
+
+    @Override
+    public RecyclerView.LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {
+        return new LayoutParams(c, attrs);
+    }
+
+    @Override
+    public boolean checkLayoutParams(RecyclerView.LayoutParams lp) {
+        return lp instanceof LayoutParams;
+    }
+
+    @Override
+    public void onAdapterChanged(RecyclerView.Adapter oldAdapter, RecyclerView.Adapter newAdapter) {
+        removeAllViews();
+    }
+
+    @Override
+    public Parcelable onSaveInstanceState() {
+        if (mPendingSavedState != null) {
+            return new SavedState(mPendingSavedState);
+        }
+        SavedState savedState = new SavedState();
+        if (getChildCount() > 0) {
+            // TODO: Find the child from end if mFlexWrap == FlexWrap.WRAP_REVERSE
+            View firstView = getChildClosestToStart();
+            savedState.mAnchorPosition = getPosition(firstView);
+            savedState.mAnchorOffset = mOrientationHelper.getDecoratedStart(firstView) -
+                    mOrientationHelper.getStartAfterPadding();
+        } else {
+            savedState.invalidateAnchor();
+        }
+        return savedState;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Parcelable state) {
+        if (state instanceof SavedState) {
+            mPendingSavedState = (SavedState) state;
+            requestLayout();
+            if (DEBUG) {
+                Log.d(TAG, "Loaded saved state. " + mPendingSavedState);
+            }
+        } else {
+            if (DEBUG) {
+                Log.w(TAG, "Invalid state was trying to be restored. " + state);
+            }
+        }
+    }
+
+    @Override
+    public void onItemsAdded(@NonNull RecyclerView recyclerView, int positionStart, int itemCount) {
+        super.onItemsAdded(recyclerView, positionStart, itemCount);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsUpdated(@NonNull RecyclerView recyclerView, int positionStart, int itemCount,
+            Object payload) {
+        super.onItemsUpdated(recyclerView, positionStart, itemCount, payload);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsUpdated(@NonNull RecyclerView recyclerView, int positionStart, int itemCount) {
+        super.onItemsUpdated(recyclerView, positionStart, itemCount);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsRemoved(@NonNull RecyclerView recyclerView, int positionStart, int itemCount) {
+        super.onItemsRemoved(recyclerView, positionStart, itemCount);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsMoved(@NonNull RecyclerView recyclerView, int from, int to, int itemCount) {
+        super.onItemsMoved(recyclerView, from, to, itemCount);
+        updateDirtyPosition(Math.min(from, to));
+    }
+
+    private void updateDirtyPosition(int positionStart) {
+        int lastVisiblePosition = findLastVisibleItemPosition();
+        if (positionStart >= lastVisiblePosition) {
+            return;
+        }
+        int childCount = getChildCount();
+        mFlexboxHelper.ensureMeasureSpecCache(childCount);
+        mFlexboxHelper.ensureMeasuredSizeCache(childCount);
+        mFlexboxHelper.ensureIndexToFlexLine(childCount);
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+
+        if (positionStart >= mFlexboxHelper.mIndexToFlexLine.length) {
+            return;
+        }
+
+        mDirtyPosition = positionStart;
+
+        View firstView = getChildClosestToStart();
+        if (firstView == null) {
+            return;
+        }
+
+        // Assign the pending scroll position and offset so that the first visible position is
+        // restored in the next layout.
+        mPendingScrollPosition = getPosition(firstView);
+
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            mPendingScrollPositionOffset = mOrientationHelper.getDecoratedEnd(firstView) +
+                    mOrientationHelper.getEndPadding();
+        } else {
+            mPendingScrollPositionOffset = mOrientationHelper.getDecoratedStart(firstView) -
+                    mOrientationHelper.getStartAfterPadding();
+        }
+    }
+
+    @Override
+    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+        // Layout algorithm:
+        // 1) Find an anchor coordinate and anchor flex line position. If not found, the coordinate
+        //    starts from zero.
+        // 2) From the anchor position to the visible area, calculate the flex lines that needs to
+        //    be filled.
+        // 3) Fill toward end from the anchor position
+        // 4) Fill toward start from the anchor position
+        if (DEBUG) {
+            Log.d(TAG, "onLayoutChildren started");
+            Log.d(TAG, "getChildCount: " + getChildCount());
+            Log.d(TAG, "State: " + state);
+            Log.d(TAG, "PendingSavedState: " + mPendingSavedState);
+            Log.d(TAG, "PendingScrollPosition: " + mPendingScrollPosition);
+            Log.d(TAG, "PendingScrollOffset: " + mPendingScrollPositionOffset);
+        }
+
+        // Assign the Recycler and the State as the member variables so that
+        // the method from FlexContainer (such as getFlexItemCount()) returns the number of
+        // flex items from the adapter not the child count in the LayoutManager because
+        // LayoutManager#getChildCount doesn't include the views that are detached or scrapped.
+        mRecycler = recycler;
+        mState = state;
+        int childCount = state.getItemCount();
+        if (childCount == 0 && state.isPreLayout()) {
+            return;
+        }
+        resolveLayoutDirection();
+        ensureOrientationHelper();
+        ensureLayoutState();
+        mFlexboxHelper.ensureMeasureSpecCache(childCount);
+        mFlexboxHelper.ensureMeasuredSizeCache(childCount);
+
+        mFlexboxHelper.ensureIndexToFlexLine(childCount);
+
+        mLayoutState.mShouldRecycle = false;
+
+        if (mPendingSavedState != null && mPendingSavedState.hasValidAnchor(childCount)) {
+            mPendingScrollPosition = mPendingSavedState.mAnchorPosition;
+        }
+
+        if (!mAnchorInfo.mValid || mPendingScrollPosition != NO_POSITION ||
+                mPendingSavedState != null) {
+            mAnchorInfo.reset();
+            updateAnchorInfoForLayout(state, mAnchorInfo);
+            mAnchorInfo.mValid = true;
+        }
+        detachAndScrapAttachedViews(recycler);
+
+        if (mAnchorInfo.mLayoutFromEnd) {
+            updateLayoutStateToFillStart(mAnchorInfo, false, true);
+        } else {
+            updateLayoutStateToFillEnd(mAnchorInfo, false, true);
+        }
+        if (DEBUG) {
+            Log.d(TAG,
+                    String.format("onLayoutChildren. recycler.getScrapList.size(): %s, state: %s",
+                            recycler.getScrapList().size(), state));
+        }
+
+        updateFlexLines(childCount);
+        if (DEBUG) {
+            for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+                FlexLine flexLine = mFlexLines.get(i);
+                Log.d(TAG, String.format("%d flex line. MainSize: %d, CrossSize: %d, itemCount: %d",
+                        i, flexLine.getMainSize(), flexLine.getCrossSize(),
+                        flexLine.getItemCount()));
+            }
+        }
+
+        int startOffset;
+        int endOffset;
+        int filledToEnd = fill(recycler, state, mLayoutState);
+        if (mAnchorInfo.mLayoutFromEnd) {
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward start", filledToEnd));
+            }
+            startOffset = mLayoutState.mOffset;
+            updateLayoutStateToFillEnd(mAnchorInfo, true, false);
+            int filledToStart = fill(recycler, state, mLayoutState);
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward end", filledToStart));
+            }
+            endOffset = mLayoutState.mOffset;
+        } else {
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward end", filledToEnd));
+            }
+            endOffset = mLayoutState.mOffset;
+            updateLayoutStateToFillStart(mAnchorInfo, true, false);
+            int filledToStart = fill(recycler, state, mLayoutState);
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward start", filledToStart));
+            }
+            startOffset = mLayoutState.mOffset;
+        }
+
+        if (getChildCount() > 0) {
+            if (mAnchorInfo.mLayoutFromEnd) {
+                int fixOffset = fixLayoutEndGap(endOffset, recycler, state, true);
+                startOffset += fixOffset;
+                fixLayoutStartGap(startOffset, recycler, state, false);
+            } else {
+                int fixOffset = fixLayoutStartGap(startOffset, recycler, state, true);
+                endOffset += fixOffset;
+                fixLayoutEndGap(endOffset, recycler, state, false);
+            }
+        }
+    }
+
+    /**
+     * Fill the gap the toward the start position if the gap to be filled is made.
+     * Large part is copied from LinearLayoutManager#fixLayoutStartGap.
+     */
+    private int fixLayoutStartGap(int startOffset, RecyclerView.Recycler recycler,
+            RecyclerView.State state, boolean canOffsetChildren) {
+        int gap;
+        int fixOffset;
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            gap = mOrientationHelper.getEndAfterPadding() - startOffset;
+            if (gap > 0) {
+                // check if we should fix this gap.
+                fixOffset = handleScrollingMainOrientation(-gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        } else {
+            gap = startOffset - mOrientationHelper.getStartAfterPadding();
+            if (gap > 0) {
+                // check if we should fix this gap.
+                fixOffset = -handleScrollingMainOrientation(gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        }
+        startOffset += fixOffset;
+        if (canOffsetChildren) {
+            // re-calculate gap, see if we could fix it
+            gap = startOffset - mOrientationHelper.getStartAfterPadding();
+            if (gap > 0) {
+                mOrientationHelper.offsetChildren(-gap);
+                return fixOffset - gap;
+            }
+        }
+        return fixOffset;
+    }
+
+    /**
+     * Fill the gap the toward the end position if the gap to be filled is made.
+     * This process is necessary in a case like {@link #scrollToPosition(int)} is called
+     * for the last item, otherwise the last item is placed as the first line.
+     * Large part is copied from LinearLayoutManager#fixLayoutEndGap.
+     */
+    private int fixLayoutEndGap(int endOffset, RecyclerView.Recycler recycler,
+            RecyclerView.State state, boolean canOffsetChildren) {
+        int gap;
+        boolean columnAndRtl = !isMainAxisDirectionHorizontal() && mIsRtl;
+        int fixOffset;
+        if (columnAndRtl) {
+            gap = endOffset - mOrientationHelper.getStartAfterPadding();
+            if (gap > 0) {
+                fixOffset = handleScrollingMainOrientation(gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        } else {
+            gap = mOrientationHelper.getEndAfterPadding() - endOffset;
+            if (gap > 0) {
+                fixOffset = -handleScrollingMainOrientation(-gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        }
+
+        // move offset according to scroll amount
+        endOffset += fixOffset;
+        if (canOffsetChildren) {
+            // re-calculate gap, see if we could fix it
+            gap = mOrientationHelper.getEndAfterPadding() - endOffset;
+            if (gap > 0) {
+                mOrientationHelper.offsetChildren(gap);
+                return gap + fixOffset;
+            }
+        }
+        return fixOffset;
+    }
+
+    private void updateFlexLines(int childCount) {
+        //noinspection ResourceType
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(getWidth(), getWidthMode());
+        //noinspection ResourceType
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(getHeight(), getHeightMode());
+        int width = getWidth();
+        int height = getHeight();
+        boolean isMainSizeChanged;
+        int needsToFill;
+        // Clear the flex lines if the main size has changed from the last measurement.
+        // For example this happens when the developer handles the configuration changes manually
+        // or the user change the width boundary in the multi window mode.
+        if (isMainAxisDirectionHorizontal()) {
+            isMainSizeChanged = mLastWidth != Integer.MIN_VALUE && mLastWidth != width;
+
+            // If the mInfinite flag is set to true (that usually happens when RecyclerViews are
+            // nested and inner RecyclerView's layout_height is set to wrap_content, thus height is
+            // passed as 0 from the RecyclerView)
+            // Set the upper limit as the height of the device in order to prevent computing all
+            // items in the adapter
+            needsToFill = mLayoutState.mInfinite ?
+                    mContext.getResources().getDisplayMetrics().heightPixels
+                    : mLayoutState.mAvailable;
+        } else {
+            isMainSizeChanged = mLastHeight != Integer.MIN_VALUE && mLastHeight != height;
+
+            // If the mInfinite flag is set to true (that usually happens when RecyclerViews are
+            // nested and inner RecyclerView's layout_width is set to wrap_content, thus width is
+            // passed as 0 from the RecyclerView)
+            // Set the upper limit as the width of the device in order to prevent computing all
+            // items in the adapter
+            needsToFill = mLayoutState.mInfinite ?
+                    mContext.getResources().getDisplayMetrics().widthPixels
+                    : mLayoutState.mAvailable;
+        }
+
+        mLastWidth = width;
+        mLastHeight = height;
+
+        if (mDirtyPosition == NO_POSITION &&
+                (mPendingScrollPosition != NO_POSITION || isMainSizeChanged)) {
+            if (mAnchorInfo.mLayoutFromEnd) {
+                // Prior flex lines should be already calculated, don't have to be updated
+                return;
+            }
+            // TODO: This path may need another consideration to not calculate the entire flex
+            // lines prior to the anchor position since it may cause noticeable amount of
+            // skipped frames.
+            // Another note: deciding anchor position for the anchor view assumes that prior
+            // flex lines are calculated otherwise the position of the view can't be decided.
+            // It may be possible that assumes the anchor view is always at the start of a flex
+            // line and calculate the rest of flex lines as user scrolls to the top (toward the
+            // start) incrementally, but that approach may lead to inconsistent anchor view
+            // position
+            mFlexLines.clear();
+            assert mFlexboxHelper.mIndexToFlexLine != null;
+            mFlexLinesResult.reset();
+            if (isMainAxisDirectionHorizontal()) {
+                mFlexboxHelper
+                        .calculateHorizontalFlexLinesToIndex(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec,
+                                needsToFill, mAnchorInfo.mPosition, mFlexLines);
+            } else {
+                mFlexboxHelper
+                        .calculateVerticalFlexLinesToIndex(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec,
+                                needsToFill, mAnchorInfo.mPosition, mFlexLines);
+            }
+            mFlexLines = mFlexLinesResult.mFlexLines;
+            mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec);
+            mFlexboxHelper.stretchViews();
+            mAnchorInfo.mFlexLinePosition =
+                    mFlexboxHelper.mIndexToFlexLine[mAnchorInfo.mPosition];
+            mLayoutState.mFlexLinePosition = mAnchorInfo.mFlexLinePosition;
+        } else {
+            // Calculate the flex lines until the calculated cross size reaches the
+            // LayoutState#mAvailable (or until the end of the flex container)
+            // calculation can be done incrementally because the flex lines prior to the anchor
+            // position haven't changed
+            int fromIndex = mDirtyPosition != NO_POSITION ?
+                    Math.min(mDirtyPosition, mAnchorInfo.mPosition) : mAnchorInfo.mPosition;
+
+            mFlexLinesResult.reset();
+            if (isMainAxisDirectionHorizontal()) {
+                if (mFlexLines.size() > 0) {
+                    // Remove the already calculated flex lines from the fromIndex (either of
+                    // anchor position or the position marked as dirty (last time the item was
+                    // changed) and calculate beyond the available amount
+                    // (visible area that needs to be filled)
+                    mFlexboxHelper.clearFlexLines(mFlexLines, fromIndex);
+                    mFlexboxHelper.calculateFlexLines(mFlexLinesResult, widthMeasureSpec,
+                            heightMeasureSpec, needsToFill, fromIndex, mAnchorInfo.mPosition,
+                            mFlexLines);
+                } else {
+                    mFlexboxHelper.ensureIndexToFlexLine(childCount);
+                    mFlexboxHelper
+                            .calculateHorizontalFlexLines(mFlexLinesResult,
+                                    widthMeasureSpec, heightMeasureSpec,
+                                    needsToFill, 0, mFlexLines);
+                }
+            } else {
+                if (mFlexLines.size() > 0) {
+                    // Remove the already calculated flex lines from the fromIndex (either of
+                    // anchor position or the position marked as dirty (last time the item was
+                    // changed) and calculate beyond the available amount
+                    // (visible area that needs to be filled)
+                    mFlexboxHelper.clearFlexLines(mFlexLines, fromIndex);
+                    mFlexboxHelper.calculateFlexLines(mFlexLinesResult, heightMeasureSpec,
+                            widthMeasureSpec, needsToFill, fromIndex, mAnchorInfo.mPosition,
+                            mFlexLines);
+                } else {
+                    mFlexboxHelper.ensureIndexToFlexLine(childCount);
+                    mFlexboxHelper
+                            .calculateVerticalFlexLines(mFlexLinesResult, widthMeasureSpec,
+                                    heightMeasureSpec, needsToFill, 0, mFlexLines);
+                }
+            }
+            mFlexLines = mFlexLinesResult.mFlexLines;
+            mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec,
+                    fromIndex);
+            // Unlike the FlexboxLayout not calling FlexboxHelper#determineCrossSize because
+            // the align content attribute (which is used to determine the cross size) is only
+            // effective
+            // when the size of flex line is equal or more than 2 and the parent height
+            // (length along the cross size) is fixed. But in RecyclerView, these two conditions
+            // can't
+            // be true at the same time. Because it's scrollable along the cross axis
+            // or even if not (when flex wrap is "nowrap") the size of the flex lines should be 1.
+            mFlexboxHelper.stretchViews(fromIndex);
+        }
+    }
+
+    @Override
+    public void onLayoutCompleted(RecyclerView.State state) {
+        super.onLayoutCompleted(state);
+        if (DEBUG) {
+            Log.d(TAG, "onLayoutCompleted. " + state);
+        }
+        mPendingSavedState = null;
+        mPendingScrollPosition = NO_POSITION;
+        mPendingScrollPositionOffset = INVALID_OFFSET;
+        mDirtyPosition = NO_POSITION;
+        mAnchorInfo.reset();
+        mViewCache.clear();
+    }
+
+    boolean isLayoutRtl() {
+        return mIsRtl;
+    }
+
+    private void resolveLayoutDirection() {
+        int layoutDirection = getLayoutDirection();
+        switch (mFlexDirection) {
+            case FlexDirection.ROW:
+                mIsRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                mFromBottomToTop = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                break;
+            case FlexDirection.ROW_REVERSE:
+                mIsRtl = layoutDirection != ViewCompat.LAYOUT_DIRECTION_RTL;
+                mFromBottomToTop = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                break;
+            case FlexDirection.COLUMN:
+                mIsRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    mIsRtl = !mIsRtl;
+                }
+                mFromBottomToTop = false;
+                break;
+            case FlexDirection.COLUMN_REVERSE:
+                mIsRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    mIsRtl = !mIsRtl;
+                }
+                mFromBottomToTop = true;
+                break;
+            default:
+                mIsRtl = false;
+                mFromBottomToTop = false;
+        }
+    }
+
+    private void updateAnchorInfoForLayout(RecyclerView.State state, AnchorInfo anchorInfo) {
+        if (updateAnchorFromPendingState(state, anchorInfo, mPendingSavedState)) {
+            if (DEBUG) {
+                Log.d(TAG, "updated anchor from the pending state");
+            }
+            return;
+        }
+        if (updateAnchorFromChildren(state, anchorInfo)) {
+            if (DEBUG) {
+                Log.d(TAG,
+                        String.format("updated anchor info from existing children. AnchorInfo: %s",
+                                anchorInfo));
+            }
+            return;
+        }
+        if (DEBUG) {
+            Log.d(TAG, "deciding anchor info for fresh state");
+        }
+        anchorInfo.assignCoordinateFromPadding();
+        anchorInfo.mPosition = 0;
+        anchorInfo.mFlexLinePosition = 0;
+    }
+
+    private boolean updateAnchorFromPendingState(RecyclerView.State state, AnchorInfo anchorInfo,
+            SavedState savedState) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        if (state.isPreLayout() || mPendingScrollPosition == NO_POSITION) {
+            return false;
+        }
+        if (mPendingScrollPosition < 0 || mPendingScrollPosition >= state.getItemCount()) {
+            mPendingScrollPosition = NO_POSITION;
+            mPendingScrollPositionOffset = INVALID_OFFSET;
+            if (DEBUG) {
+                Log.e(TAG, "ignoring invalid scroll position " + mPendingScrollPosition);
+            }
+            return false;
+        }
+
+        anchorInfo.mPosition = mPendingScrollPosition;
+        anchorInfo.mFlexLinePosition = mFlexboxHelper.mIndexToFlexLine[anchorInfo.mPosition];
+        if (mPendingSavedState != null && mPendingSavedState.hasValidAnchor(state.getItemCount())) {
+            anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding() +
+                    savedState.mAnchorOffset;
+            anchorInfo.mAssignedFromSavedState = true;
+            anchorInfo.mFlexLinePosition = NO_POSITION;
+            return true;
+        }
+
+        if (mPendingScrollPositionOffset == INVALID_OFFSET) {
+            View anchorView = findViewByPosition(mPendingScrollPosition);
+            if (anchorView != null) {
+                if (mOrientationHelper.getDecoratedMeasurement(anchorView) >
+                        mOrientationHelper.getTotalSpace()) {
+                    anchorInfo.assignCoordinateFromPadding();
+                    return true;
+                }
+                int startGap = mOrientationHelper.getDecoratedStart(anchorView)
+                        - mOrientationHelper.getStartAfterPadding();
+                if (startGap < 0) {
+                    anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding();
+                    anchorInfo.mLayoutFromEnd = false;
+                    return true;
+                }
+
+                int endGap = mOrientationHelper.getEndAfterPadding() -
+                        mOrientationHelper.getDecoratedEnd(anchorView);
+                if (endGap < 0) {
+                    anchorInfo.mCoordinate = mOrientationHelper.getEndAfterPadding();
+                    anchorInfo.mLayoutFromEnd = true;
+                    return true;
+                }
+                anchorInfo.mCoordinate = anchorInfo.mLayoutFromEnd ?
+                        (mOrientationHelper.getDecoratedEnd(anchorView) +
+                                mOrientationHelper.getTotalSpaceChange())
+                        : mOrientationHelper.getDecoratedStart(anchorView);
+            } else {
+                if (getChildCount() > 0) {
+                    View view = getChildAt(0);
+                    if (view != null) {
+                        int position = getPosition(view);
+                        anchorInfo.mLayoutFromEnd = mPendingScrollPosition < position;
+                    }
+                }
+                anchorInfo.assignCoordinateFromPadding();
+            }
+            return true;
+        }
+
+        // TODO: Support reverse layout when flex wrap == FlexWrap.WRAP_REVERSE
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            anchorInfo.mCoordinate = mPendingScrollPositionOffset
+                    - mOrientationHelper.getEndPadding();
+        } else {
+            anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding()
+                    + mPendingScrollPositionOffset;
+        }
+        return true;
+    }
+
+    /**
+     * Finds an anchor child from existing Views. Most of the time, this is the view closest to
+     * start or end that has a valid position (e.g. not removed).
+     * Large part refers to the same method from LinearLayout#updateAnchorFromChildren
+     */
+    private boolean updateAnchorFromChildren(RecyclerView.State state, AnchorInfo anchorInfo) {
+        if (getChildCount() == 0) {
+            return false;
+        }
+        // TODO: Consider the focused view
+
+        View referenceChild = anchorInfo.mLayoutFromEnd
+                ? findLastReferenceChild(state.getItemCount())
+                : findFirstReferenceChild(state.getItemCount());
+        if (referenceChild != null) {
+            anchorInfo.assignFromView(referenceChild);
+            // If all visible views are removed in 1 pass, reference child might be out of bounds.
+            // If that is the case, offset it back to 0 so that we use these pre-layout children.
+            if (!state.isPreLayout() && supportsPredictiveItemAnimations()) {
+                // validate this child is at least partially visible. if not, offset it to start
+                final boolean notVisible =
+                        mOrientationHelper.getDecoratedStart(referenceChild) >= mOrientationHelper
+                                .getEndAfterPadding()
+                                || mOrientationHelper.getDecoratedEnd(referenceChild)
+                                < mOrientationHelper.getStartAfterPadding();
+                if (notVisible) {
+                    anchorInfo.mCoordinate = anchorInfo.mLayoutFromEnd
+                            ? mOrientationHelper.getEndAfterPadding()
+                            : mOrientationHelper.getStartAfterPadding();
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Find the reference view to be used as an anchor. It tries to find the view who has the
+     * maximum/minimum start/end (differs depending on if the container if RTL and the main axis
+     * direction) coordinate in the first visible flex line.
+     *
+     * @param itemCount the number of the items in this layout including invisible items
+     * @return the reference view
+     */
+    private View findFirstReferenceChild(int itemCount) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        View firstFound = findReferenceChild(0, getChildCount(), itemCount);
+        if (firstFound == null) {
+            return null;
+        }
+        int firstFoundPosition = getPosition(firstFound);
+        int firstFoundLinePosition = mFlexboxHelper.mIndexToFlexLine[firstFoundPosition];
+        if (firstFoundLinePosition == NO_POSITION) {
+            return null;
+        }
+        FlexLine firstFoundLine = mFlexLines.get(firstFoundLinePosition);
+        return findFirstReferenceViewInLine(firstFound, firstFoundLine);
+    }
+
+    /**
+     * Find the reference view to be used as an anchor. It tries to find the view who has the
+     * maximum/minimum start/end (differs depending on if the container if RTL and the main axis
+     * direction) coordinate in the last visible flex line.
+     *
+     * @param itemCount the number of the items in this layout including invisible items
+     * @return the reference view
+     */
+    private View findLastReferenceChild(int itemCount) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        View lastFound = findReferenceChild(getChildCount() - 1, -1, itemCount);
+        if (lastFound == null) {
+            return null;
+        }
+        int lastFoundPosition = getPosition(lastFound);
+        int lastFoundLinePosition = mFlexboxHelper.mIndexToFlexLine[lastFoundPosition];
+        FlexLine lastFoundLine = mFlexLines.get(lastFoundLinePosition);
+        return findLastReferenceViewInLine(lastFound, lastFoundLine);
+    }
+
+    /**
+     * Find a visible (or less preferred invisible) view within the given start and end index.
+     * Large part refers to the same method in LinearLayoutManager#findReferenceChild
+     *
+     * @param start     the start index within the range to find a view
+     * @param end       the end index within the range to find a view
+     * @param itemCount the item count
+     * @return the found view within the range of the given start and
+     */
+    private View findReferenceChild(int start, int end, int itemCount) {
+        ensureOrientationHelper();
+        ensureLayoutState();
+        View invalidMatch = null;
+        View outOfBoundsMatch = null;
+        int boundStart = mOrientationHelper.getStartAfterPadding();
+        int boundEnd = mOrientationHelper.getEndAfterPadding();
+        int diff = end > start ? 1 : -1;
+        for (int i = start; i != end; i += diff) {
+            View view = getChildAt(i);
+            if (view == null) {
+                continue;
+            }
+            int position = getPosition(view);
+            if (position >= 0 && position < itemCount) {
+                if (((RecyclerView.LayoutParams) view.getLayoutParams()).isItemRemoved()) {
+                    if (invalidMatch == null) {
+                        invalidMatch = view;
+                    }
+                } else if (mOrientationHelper.getDecoratedStart(view) < boundStart ||
+                        mOrientationHelper.getDecoratedEnd(view) > boundEnd) {
+                    if (outOfBoundsMatch == null) {
+                        outOfBoundsMatch = view;
+                    }
+                } else {
+                    return view;
+                }
+            }
+        }
+        return outOfBoundsMatch != null ? outOfBoundsMatch : invalidMatch;
+    }
+
+    private View getChildClosestToStart() {
+        // TODO: Find from end when mFlexWrap == FlexWrap.WRAP_REVERSE
+        return getChildAt(0);
+    }
+
+    /**
+     * Fills the remaining space defined by the layoutState on
+     * how many pixels should be filled (defined by {@link LayoutState#mAvailable}.
+     * The large part refers to the LinearLayoutManager#fill method except for the fill direction.
+     * Because FlexboxLayoutManager needs to care two scrolling directions:
+     * <li>
+     * <ul>Along the cross axis - When flex wrap is set to either FlexWrap.WRAP or
+     * FlexWrap.WRAP_REVERSE, the layout needs to scroll along the cross axis.</ul>
+     * <ul>Along the main axis - When flex wrap is set t FlexWrap.NOWRAP, the layout needs
+     * to scroll along the main axis if there are overflowing flex items.</ul>
+     * </li>
+     *
+     * @return the amount of pixels filled
+     */
+    private int fill(RecyclerView.Recycler recycler, RecyclerView.State state,
+            LayoutState layoutState) {
+        if (layoutState.mScrollingOffset != LayoutState.SCROLLING_OFFSET_NaN) {
+            if (layoutState.mAvailable < 0) {
+                layoutState.mScrollingOffset += layoutState.mAvailable;
+            }
+            recycleByLayoutState(recycler, layoutState);
+        }
+        int start = layoutState.mAvailable;
+        int remainingSpace = layoutState.mAvailable;
+        int consumed = 0;
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+        while ((remainingSpace > 0 || mLayoutState.mInfinite) &&
+                layoutState.hasMore(state, mFlexLines)) {
+            FlexLine flexLine = mFlexLines.get(layoutState.mFlexLinePosition);
+            layoutState.mPosition = flexLine.mFirstIndex;
+            consumed += layoutFlexLine(flexLine, layoutState);
+
+            if (!mainAxisHorizontal && mIsRtl) {
+                layoutState.mOffset -= flexLine.getCrossSize() * layoutState.mLayoutDirection;
+            } else {
+                layoutState.mOffset += flexLine.getCrossSize() * layoutState.mLayoutDirection;
+            }
+
+            remainingSpace -= flexLine.getCrossSize();
+        }
+        layoutState.mAvailable -= consumed;
+        if (layoutState.mScrollingOffset != LayoutState.SCROLLING_OFFSET_NaN) {
+            layoutState.mScrollingOffset += consumed;
+            if (layoutState.mAvailable < 0) {
+                layoutState.mScrollingOffset += layoutState.mAvailable;
+            }
+            recycleByLayoutState(recycler, layoutState);
+        }
+        return start - layoutState.mAvailable;
+    }
+
+    private void recycleByLayoutState(RecyclerView.Recycler recycler, LayoutState layoutState) {
+        if (!layoutState.mShouldRecycle) {
+            return;
+        }
+        if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+            // TODO: Consider the case mFlexWrap is set to nowrap and view is recycled individually
+            recycleFlexLinesFromEnd(recycler, layoutState);
+        } else {
+            recycleFlexLinesFromStart(recycler, layoutState);
+        }
+    }
+
+    private void recycleFlexLinesFromStart(RecyclerView.Recycler recycler,
+            LayoutState layoutState) {
+        if (layoutState.mScrollingOffset < 0) {
+            return;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int childCount = getChildCount();
+        if (childCount == 0) {
+            return;
+        }
+        View firstView = getChildAt(0);
+        if (firstView == null) {
+            return;
+        }
+        int currentLineIndex = mFlexboxHelper.mIndexToFlexLine[getPosition(firstView)];
+        if (currentLineIndex == NO_POSITION) {
+            return;
+        }
+        FlexLine flexLine = mFlexLines.get(currentLineIndex);
+        int recycleTo = -1;
+        for (int i = 0; i < childCount; i++) {
+            View view = getChildAt(i);
+            if (view == null) {
+                continue;
+            }
+            if (canViewBeRecycledFromStart(view, layoutState.mScrollingOffset)) {
+                if (flexLine.mLastIndex == getPosition(view)) {
+                    // Recycle the views in a flex line if all views end positions are lower than
+                    // the scrolling offset because the views are laid out as a flex line unit.
+                    // We need to also recycle the views as an unit of a flex line
+                    recycleTo = i;
+                    if (currentLineIndex >= mFlexLines.size() - 1) {
+                        // Reached to the last line
+                        break;
+                    } else {
+                        currentLineIndex += layoutState.mLayoutDirection;
+                        flexLine = mFlexLines.get(currentLineIndex);
+                    }
+                }
+            } else {
+                break;
+            }
+        }
+        recycleChildren(recycler, 0, recycleTo);
+    }
+
+    private boolean canViewBeRecycledFromStart(View view, int scrollingOffset) {
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            return mOrientationHelper.getEnd() -
+                    mOrientationHelper.getDecoratedStart(view) <= scrollingOffset;
+        } else {
+            return mOrientationHelper.getDecoratedEnd(view) <= scrollingOffset;
+        }
+    }
+
+    private void recycleFlexLinesFromEnd(RecyclerView.Recycler recycler, LayoutState layoutState) {
+        if (layoutState.mScrollingOffset < 0) {
+            return;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int childCount = getChildCount();
+        if (childCount == 0) {
+            return;
+        }
+
+        View lastView = getChildAt(childCount - 1);
+        if (lastView == null) {
+            return;
+        }
+        int currentLineIndex = mFlexboxHelper.mIndexToFlexLine[getPosition(lastView)];
+        if (currentLineIndex == NO_POSITION) {
+            return;
+        }
+        int recycleTo = childCount - 1;
+        int recycleFrom = childCount;
+        FlexLine flexLine = mFlexLines.get(currentLineIndex);
+        for (int i = childCount - 1; i >= 0; i--) {
+            View view = getChildAt(i);
+            if (view == null) {
+                continue;
+            }
+            if (canViewBeRecycledFromEnd(view, layoutState.mScrollingOffset)) {
+                if (flexLine.mFirstIndex == getPosition(view)) {
+                    // Recycle the views in a flex line if all views start positions are beyond the
+                    // limit because the views are laid out as a flex line unit. We need to also
+                    // recycle the views as an unit of a flex line
+                    recycleFrom = i;
+                    if (currentLineIndex <= 0) {
+                        // Reached to the first flex line
+                        break;
+                    } else {
+                        currentLineIndex += layoutState.mLayoutDirection;
+                        flexLine = mFlexLines.get(currentLineIndex);
+                    }
+                }
+            } else {
+                break;
+            }
+        }
+        recycleChildren(recycler, recycleFrom, recycleTo);
+    }
+
+    private boolean canViewBeRecycledFromEnd(View view, int scrollingOffset) {
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            return mOrientationHelper.getDecoratedEnd(view) <= scrollingOffset;
+        } else {
+            return mOrientationHelper.getDecoratedStart(view) >=
+                    mOrientationHelper.getEnd() - scrollingOffset;
+        }
+    }
+
+    /**
+     * Recycles children between given indices.
+     *
+     * @param startIndex inclusive
+     * @param endIndex   inclusive
+     */
+    private void recycleChildren(RecyclerView.Recycler recycler, int startIndex, int endIndex) {
+        for (int i = endIndex; i >= startIndex; i--) {
+            removeAndRecycleViewAt(i, recycler);
+        }
+    }
+
+    private int layoutFlexLine(FlexLine flexLine, LayoutState layoutState) {
+        if (isMainAxisDirectionHorizontal()) {
+            return layoutFlexLineMainAxisHorizontal(flexLine, layoutState);
+        } else {
+            return layoutFlexLineMainAxisVertical(flexLine, layoutState);
+        }
+    }
+
+    private int layoutFlexLineMainAxisHorizontal(FlexLine flexLine, LayoutState layoutState) {
+        assert mFlexboxHelper.mMeasureSpecCache != null;
+
+        int paddingLeft = getPaddingLeft();
+        int paddingRight = getPaddingRight();
+        int parentWidth = getWidth();
+
+        int childTop = layoutState.mOffset;
+        if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+            childTop = childTop - flexLine.mCrossSize;
+        }
+        int startPosition = layoutState.mPosition;
+
+        float childLeft;
+
+        // Only used when mIsRtl is true
+        float childRight;
+        float spaceBetweenItem = 0f;
+        switch (mJustifyContent) {
+            case JustifyContent.FLEX_START:
+                childLeft = paddingLeft;
+                childRight = parentWidth - paddingRight;
+                break;
+            case JustifyContent.FLEX_END:
+                childLeft = parentWidth - flexLine.mMainSize + paddingRight;
+                childRight = flexLine.mMainSize - paddingLeft;
+                break;
+            case JustifyContent.CENTER:
+                childLeft = paddingLeft + (parentWidth - flexLine.mMainSize) / 2f;
+                childRight = parentWidth - paddingRight - (parentWidth - flexLine.mMainSize) / 2f;
+                break;
+            case JustifyContent.SPACE_AROUND:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentWidth - flexLine.mMainSize)
+                            / (float) flexLine.mItemCount;
+                }
+                childLeft = paddingLeft + spaceBetweenItem / 2f;
+                childRight = parentWidth - paddingRight - spaceBetweenItem / 2f;
+                break;
+            case JustifyContent.SPACE_BETWEEN:
+                childLeft = paddingLeft;
+                float denominator = flexLine.mItemCount != 1 ? flexLine.mItemCount - 1 : 1f;
+                spaceBetweenItem = (parentWidth - flexLine.mMainSize) / denominator;
+                childRight = parentWidth - paddingRight;
+                break;
+            case JustifyContent.SPACE_EVENLY:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentWidth - flexLine.mMainSize)
+                            / (float) (flexLine.mItemCount + 1);
+                }
+                childLeft = paddingLeft + spaceBetweenItem;
+                childRight = parentWidth - paddingRight - spaceBetweenItem;
+                break;
+            default:
+                throw new IllegalStateException(
+                        "Invalid justifyContent is set: " + mJustifyContent);
+        }
+        childLeft -= mAnchorInfo.mPerpendicularCoordinate;
+        childRight -= mAnchorInfo.mPerpendicularCoordinate;
+        spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+        // Used only when mLayoutDirection == LayoutState.LAYOUT_START to remember the index
+        // a flex item should be inserted
+        int indexInFlexLine = 0;
+        for (int i = startPosition, itemCount = flexLine.getItemCount();
+                i < startPosition + itemCount; i++) {
+            View view = getFlexItemAt(i);
+            if (view == null) {
+                continue;
+            }
+
+            if (layoutState.mLayoutDirection == LayoutState.LAYOUT_END) {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view);
+            } else {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view, indexInFlexLine);
+                indexInFlexLine++;
+            }
+
+            // Retrieve the measure spec from the cache because the view may be re-created when
+            // retrieved from Recycler, in that case measured width/height are set to 0 even
+            // each visible child should be measured at least once in the FlexboxHelper
+            long measureSpec = mFlexboxHelper.mMeasureSpecCache[i];
+            int widthSpec = mFlexboxHelper.extractLowerInt(measureSpec);
+            int heightSpec = mFlexboxHelper.extractHigherInt(measureSpec);
+            LayoutParams lp = (LayoutParams) view.getLayoutParams();
+            if (shouldMeasureChild(view, widthSpec, heightSpec, lp)) {
+                view.measure(widthSpec, heightSpec);
+            }
+
+            childLeft += (lp.leftMargin + getLeftDecorationWidth(view));
+            childRight -= (lp.rightMargin + getRightDecorationWidth(view));
+
+            int topWithDecoration = childTop + getTopDecorationHeight(view);
+            if (mIsRtl) {
+                mFlexboxHelper.layoutSingleChildHorizontal(view, flexLine,
+                        Math.round(childRight) - view.getMeasuredWidth(),
+                        topWithDecoration, Math.round(childRight),
+                        topWithDecoration + view.getMeasuredHeight());
+            } else {
+                mFlexboxHelper.layoutSingleChildHorizontal(view, flexLine,
+                        Math.round(childLeft), topWithDecoration,
+                        Math.round(childLeft) + view.getMeasuredWidth(),
+                        topWithDecoration + view.getMeasuredHeight());
+            }
+            childLeft += (view.getMeasuredWidth() + lp.rightMargin + getRightDecorationWidth(view)
+                    + spaceBetweenItem);
+            childRight -= (view.getMeasuredWidth() + lp.leftMargin + getLeftDecorationWidth(view)
+                    + spaceBetweenItem);
+        }
+        layoutState.mFlexLinePosition += mLayoutState.mLayoutDirection;
+        return flexLine.getCrossSize();
+    }
+
+    private int layoutFlexLineMainAxisVertical(FlexLine flexLine, LayoutState layoutState) {
+        assert mFlexboxHelper.mMeasureSpecCache != null;
+
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+        int parentHeight = getHeight();
+
+        int childLeft = layoutState.mOffset;
+        // childRight is used only for the layout is RTL
+        int childRight = layoutState.mOffset;
+        if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+            childLeft = childLeft - flexLine.mCrossSize;
+            childRight = childRight + flexLine.mCrossSize;
+        }
+        int startPosition = layoutState.mPosition;
+
+        float childTop;
+
+        // Only used when mFromBottomToTop is true
+        float childBottom;
+        float spaceBetweenItem = 0f;
+        switch (mJustifyContent) {
+            case JustifyContent.FLEX_START:
+                childTop = paddingTop;
+                childBottom = parentHeight - paddingBottom;
+                break;
+            case JustifyContent.FLEX_END:
+                childTop = parentHeight - flexLine.mMainSize + paddingBottom;
+                childBottom = flexLine.mMainSize - paddingTop;
+                break;
+            case JustifyContent.CENTER:
+                childTop = paddingTop + (parentHeight - flexLine.mMainSize) / 2f;
+                childBottom = parentHeight - paddingBottom
+                        - (parentHeight - flexLine.mMainSize) / 2f;
+                break;
+            case JustifyContent.SPACE_AROUND:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentHeight - flexLine.mMainSize)
+                            / (float) flexLine.mItemCount;
+                }
+                childTop = paddingTop + spaceBetweenItem / 2f;
+                childBottom = parentHeight - paddingBottom - spaceBetweenItem / 2f;
+                break;
+            case JustifyContent.SPACE_BETWEEN:
+                childTop = paddingTop;
+                float denominator = flexLine.mItemCount != 1 ? flexLine.mItemCount - 1 : 1f;
+                spaceBetweenItem = (parentHeight - flexLine.mMainSize) / denominator;
+                childBottom = parentHeight - paddingBottom;
+                break;
+            case JustifyContent.SPACE_EVENLY:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentHeight - flexLine.mMainSize)
+                            / (float) (flexLine.mItemCount + 1);
+                }
+                childTop = paddingTop + spaceBetweenItem;
+                childBottom = parentHeight - paddingBottom - spaceBetweenItem;
+                break;
+            default:
+                throw new IllegalStateException(
+                        "Invalid justifyContent is set: " + mJustifyContent);
+        }
+        childTop -= mAnchorInfo.mPerpendicularCoordinate;
+        childBottom -= mAnchorInfo.mPerpendicularCoordinate;
+        spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+        // Used only when mLayoutDirection == LayoutState.LAYOUT_START to remember the index
+        // a flex item should be inserted
+        int indexInFlexLine = 0;
+        for (int i = startPosition, itemCount = flexLine.getItemCount();
+                i < startPosition + itemCount; i++) {
+            View view = getFlexItemAt(i);
+            if (view == null) {
+                continue;
+            }
+
+            // Retrieve the measure spec from the cache because the view may be re-created when
+            // retrieved from Recycler, in that case measured width/height are set to 0 even
+            // each visible child should be measured at least once in the FlexboxHelper
+            long measureSpec = mFlexboxHelper.mMeasureSpecCache[i];
+            int widthSpec = mFlexboxHelper.extractLowerInt(measureSpec);
+            int heightSpec = mFlexboxHelper.extractHigherInt(measureSpec);
+            LayoutParams lp = (LayoutParams) view.getLayoutParams();
+            if (shouldMeasureChild(view, widthSpec, heightSpec, lp)) {
+                view.measure(widthSpec, heightSpec);
+            }
+
+            childTop += (lp.topMargin + getTopDecorationHeight(view));
+            childBottom -= (lp.rightMargin + getBottomDecorationHeight(view));
+
+            if (layoutState.mLayoutDirection == LayoutState.LAYOUT_END) {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view);
+            } else {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view, indexInFlexLine);
+                indexInFlexLine++;
+            }
+
+            int leftWithDecoration = childLeft + getLeftDecorationWidth(view);
+            int rightWithDecoration = childRight - getRightDecorationWidth(view);
+            if (mIsRtl) {
+                if (mFromBottomToTop) {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            rightWithDecoration - view.getMeasuredWidth(),
+                            Math.round(childBottom) - view.getMeasuredHeight(),
+                            rightWithDecoration, Math.round(childBottom));
+                } else {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            rightWithDecoration - view.getMeasuredWidth(),
+                            Math.round(childTop), rightWithDecoration,
+                            Math.round(childTop) + view.getMeasuredHeight());
+                }
+            } else {
+                if (mFromBottomToTop) {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            leftWithDecoration, Math.round(childBottom) - view.getMeasuredHeight(),
+                            leftWithDecoration + view.getMeasuredWidth(), Math.round(childBottom));
+                } else {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            leftWithDecoration, Math.round(childTop),
+                            leftWithDecoration + view.getMeasuredWidth(),
+                            Math.round(childTop) + view.getMeasuredHeight());
+                }
+            }
+            childTop += (view.getMeasuredHeight() + lp.topMargin + getBottomDecorationHeight(view)
+                    + spaceBetweenItem);
+            childBottom -= (view.getMeasuredHeight() + lp.bottomMargin +
+                    getTopDecorationHeight(view) + spaceBetweenItem);
+        }
+        layoutState.mFlexLinePosition += mLayoutState.mLayoutDirection;
+        return flexLine.getCrossSize();
+    }
+
+    @Override
+    public boolean isMainAxisDirectionHorizontal() {
+        return mFlexDirection == FlexDirection.ROW || mFlexDirection == FlexDirection.ROW_REVERSE;
+    }
+
+
+    /**
+     * Update the layout state based on the anchor information.
+     * The view holders are going to be filled toward the end position (bottom if the main axis
+     * direction is horizontal, right if the main axis direction if vertical).
+     *
+     * @param anchorInfo       the anchor information where layout should start
+     * @param fromNextLine     if set to {@code true}, layout starts from the next flex line set to
+     *                         the anchor information
+     * @param considerInfinite if set to {@code true}, the judgement if the infinite available
+     *                         space
+     *                         needs to be considered.
+     */
+    private void updateLayoutStateToFillEnd(AnchorInfo anchorInfo, boolean fromNextLine,
+            boolean considerInfinite) {
+        if (considerInfinite) {
+            resolveInfiniteAmount();
+        } else {
+            mLayoutState.mInfinite = false;
+        }
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            mLayoutState.mAvailable = anchorInfo.mCoordinate - getPaddingRight();
+        } else {
+            mLayoutState.mAvailable =
+                    mOrientationHelper.getEndAfterPadding() - anchorInfo.mCoordinate;
+        }
+        mLayoutState.mPosition = anchorInfo.mPosition;
+        mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+        mLayoutState.mLayoutDirection = LayoutState.LAYOUT_END;
+        mLayoutState.mOffset = anchorInfo.mCoordinate;
+        mLayoutState.mScrollingOffset = LayoutState.SCROLLING_OFFSET_NaN;
+        mLayoutState.mFlexLinePosition = anchorInfo.mFlexLinePosition;
+
+        if (fromNextLine
+                && mFlexLines.size() > 1
+                && anchorInfo.mFlexLinePosition >= 0
+                && anchorInfo.mFlexLinePosition < mFlexLines.size() - 1) {
+            FlexLine currentLine = mFlexLines.get(anchorInfo.mFlexLinePosition);
+            mLayoutState.mFlexLinePosition++;
+            mLayoutState.mPosition += currentLine.getItemCount();
+        }
+    }
+
+    /**
+     * Update the layout state based on the anchor information.
+     * The view holders are going to be filled toward the start position (top if the main axis
+     * direction is horizontal, left if the main axis direction if vertical).
+     *
+     * @param anchorInfo       the anchor information where layout should start
+     * @param fromPreviousLine if set to {@code true}, layout starts from the next flex line set to
+     *                         the anchor information
+     * @param considerInfinite if set to {@code true}, the judgement if the infinite available
+     *                         space
+     *                         needs to be considered.
+     */
+    private void updateLayoutStateToFillStart(AnchorInfo anchorInfo, boolean fromPreviousLine,
+            boolean considerInfinite) {
+        if (considerInfinite) {
+            resolveInfiniteAmount();
+        } else {
+            mLayoutState.mInfinite = false;
+        }
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            mLayoutState.mAvailable = mParent.getWidth() - anchorInfo.mCoordinate
+                    - mOrientationHelper.getStartAfterPadding();
+        } else {
+            mLayoutState.mAvailable = anchorInfo.mCoordinate - mOrientationHelper
+                    .getStartAfterPadding();
+        }
+        mLayoutState.mPosition = anchorInfo.mPosition;
+        mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+        mLayoutState.mLayoutDirection = LayoutState.LAYOUT_START;
+        mLayoutState.mOffset = anchorInfo.mCoordinate;
+        mLayoutState.mScrollingOffset = LayoutState.SCROLLING_OFFSET_NaN;
+        mLayoutState.mFlexLinePosition = anchorInfo.mFlexLinePosition;
+
+        if (fromPreviousLine && anchorInfo.mFlexLinePosition > 0
+                && mFlexLines.size() > anchorInfo.mFlexLinePosition) {
+            FlexLine currentLine = mFlexLines.get(anchorInfo.mFlexLinePosition);
+            mLayoutState.mFlexLinePosition--;
+            mLayoutState.mPosition -= currentLine.getItemCount();
+        }
+    }
+
+    private void resolveInfiniteAmount() {
+        int crossMode;
+        if (isMainAxisDirectionHorizontal()) {
+            crossMode = getHeightMode();
+        } else {
+            crossMode = getWidthMode();
+        }
+        // Setting the infinite flag so that the LayoutManager tries to fill the available space
+        // as much as possible. E.g. this is needed in the case RecyclerView is wrapped with another
+        // scrollable container (another RecyclerView or ScrollView) on the condition
+        // layout_height="wrap_content" and flexDirection="row". In such a case, the height of the
+        // inner RecyclerView (attached RecyclerView for this LayoutManager) is set to 0 at this
+        // moment, so the value of the mAvailable doesn't have enough value enough to put the
+        // already calculated flex lines.
+        mLayoutState.mInfinite =
+                crossMode == View.MeasureSpec.UNSPECIFIED || crossMode == View.MeasureSpec.AT_MOST;
+    }
+
+    private void ensureOrientationHelper() {
+        if (mOrientationHelper != null) {
+            return;
+        }
+        // There are two cases for each of main axis direction. In either case the scroll happens
+        // along the cross axis:
+        // -- Scroll vertically when mFlexWrap != FlexWrap.NOWRAP. In this case scroll happens
+        //    along the cross axis
+        //
+        // When scroll direction is vertical:
+        // -- Scroll horizontally when mFlexWrap != FlexWrap.NOWRAP. In this case scroll happens
+        //    along the cross axis
+        if (isMainAxisDirectionHorizontal()) {
+            if (mFlexWrap == FlexWrap.NOWRAP) {
+                mOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createVerticalHelper(this);
+            } else {
+                mOrientationHelper = OrientationHelper.createVerticalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+            }
+        } else {
+            if (mFlexWrap == FlexWrap.NOWRAP) {
+                mOrientationHelper = OrientationHelper.createVerticalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+            } else {
+                mOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createVerticalHelper(this);
+            }
+        }
+    }
+
+    private void ensureLayoutState() {
+        if (mLayoutState == null) {
+            mLayoutState = new LayoutState();
+        }
+    }
+
+    @Override
+    public void scrollToPosition(int position) {
+        mPendingScrollPosition = position;
+        mPendingScrollPositionOffset = INVALID_OFFSET;
+        if (mPendingSavedState != null) {
+            mPendingSavedState.invalidateAnchor();
+        }
+        requestLayout();
+    }
+
+    @Override
+    public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state,
+            int position) {
+        LinearSmoothScroller smoothScroller =
+                new LinearSmoothScroller(recyclerView.getContext());
+        smoothScroller.setTargetPosition(position);
+        startSmoothScroll(smoothScroller);
+    }
+
+    /**
+     * @return true if LayoutManager will recycle its children when it is detached from
+     * RecyclerView.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public boolean getRecycleChildrenOnDetach() {
+        return mRecycleChildrenOnDetach;
+    }
+
+    /**
+     * Set whether this LayoutManager will recycle its children when it is detached from
+     * RecyclerView.
+     * <p>
+     * If you are using a {@link RecyclerView.RecycledViewPool}, it might be a good idea to set
+     * this flag to <code>true</code> so that views will be available to other RecyclerViews
+     * immediately.
+     * <p>
+     * Note that, setting this flag will result in a performance drop if RecyclerView
+     * is restored.
+     *
+     * @param recycleChildrenOnDetach Whether children should be recycled in detach or not.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setRecycleChildrenOnDetach(boolean recycleChildrenOnDetach) {
+        mRecycleChildrenOnDetach = recycleChildrenOnDetach;
+    }
+
+    @Override
+    public void onAttachedToWindow(RecyclerView recyclerView) {
+        super.onAttachedToWindow(recyclerView);
+        mParent = (View) recyclerView.getParent();
+    }
+
+    @Override
+    public void onDetachedFromWindow(RecyclerView view, RecyclerView.Recycler recycler) {
+        super.onDetachedFromWindow(view, recycler);
+        if (mRecycleChildrenOnDetach) {
+            if (DEBUG) {
+                Log.d(TAG, "onDetachedFromWindow. Recycling children in the recycler");
+            }
+            removeAndRecycleAllViews(recycler);
+            recycler.clear();
+        }
+    }
+
+    @Override
+    public boolean canScrollHorizontally() {
+        if (mFlexWrap == FlexWrap.NOWRAP) {
+            return isMainAxisDirectionHorizontal();
+        } else {
+            return !isMainAxisDirectionHorizontal() || getWidth() > (mParent != null ? mParent.getWidth() : 0);
+        }
+    }
+
+    @Override
+    public boolean canScrollVertically() {
+        if (mFlexWrap == FlexWrap.NOWRAP) {
+            return !isMainAxisDirectionHorizontal();
+        } else {
+            return isMainAxisDirectionHorizontal() || getHeight() > (mParent != null ? mParent.getHeight() : 0);
+        }
+    }
+
+    @Override
+    public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler,
+            RecyclerView.State state) {
+        if (!isMainAxisDirectionHorizontal() || (mFlexWrap == FlexWrap.NOWRAP)) {
+            int scrolled = handleScrollingMainOrientation(dx, recycler, state);
+            mViewCache.clear();
+            return scrolled;
+        } else {
+            int scrolled = handleScrollingSubOrientation(dx);
+            mAnchorInfo.mPerpendicularCoordinate += scrolled;
+            mSubOrientationHelper.offsetChildren(-scrolled);
+            return scrolled;
+        }
+    }
+
+    @Override
+    public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler,
+            RecyclerView.State state) {
+        if (isMainAxisDirectionHorizontal() ||
+                (mFlexWrap == FlexWrap.NOWRAP && !isMainAxisDirectionHorizontal())) {
+            int scrolled = handleScrollingMainOrientation(dy, recycler, state);
+            mViewCache.clear();
+            return scrolled;
+        } else {
+            int scrolled = handleScrollingSubOrientation(dy);
+            mAnchorInfo.mPerpendicularCoordinate += scrolled;
+            mSubOrientationHelper.offsetChildren(-scrolled);
+            return scrolled;
+        }
+    }
+
+    /**
+     * Handle the scrolling along the direction of {@link #mOrientationHelper}.
+     *
+     * @param delta    the delta for the amount that is being scrolled
+     *                 (either horizontally or vertically)
+     * @param recycler the Recycler instance
+     * @param state    the Recycler.State instance
+     * @return the amount actually scrolled
+     */
+    private int handleScrollingMainOrientation(int delta, RecyclerView.Recycler recycler,
+            RecyclerView.State state) {
+        if (getChildCount() == 0 || delta == 0) {
+            return 0;
+        }
+        ensureOrientationHelper();
+        mLayoutState.mShouldRecycle = true;
+        int layoutDirection;
+        boolean columnAndRtl = !isMainAxisDirectionHorizontal() && mIsRtl;
+        if (columnAndRtl) {
+            layoutDirection = delta < 0 ? LayoutState.LAYOUT_END : LayoutState.LAYOUT_START;
+        } else {
+            layoutDirection = delta > 0 ? LayoutState.LAYOUT_END : LayoutState.LAYOUT_START;
+        }
+        int absDelta = Math.abs(delta);
+
+        updateLayoutState(layoutDirection, absDelta);
+
+        int freeScroll = mLayoutState.mScrollingOffset;
+        int consumed = freeScroll + fill(recycler, state, mLayoutState);
+        if (consumed < 0) {
+            return 0;
+        }
+        int scrolled;
+        if (columnAndRtl) {
+            scrolled = absDelta > consumed ? -layoutDirection * consumed : delta;
+        } else {
+            scrolled = absDelta > consumed ? layoutDirection * consumed : delta;
+        }
+        mOrientationHelper.offsetChildren(-scrolled);
+        mLayoutState.mLastScrollDelta = scrolled;
+        return scrolled;
+    }
+
+    /**
+     * Handle the scrolling along the direction of {@link #mSubOrientationHelper}.
+     *
+     * @param delta    the delta for the amount that is being scrolled
+     *                 (either horizontally or vertically)
+     * @return  the amount actually scrolled
+     */
+    private int handleScrollingSubOrientation(int delta) {
+        if (getChildCount() == 0 || delta == 0) {
+            return 0;
+        }
+        ensureOrientationHelper();
+        boolean isMainAxisHorizontal = isMainAxisDirectionHorizontal();
+        int parentLength = isMainAxisHorizontal ? mParent.getWidth() : mParent.getHeight();
+        int mainAxisLength = isMainAxisHorizontal ? getWidth() : getHeight();
+
+        boolean layoutRtl = getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL;
+        if (layoutRtl) {
+            int absDelta = Math.abs(delta);
+            if (delta < 0) {
+                delta = Math.min(mainAxisLength
+                        + mAnchorInfo.mPerpendicularCoordinate - parentLength, absDelta);
+                delta = -delta;
+            } else {
+                delta = mAnchorInfo.mPerpendicularCoordinate + delta > 0
+                        ? -mAnchorInfo.mPerpendicularCoordinate
+                        : delta;
+            }
+        } else {
+            if (delta > 0) {
+                delta = Math.min(mainAxisLength
+                        - mAnchorInfo.mPerpendicularCoordinate - parentLength, delta);
+            } else {
+                delta = mAnchorInfo.mPerpendicularCoordinate + delta >= 0 ? delta :
+                        -mAnchorInfo.mPerpendicularCoordinate;
+            }
+        }
+        return delta;
+    }
+
+    /**
+     * Update the layout state as part of the scrolling. This method also update the flex lines
+     * enough to display the view port including the delta of the scroll.
+     *
+     * @param layoutDirection the layout direction value. Either of {@link LayoutState#LAYOUT_END}
+     *                        or {@link LayoutState#LAYOUT_START}
+     * @param absDelta        the absolute value of the delta that is about to be scrolled.
+     */
+    private void updateLayoutState(int layoutDirection, int absDelta) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        mLayoutState.mLayoutDirection = layoutDirection;
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+
+        //noinspection ResourceType
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(getWidth(), getWidthMode());
+        //noinspection ResourceType
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(getHeight(), getHeightMode());
+        boolean columnAndRtl = !mainAxisHorizontal && mIsRtl;
+        if (layoutDirection == LayoutState.LAYOUT_END) {
+            View lastVisible = getChildAt(getChildCount() - 1);
+            if (lastVisible == null) {
+                return;
+            }
+            mLayoutState.mOffset = mOrientationHelper.getDecoratedEnd(lastVisible);
+            int lastVisiblePosition = getPosition(lastVisible);
+            int lastVisibleLinePosition = mFlexboxHelper.mIndexToFlexLine[lastVisiblePosition];
+            FlexLine lastVisibleLine = mFlexLines.get(lastVisibleLinePosition);
+
+            // The reference view which has the maximum end (or minimum if the layout is RTL and
+            // the main axis direction is horizontal) coordinate in  the last visible flex line.
+            View referenceView = findLastReferenceViewInLine(lastVisible, lastVisibleLine);
+            mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+            mLayoutState.mPosition = lastVisiblePosition + mLayoutState.mItemDirection;
+            if (mFlexboxHelper.mIndexToFlexLine.length <= mLayoutState.mPosition) {
+                mLayoutState.mFlexLinePosition = NO_POSITION;
+            } else {
+                mLayoutState.mFlexLinePosition
+                        = mFlexboxHelper.mIndexToFlexLine[mLayoutState.mPosition];
+            }
+
+            if (columnAndRtl) {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedStart(referenceView);
+                mLayoutState.mScrollingOffset = -mOrientationHelper.getDecoratedStart(referenceView)
+                        + mOrientationHelper.getStartAfterPadding();
+                mLayoutState.mScrollingOffset = Math.max(mLayoutState.mScrollingOffset, 0);
+            } else {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedEnd(referenceView);
+                mLayoutState.mScrollingOffset = mOrientationHelper.getDecoratedEnd(referenceView)
+                        - mOrientationHelper.getEndAfterPadding();
+            }
+
+            if ((mLayoutState.mFlexLinePosition == NO_POSITION
+                    || mLayoutState.mFlexLinePosition > mFlexLines.size() - 1) &&
+                    mLayoutState.mPosition <= getFlexItemCount()) {
+                // If the RecyclerView tries to scroll beyond the already calculated
+                // flex container, need to calculate beyond the amount that needs to be filled
+
+                int needsToFill = absDelta - mLayoutState.mScrollingOffset;
+                mFlexLinesResult.reset();
+                if (needsToFill > 0) {
+                    if (mainAxisHorizontal) {
+                        mFlexboxHelper.calculateHorizontalFlexLines(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec, needsToFill,
+                                mLayoutState.mPosition, mFlexLines);
+                    } else {
+                        mFlexboxHelper.calculateVerticalFlexLines(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec, needsToFill,
+                                mLayoutState.mPosition, mFlexLines);
+                    }
+                    mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec,
+                            mLayoutState.mPosition);
+                    mFlexboxHelper.stretchViews(mLayoutState.mPosition);
+                }
+            }
+        } else {
+            View firstVisible = getChildAt(0);
+            if (firstVisible == null) {
+                return;
+            }
+            mLayoutState.mOffset = mOrientationHelper.getDecoratedStart(firstVisible);
+            int firstVisiblePosition = getPosition(firstVisible);
+            int firstVisibleLinePosition = mFlexboxHelper.mIndexToFlexLine[firstVisiblePosition];
+            FlexLine firstVisibleLine = mFlexLines.get(firstVisibleLinePosition);
+
+            // The reference view which has the minimum start (or maximum if the layout is RTL and
+            // the main axis direction is horizontal) coordinate in the first visible flex line
+            View referenceView = findFirstReferenceViewInLine(firstVisible, firstVisibleLine);
+
+            mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+            int flexLinePosition = mFlexboxHelper.mIndexToFlexLine[firstVisiblePosition];
+            if (flexLinePosition == NO_POSITION) {
+                flexLinePosition = 0;
+            }
+            if (flexLinePosition > 0) {
+                FlexLine previousLine = mFlexLines.get(flexLinePosition - 1);
+                // The position of the next item toward start should be on the next flex line,
+                // shifting the position by the number of the items in the previous line.
+                mLayoutState.mPosition = firstVisiblePosition - previousLine.getItemCount();
+            } else {
+                mLayoutState.mPosition = NO_POSITION;
+            }
+            mLayoutState.mFlexLinePosition = flexLinePosition > 0 ? flexLinePosition - 1 : 0;
+
+            if (columnAndRtl) {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedEnd(referenceView);
+                mLayoutState.mScrollingOffset = mOrientationHelper.getDecoratedEnd(referenceView)
+                        - mOrientationHelper.getEndAfterPadding();
+                mLayoutState.mScrollingOffset = Math.max(mLayoutState.mScrollingOffset, 0);
+            } else {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedStart(referenceView);
+                mLayoutState.mScrollingOffset = -mOrientationHelper.getDecoratedStart(referenceView)
+                        + mOrientationHelper.getStartAfterPadding();
+            }
+        }
+        mLayoutState.mAvailable = absDelta - mLayoutState.mScrollingOffset;
+    }
+
+    /**
+     * Loop through the first visible flex line to find the reference view, which has the minimum
+     * start (or maximum if the layout is RTL and main axis direction is horizontal) coordinate.
+     *
+     * @param firstView        the first visible view
+     * @param firstVisibleLine the first visible flex line
+     * @return the reference view
+     */
+    private View findFirstReferenceViewInLine(View firstView, FlexLine firstVisibleLine) {
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+        View referenceView = firstView;
+        for (int i = 1, to = firstVisibleLine.mItemCount;
+                i < to; i++) {
+            View viewInSameLine = getChildAt(i);
+            if (viewInSameLine == null || viewInSameLine.getVisibility() == View.GONE) {
+                continue;
+            }
+            if (mIsRtl && !mainAxisHorizontal) {
+                if (mOrientationHelper.getDecoratedEnd(referenceView)
+                        < mOrientationHelper.getDecoratedEnd(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            } else {
+                if (mOrientationHelper.getDecoratedStart(referenceView)
+                        > mOrientationHelper.getDecoratedStart(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            }
+        }
+        return referenceView;
+    }
+
+    /**
+     * Loop through the last visible flex line to find the reference view, which has the maximum
+     * end (or minimum if the layout is RTL and main axis direction is horizontal) coordinate.
+     *
+     * @param lastView        the last visible view
+     * @param lastVisibleLine the last visible flex line
+     * @return the reference view
+     */
+    private View findLastReferenceViewInLine(View lastView, FlexLine lastVisibleLine) {
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+        View referenceView = lastView;
+        for (int i = getChildCount() - 2, to = getChildCount() - lastVisibleLine.mItemCount - 1;
+                i > to; i--) {
+            View viewInSameLine = getChildAt(i);
+            if (viewInSameLine == null || viewInSameLine.getVisibility() == View.GONE) {
+                continue;
+            }
+            if (mIsRtl && !mainAxisHorizontal) {
+                // The end edge of the view is left, should be the minimum left edge
+                // where the next view should be placed
+                if (mOrientationHelper.getDecoratedStart(referenceView) >
+                        mOrientationHelper.getDecoratedStart(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            } else {
+                if (mOrientationHelper.getDecoratedEnd(referenceView) <
+                        mOrientationHelper.getDecoratedEnd(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            }
+        }
+        return referenceView;
+    }
+
+    @Override
+    public int computeHorizontalScrollExtent(@NonNull RecyclerView.State state) {
+        int scrollExtent = computeScrollExtent(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeHorizontalScrollExtent: " + scrollExtent);
+        }
+        return scrollExtent;
+    }
+
+    @Override
+    public int computeVerticalScrollExtent(@NonNull RecyclerView.State state) {
+        int scrollExtent = computeScrollExtent(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeVerticalScrollExtent: " + scrollExtent);
+        }
+        return scrollExtent;
+    }
+
+    private int computeScrollExtent(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        int allChildrenCount = state.getItemCount();
+        ensureOrientationHelper();
+        View firstReferenceView = findFirstReferenceChild(allChildrenCount);
+        View lastReferenceView = findLastReferenceChild(allChildrenCount);
+        if (state.getItemCount() == 0 || firstReferenceView == null || lastReferenceView == null) {
+            return 0;
+        }
+        // TODO: Need to consider the reverse pattern when flexWrap == wrap_reverse is implemented
+        int extend = mOrientationHelper.getDecoratedEnd(lastReferenceView) -
+                mOrientationHelper.getDecoratedStart(firstReferenceView);
+        return Math.min(mOrientationHelper.getTotalSpace(), extend);
+    }
+
+    @Override
+    public int computeHorizontalScrollOffset(@NonNull RecyclerView.State state) {
+        int scrollOffset = computeScrollOffset(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeHorizontalScrollOffset: " + scrollOffset);
+        }
+        return scrollOffset;
+    }
+
+    @Override
+    public int computeVerticalScrollOffset(@NonNull RecyclerView.State state) {
+        int scrollOffset = computeScrollOffset(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeVerticalScrollOffset: " + scrollOffset);
+        }
+        return scrollOffset;
+    }
+
+    private int computeScrollOffset(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        int allChildrenCount = state.getItemCount();
+        View firstReferenceView = findFirstReferenceChild(allChildrenCount);
+        View lastReferenceView = findLastReferenceChild(allChildrenCount);
+        if (state.getItemCount() == 0 || firstReferenceView == null || lastReferenceView == null) {
+            return 0;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int minPosition = getPosition(firstReferenceView);
+        int maxPosition = getPosition(lastReferenceView);
+        int laidOutArea = Math.abs(mOrientationHelper.getDecoratedEnd(lastReferenceView) -
+                mOrientationHelper.getDecoratedStart(firstReferenceView));
+        int firstLinePosition = mFlexboxHelper.mIndexToFlexLine[minPosition];
+        if (firstLinePosition == 0 || firstLinePosition == NO_POSITION) {
+            return 0;
+        }
+        int lastLinePosition = mFlexboxHelper.mIndexToFlexLine[maxPosition];
+        int lineRange = lastLinePosition - firstLinePosition + 1;
+        float averageSizePerLine = (float) laidOutArea / lineRange;
+        // The number of lines before the first line is equal to the value of firstLinePosition
+        return Math.round(
+                firstLinePosition * averageSizePerLine + (mOrientationHelper.getStartAfterPadding()
+                        - mOrientationHelper.getDecoratedStart(firstReferenceView)));
+    }
+
+    @Override
+    public int computeHorizontalScrollRange(@NonNull RecyclerView.State state) {
+        int scrollRange = computeScrollRange(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeHorizontalScrollRange: " + scrollRange);
+        }
+        return scrollRange;
+    }
+
+    @Override
+    public int computeVerticalScrollRange(@NonNull RecyclerView.State state) {
+        int scrollRange = computeScrollRange(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeVerticalScrollRange: " + scrollRange);
+        }
+        return scrollRange;
+    }
+
+    /**
+     * @return the estimate total length of the flex container.
+     * Note that this method estimates the length by using the number of the visible items and the
+     * rest of the non-visible items. So the value returned by this method isn't the exact length
+     * of the container. So the scroll bar position may be slightly different from the actual
+     * expected position
+     */
+    private int computeScrollRange(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        int allItemCount = state.getItemCount();
+        View firstReferenceView = findFirstReferenceChild(allItemCount);
+        View lastReferenceView = findLastReferenceChild(allItemCount);
+        if (state.getItemCount() == 0 || firstReferenceView == null || lastReferenceView == null) {
+            return 0;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int firstVisiblePosition = findFirstVisibleItemPosition();
+        int lastVisiblePosition = findLastVisibleItemPosition();
+        int laidOutArea = Math.abs(mOrientationHelper.getDecoratedEnd(lastReferenceView) -
+                mOrientationHelper.getDecoratedStart(firstReferenceView));
+        int laidOutRange = lastVisiblePosition - firstVisiblePosition + 1;
+        return (int) ((float) laidOutArea / laidOutRange * state.getItemCount());
+    }
+
+    /**
+     * Copied from {@link RecyclerView.LayoutManager#shouldMeasureChild
+     * (View,
+     * int, int, RecyclerView.LayoutParams)}}
+     */
+    private boolean shouldMeasureChild(View child, int widthSpec, int heightSpec,
+            RecyclerView.LayoutParams lp) {
+        return child.isLayoutRequested()
+                || !isMeasurementCacheEnabled()
+                || !isMeasurementUpToDate(child.getWidth(), widthSpec, lp.width)
+                || !isMeasurementUpToDate(child.getHeight(), heightSpec, lp.height);
+    }
+
+    /**
+     * Copied from
+     * {@link RecyclerView.LayoutManager#isMeasurementUpToDate(int, int,
+     * int)}
+     */
+    private static boolean isMeasurementUpToDate(int childSize, int spec, int dimension) {
+        final int specMode = View.MeasureSpec.getMode(spec);
+        final int specSize = View.MeasureSpec.getSize(spec);
+        if (dimension > 0 && childSize != dimension) {
+            return false;
+        }
+        switch (specMode) {
+            case View.MeasureSpec.UNSPECIFIED:
+                return true;
+            case View.MeasureSpec.AT_MOST:
+                return specSize >= childSize;
+            case View.MeasureSpec.EXACTLY:
+                return specSize == childSize;
+        }
+        return false;
+    }
+
+    private void clearFlexLines() {
+        mFlexLines.clear();
+        mAnchorInfo.reset();
+        mAnchorInfo.mPerpendicularCoordinate = 0;
+    }
+
+    private int getChildLeft(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedLeft(view) - params.leftMargin;
+    }
+
+    private int getChildRight(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedRight(view) + params.rightMargin;
+    }
+
+    private int getChildTop(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedTop(view) - params.topMargin;
+    }
+
+    private int getChildBottom(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedBottom(view) + params.bottomMargin;
+    }
+
+    /**
+     * @param view              the view to be examined if it's visible
+     * @param completelyVisible when passed as {@code true}, this method checks if the view bounds
+     *                          don't overlap the bounds of the RecyclerView. When passed as
+     *                          {@code false}, this method checks if the view bounds are partially
+     *                          visible within the RecyclerView.
+     * @return if the view passed as an argument is visible (view bounds are within the parent
+     * RecyclerView)
+     */
+    private boolean isViewVisible(View view, boolean completelyVisible) {
+        int left = getPaddingLeft();
+        int top = getPaddingTop();
+        int right = getWidth() - getPaddingRight();
+        int bottom = getHeight() - getPaddingBottom();
+        int childLeft = getChildLeft(view);
+        int childTop = getChildTop(view);
+        int childRight = getChildRight(view);
+        int childBottom = getChildBottom(view);
+
+        boolean horizontalCompletelyVisible = false;
+        boolean horizontalPartiallyVisible = false;
+        boolean verticalCompletelyVisible = false;
+        boolean verticalPartiallyVisible = false;
+        if (left <= childLeft && right >= childRight) {
+            horizontalCompletelyVisible = true;
+        }
+        if (childLeft >= right || childRight >= left) {
+            horizontalPartiallyVisible = true;
+        }
+
+        if (top <= childTop && bottom >= childBottom) {
+            verticalCompletelyVisible = true;
+        }
+        if (childTop >= bottom || childBottom >= top) {
+            verticalPartiallyVisible = true;
+        }
+        if (completelyVisible) {
+            return horizontalCompletelyVisible && verticalCompletelyVisible;
+        } else {
+            return horizontalPartiallyVisible && verticalPartiallyVisible;
+        }
+    }
+
+    /**
+     * Returns the adapter position of the first visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * If RecyclerView has item decorators, they will be considered in calculations as well.
+     * LayoutManager may pre-cache some views that are not necessarily visible. Those views
+     * are ignored in this method.
+     *
+     * @return The adapter position of the first visible item or {@link RecyclerView#NO_POSITION} if
+     * there aren't any visible items.
+     * @see #findFirstCompletelyVisibleItemPosition()
+     * @see #findLastVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findFirstVisibleItemPosition() {
+        final View child = findOneVisibleChild(0, getChildCount(), false);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the first fully visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * @return The adapter position of the first fully visible item or
+     * {@link RecyclerView#NO_POSITION} if there aren't any visible items.
+     * @see #findFirstVisibleItemPosition()
+     * @see #findLastCompletelyVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findFirstCompletelyVisibleItemPosition() {
+        final View child = findOneVisibleChild(0, getChildCount(), true);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the last visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * If RecyclerView has item decorators, they will be considered in calculations as well.
+     * LayoutManager may pre-cache some views that are not necessarily visible. Those views
+     * are ignored in this method.
+     *
+     * @return The adapter position of the last visible view or {@link RecyclerView#NO_POSITION} if
+     * there aren't any visible items.
+     * @see #findLastCompletelyVisibleItemPosition()
+     * @see #findFirstVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findLastVisibleItemPosition() {
+        final View child = findOneVisibleChild(getChildCount() - 1, -1, false);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the last fully visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * @return The adapter position of the last fully visible view or
+     * {@link RecyclerView#NO_POSITION} if there aren't any visible items.
+     * @see #findLastVisibleItemPosition()
+     * @see #findFirstCompletelyVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findLastCompletelyVisibleItemPosition() {
+        final View child = findOneVisibleChild(getChildCount() - 1, -1, true);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the first child that is visible in the provided index range, i.e. either partially or
+     * fully visible depending on the arguments provided.
+     *
+     * @param fromIndex         the start index for searching the visible child
+     * @param toIndex           the last index for searching the visible child
+     * @param completelyVisible when passed as {@code true}, this method checks if the view bounds
+     *                          don't overlap the bounds of the RecyclerView. When passed as
+     *                          {@code false}, this method checks if the view bounds are partially
+     *                          visible within the RecyclerView.
+     * @return the first child that is visible.
+     */
+    private View findOneVisibleChild(int fromIndex, int toIndex, boolean completelyVisible) {
+        int next = toIndex > fromIndex ? 1 : -1;
+        for (int i = fromIndex; i != toIndex; i += next) {
+            View view = getChildAt(i);
+            if (isViewVisible(view, completelyVisible)) {
+                return view;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param position the index of the view
+     * @return the index of the {@link FlexLine}, which includes the view whose index is passed as
+     * the position argument.
+     */
+    int getPositionToFlexLineIndex(int position) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        return mFlexboxHelper.mIndexToFlexLine[position];
+    }
+
+    /**
+     * LayoutParams used by the {@link FlexboxLayoutManager}, which stores per-child information
+     * required for the Flexbox.
+     *
+     * Note that some parent fields (which are not primitive nor a class implements
+     * {@link Parcelable}) are not included as the stored/restored fields after this class
+     * is serialized/de-serialized as an {@link Parcelable}.
+     */
+    public static class LayoutParams extends RecyclerView.LayoutParams implements FlexItem {
+
+        /**
+         * @see FlexItem#getFlexGrow()
+         */
+        private float mFlexGrow = FlexItem.FLEX_GROW_DEFAULT;
+
+        /**
+         * @see FlexItem#getFlexShrink()
+         */
+        private float mFlexShrink = FlexItem.FLEX_SHRINK_DEFAULT;
+
+        /**
+         * @see FlexItem#getAlignSelf()
+         */
+        private int mAlignSelf = AlignSelf.AUTO;
+
+        /**
+         * @see FlexItem#getFlexBasisPercent()
+         */
+        private float mFlexBasisPercent = FlexItem.FLEX_BASIS_PERCENT_DEFAULT;
+
+        /**
+         * @see FlexItem#getMinWidth()
+         */
+        private int mMinWidth;
+
+        /**
+         * @see FlexItem#getMinHeight()
+         */
+        private int mMinHeight;
+
+        /**
+         * @see FlexItem#getMaxWidth()
+         */
+        private int mMaxWidth = MAX_SIZE;
+
+        /**
+         * @see FlexItem#getMaxHeight()
+         */
+        private int mMaxHeight = MAX_SIZE;
+
+        /**
+         * @see FlexItem#isWrapBefore()
+         */
+        private boolean mWrapBefore;
+
+        @Override
+        public int getWidth() {
+            return width;
+        }
+
+        @Override
+        public void setWidth(int width) {
+            this.width = width;
+        }
+
+        @Override
+        public int getHeight() {
+            return height;
+        }
+
+        @Override
+        public void setHeight(int height) {
+            this.height = height;
+        }
+
+        @Override
+        public float getFlexGrow() {
+            return mFlexGrow;
+        }
+
+        @Override
+        public void setFlexGrow(float flexGrow) {
+            this.mFlexGrow = flexGrow;
+        }
+
+        @Override
+        public float getFlexShrink() {
+            return mFlexShrink;
+        }
+
+        @Override
+        public void setFlexShrink(float flexShrink) {
+            this.mFlexShrink = flexShrink;
+        }
+
+        @AlignSelf
+        @Override
+        public int getAlignSelf() {
+            return mAlignSelf;
+        }
+
+        @Override
+        public void setAlignSelf(@AlignSelf int alignSelf) {
+            this.mAlignSelf = alignSelf;
+        }
+
+        @Override
+        public int getMinWidth() {
+            return mMinWidth;
+        }
+
+        @Override
+        public void setMinWidth(int minWidth) {
+            this.mMinWidth = minWidth;
+        }
+
+        @Override
+        public int getMinHeight() {
+            return mMinHeight;
+        }
+
+        @Override
+        public void setMinHeight(int minHeight) {
+            this.mMinHeight = minHeight;
+        }
+
+        @Override
+        public int getMaxWidth() {
+            return mMaxWidth;
+        }
+
+        @Override
+        public void setMaxWidth(int maxWidth) {
+            this.mMaxWidth = maxWidth;
+        }
+
+        @Override
+        public int getMaxHeight() {
+            return mMaxHeight;
+        }
+
+        @Override
+        public void setMaxHeight(int maxHeight) {
+            this.mMaxHeight = maxHeight;
+        }
+
+        @Override
+        public boolean isWrapBefore() {
+            return mWrapBefore;
+        }
+
+        @Override
+        public void setWrapBefore(boolean wrapBefore) {
+            this.mWrapBefore = wrapBefore;
+        }
+
+        @Override
+        public float getFlexBasisPercent() {
+            return mFlexBasisPercent;
+        }
+
+        @Override
+        public void setFlexBasisPercent(float flexBasisPercent) {
+            this.mFlexBasisPercent = flexBasisPercent;
+        }
+
+        @Override
+        public int getMarginLeft() {
+            return leftMargin;
+        }
+
+        @Override
+        public int getMarginTop() {
+            return topMargin;
+        }
+
+        @Override
+        public int getMarginRight() {
+            return rightMargin;
+        }
+
+        @Override
+        public int getMarginBottom() {
+            return bottomMargin;
+        }
+
+        public LayoutParams(Context c, AttributeSet attrs) {
+            super(c, attrs);
+        }
+
+        public LayoutParams(int width, int height) {
+            super(width, height);
+        }
+
+        public LayoutParams(ViewGroup.MarginLayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(ViewGroup.LayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(RecyclerView.LayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(LayoutParams source) {
+            super(source);
+
+            mFlexGrow = source.mFlexGrow;
+            mFlexShrink = source.mFlexShrink;
+            mAlignSelf = source.mAlignSelf;
+            mFlexBasisPercent = source.mFlexBasisPercent;
+            mMinWidth = source.mMinWidth;
+            mMinHeight = source.mMinHeight;
+            mMaxWidth = source.mMaxWidth;
+            mMaxHeight = source.mMaxHeight;
+            mWrapBefore = source.mWrapBefore;
+        }
+
+        @Override
+        public int getOrder() {
+            return FlexItem.ORDER_DEFAULT;
+        }
+
+        @Override
+        public void setOrder(int order) {
+            // Unlike the FlexboxLayout, the order attribute is not supported, we don't calculate
+            // the order attribute because preparing the order attribute requires all
+            // view holders to be inflated at least once, which is inefficient if the number of
+            // items in the adapter is large
+            throw new UnsupportedOperationException("Setting the order in the "
+                    + "FlexboxLayoutManager is not supported. Use FlexboxLayout "
+                    + "if you need to reorder using the attribute.");
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeFloat(this.mFlexGrow);
+            dest.writeFloat(this.mFlexShrink);
+            dest.writeInt(this.mAlignSelf);
+            dest.writeFloat(this.mFlexBasisPercent);
+            dest.writeInt(this.mMinWidth);
+            dest.writeInt(this.mMinHeight);
+            dest.writeInt(this.mMaxWidth);
+            dest.writeInt(this.mMaxHeight);
+            dest.writeByte(this.mWrapBefore ? (byte) 1 : (byte) 0);
+            dest.writeInt(this.bottomMargin);
+            dest.writeInt(this.leftMargin);
+            dest.writeInt(this.rightMargin);
+            dest.writeInt(this.topMargin);
+            dest.writeInt(this.height);
+            dest.writeInt(this.width);
+        }
+
+        protected LayoutParams(Parcel in) {
+            super(WRAP_CONTENT, WRAP_CONTENT);
+            this.mFlexGrow = in.readFloat();
+            this.mFlexShrink = in.readFloat();
+            this.mAlignSelf = in.readInt();
+            this.mFlexBasisPercent = in.readFloat();
+            this.mMinWidth = in.readInt();
+            this.mMinHeight = in.readInt();
+            this.mMaxWidth = in.readInt();
+            this.mMaxHeight = in.readInt();
+            this.mWrapBefore = in.readByte() != 0;
+            this.bottomMargin = in.readInt();
+            this.leftMargin = in.readInt();
+            this.rightMargin = in.readInt();
+            this.topMargin = in.readInt();
+            this.height = in.readInt();
+            this.width = in.readInt();
+        }
+
+        public static final Parcelable.Creator<LayoutParams> CREATOR
+                = new Parcelable.Creator<LayoutParams>() {
+            @Override
+            public LayoutParams createFromParcel(Parcel source) {
+                return new LayoutParams(source);
+            }
+
+            @Override
+            public LayoutParams[] newArray(int size) {
+                return new LayoutParams[size];
+            }
+        };
+    }
+
+    /**
+     * A class that holds the information about an anchor position like from what pixels layout
+     * should start.
+     */
+    private class AnchorInfo {
+
+        private int mPosition;
+
+        private int mFlexLinePosition;
+
+        private int mCoordinate;
+
+        /**
+         * The anchor position of the main axis, which is the secondary scrolling direction.
+         */
+        private int mPerpendicularCoordinate = 0;
+
+        private boolean mLayoutFromEnd;
+
+        private boolean mValid;
+
+        private boolean mAssignedFromSavedState;
+
+        private void reset() {
+            mPosition = NO_POSITION;
+            mFlexLinePosition = NO_POSITION;
+            mCoordinate = INVALID_OFFSET;
+            mValid = false;
+            mAssignedFromSavedState = false;
+            if (isMainAxisDirectionHorizontal()) {
+                if (mFlexWrap == FlexWrap.NOWRAP) {
+                    mLayoutFromEnd = mFlexDirection == FlexDirection.ROW_REVERSE;
+                } else {
+                    mLayoutFromEnd = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                }
+            } else {
+                if (mFlexWrap == FlexWrap.NOWRAP) {
+                    mLayoutFromEnd = mFlexDirection == FlexDirection.COLUMN_REVERSE;
+                } else {
+                    mLayoutFromEnd = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                }
+            }
+        }
+
+        private void assignCoordinateFromPadding() {
+            if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+                mCoordinate = mLayoutFromEnd ? mOrientationHelper.getEndAfterPadding()
+                        : getWidth() - mOrientationHelper.getStartAfterPadding();
+            } else {
+                mCoordinate = mLayoutFromEnd ? mOrientationHelper.getEndAfterPadding()
+                        : mOrientationHelper.getStartAfterPadding();
+            }
+        }
+
+        private void assignFromView(View anchor) {
+            OrientationHelper orientationHelper;
+            // When the flex wrap is nowrap, the orientation helper is changed to
+            // perpendicular. Need to use the mSubOrientationHelper to be consistent with
+            // when flex wrap is not nowrap.
+            if (mFlexWrap == FlexWrap.NOWRAP) {
+                orientationHelper = mSubOrientationHelper;
+            } else {
+                orientationHelper = mOrientationHelper;
+            }
+            if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+                // We need to use the anchor view as starting from right if the flex direction is
+                // (column or column_reverse) and layout direction is RTL.
+                if (mLayoutFromEnd) {
+                    mCoordinate = orientationHelper.getDecoratedStart(anchor) +
+                        orientationHelper.getTotalSpaceChange();
+                } else {
+                    mCoordinate = orientationHelper.getDecoratedEnd(anchor);
+                }
+            } else {
+                if (mLayoutFromEnd) {
+                    mCoordinate = orientationHelper.getDecoratedEnd(anchor) +
+                        orientationHelper.getTotalSpaceChange();
+                } else {
+                    mCoordinate = orientationHelper.getDecoratedStart(anchor);
+                }
+            }
+            mPosition = getPosition(anchor);
+            mAssignedFromSavedState = false;
+            assert mFlexboxHelper.mIndexToFlexLine != null;
+            int flexLinePosition =
+                    mFlexboxHelper.mIndexToFlexLine[mPosition != NO_POSITION ? mPosition : 0];
+            mFlexLinePosition = flexLinePosition != NO_POSITION ? flexLinePosition : 0;
+            // It's likely that the view is the first item in a flex line, but if not get the
+            // index of the first item in the same line because the calculation of the flex lines
+            // expects that it starts from the first item in a flex line
+            if (mFlexLines.size() > mFlexLinePosition) {
+                mPosition = mFlexLines.get(mFlexLinePosition).mFirstIndex;
+            }
+        }
+
+        @Override
+        @NonNull
+        public String toString() {
+            return "AnchorInfo{" +
+                    "mPosition=" + mPosition +
+                    ", mFlexLinePosition=" + mFlexLinePosition +
+                    ", mCoordinate=" + mCoordinate +
+                    ", mPerpendicularCoordinate=" + mPerpendicularCoordinate +
+                    ", mLayoutFromEnd=" + mLayoutFromEnd +
+                    ", mValid=" + mValid +
+                    ", mAssignedFromSavedState=" + mAssignedFromSavedState +
+                    '}';
+        }
+    }
+
+    /**
+     * Helper class that keeps temporary state while the FlexboxLayoutManager is filling out the
+     * empty space.
+     */
+    private static class LayoutState {
+
+        private final static int SCROLLING_OFFSET_NaN = Integer.MIN_VALUE;
+
+        private static final int LAYOUT_START = -1;
+        private static final int LAYOUT_END = 1;
+
+        private static final int ITEM_DIRECTION_TAIL = 1;
+
+        /** Number of pixels that we should fill, in the layout direction. */
+        private int mAvailable;
+
+        /** If set to true, the value of {@link #mAvailable} is considered as infinite. */
+        private boolean mInfinite;
+
+        // TODO: Add mExtra to support better smooth scrolling
+
+        /** Current position on the flex lines being laid out in the layout call */
+        private int mFlexLinePosition;
+
+        /** Current position on the adapter to get the next item. */
+        private int mPosition;
+
+        /** Pixel offset where layout should start */
+        private int mOffset;
+
+        /**
+         * Used when LayoutState is constructed in a scrolling state.
+         * It should be set the amount of scrolling we can make without creating a new view.
+         * Settings this is required for efficient view recycling.
+         */
+        private int mScrollingOffset;
+
+        /**
+         * The most recent
+         * {@link #scrollVerticallyBy(int, RecyclerView.Recycler, RecyclerView.State)} or
+         * {@link #scrollHorizontallyBy(int, RecyclerView.Recycler, RecyclerView.State)} amount.
+         */
+        private int mLastScrollDelta;
+
+        private int mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+
+        private int mLayoutDirection = LayoutState.LAYOUT_END;
+
+        private boolean mShouldRecycle;
+
+        /**
+         * @return {@code true} if there are more items to layout
+         */
+        private boolean hasMore(RecyclerView.State state, List<FlexLine> flexLines) {
+            return mPosition >= 0 && mPosition < state.getItemCount() &&
+                    mFlexLinePosition >= 0 && mFlexLinePosition < flexLines.size();
+        }
+
+        @Override
+        @NonNull
+        public String toString() {
+            return "LayoutState{" +
+                    "mAvailable=" + mAvailable +
+                    ", mFlexLinePosition=" + mFlexLinePosition +
+                    ", mPosition=" + mPosition +
+                    ", mOffset=" + mOffset +
+                    ", mScrollingOffset=" + mScrollingOffset +
+                    ", mLastScrollDelta=" + mLastScrollDelta +
+                    ", mItemDirection=" + mItemDirection +
+                    ", mLayoutDirection=" + mLayoutDirection +
+                    '}';
+        }
+    }
+
+    /**
+     * The saved state that needs to be restored after the RecyclerView is recreated.
+     */
+    private static class SavedState implements Parcelable {
+
+        /** The adapter position of the first visible view */
+        private int mAnchorPosition;
+
+        /**
+         * The offset of the first visible view.
+         * E.g. if this value is set as -30, the fist visible view's top is off screen by 30 pixels
+         */
+        private int mAnchorOffset;
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(this.mAnchorPosition);
+            dest.writeInt(this.mAnchorOffset);
+        }
+
+        SavedState() {
+        }
+
+        private SavedState(Parcel in) {
+            this.mAnchorPosition = in.readInt();
+            this.mAnchorOffset = in.readInt();
+        }
+
+        private SavedState(SavedState savedState) {
+            mAnchorPosition = savedState.mAnchorPosition;
+            mAnchorOffset = savedState.mAnchorOffset;
+        }
+
+        private void invalidateAnchor() {
+            mAnchorPosition = NO_POSITION;
+        }
+
+        private boolean hasValidAnchor(int itemCount) {
+            return mAnchorPosition >= 0 && mAnchorPosition < itemCount;
+        }
+
+        public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
+            @Override
+            public SavedState createFromParcel(Parcel source) {
+                return new SavedState(source);
+            }
+
+            @Override
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+
+        @Override
+        @NonNull
+        public String toString() {
+            return "SavedState{" +
+                    "mAnchorPosition=" + mAnchorPosition +
+                    ", mAnchorOffset=" + mAnchorOffset +
+                    '}';
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/JustifyContent.java b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/JustifyContent.java
new file mode 100755
index 0000000..e6505b4
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/JustifyContent.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/** This attribute controls the alignment along the main axis. */
+@IntDef({JustifyContent.FLEX_START, JustifyContent.FLEX_END, JustifyContent.CENTER,
+        JustifyContent.SPACE_BETWEEN, JustifyContent.SPACE_AROUND, JustifyContent.SPACE_EVENLY})
+@Retention(RetentionPolicy.SOURCE)
+public @interface JustifyContent {
+
+    /** Flex items are packed toward the start line. */
+    int FLEX_START = 0;
+
+    /** Flex items are packed toward the end line. */
+    int FLEX_END = 1;
+
+    /** Flex items are centered along the flex line where the flex items belong. */
+    int CENTER = 2;
+
+    /**
+     * Flex items are evenly distributed along the flex line, first flex item is on the
+     * start line, the last flex item is on the end line.
+     */
+    int SPACE_BETWEEN = 3;
+
+    /**
+     * Flex items are evenly distributed along the flex line with the same amount of spaces between
+     * the flex lines.
+     */
+    int SPACE_AROUND = 4;
+
+    /**
+     * Flex items are evenly distributed along the flex line. The difference between
+     * {@link #SPACE_AROUND} is that all the spaces between items should be the same as the
+     * space before the first item and after the last item.
+     * See
+     * <a href="https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content">the document on MDN</a>
+     * for more details.
+     */
+    int SPACE_EVENLY = 5;
+}
diff --git a/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/res/values/attrs.xml b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/res/values/attrs.xml
new file mode 100755
index 0000000..277f885
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/flexbox/src/main/res/values/attrs.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <declare-styleable name="FlexboxLayout">
+        <attr name="flexDirection">
+            <enum name="row" value="0" />
+            <enum name="row_reverse" value="1" />
+            <enum name="column" value="2" />
+            <enum name="column_reverse" value="3" />
+        </attr>
+
+        <attr name="flexWrap">
+            <enum name="nowrap" value="0" />
+            <enum name="wrap" value="1" />
+            <enum name="wrap_reverse" value="2" />
+        </attr>
+
+        <!--
+            Omitting flex-flow property since it's reflected in the parent flex container.
+            Set the flexDirection and/or flexWrap to the parent flex container explicitly if you
+            want to use the flex-flow similar way to the web.
+         -->
+
+        <attr name="justifyContent">
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="space_between" value="3" />
+            <enum name="space_around" value="4" />
+            <enum name="space_evenly" value="5" />
+        </attr>
+
+        <attr name="alignItems">
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="baseline" value="3" />
+            <enum name="stretch" value="4" />
+        </attr>
+
+        <attr name="alignContent">
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="space_between" value="3" />
+            <enum name="space_around" value="4" />
+            <enum name="stretch" value="5" />
+        </attr>
+
+        <attr name="dividerDrawable" format="reference" />
+        <attr name="dividerDrawableHorizontal" format="reference" />
+        <attr name="dividerDrawableVertical" format="reference" />
+
+        <attr name="showDivider">
+            <flag name="none" value="0" />
+            <flag name="beginning" value="1" />
+            <flag name="middle" value="2" />
+            <flag name="end" value="4" />
+        </attr>
+        <attr name="showDividerHorizontal">
+            <flag name="none" value="0" />
+            <flag name="beginning" value="1" />
+            <flag name="middle" value="2" />
+            <flag name="end" value="4" />
+        </attr>
+        <attr name="showDividerVertical">
+            <flag name="none" value="0" />
+            <flag name="beginning" value="1" />
+            <flag name="middle" value="2" />
+            <flag name="end" value="4" />
+        </attr>
+
+        <!--
+            The attribute that specifies the maximum number of flex lines. This attribute is
+            effective only when the flexWrap attribute is "wrap" or "wrap_reverse".
+        -->
+        <attr name="maxLine" format="integer" />
+
+    </declare-styleable>
+
+    <declare-styleable name="FlexboxLayout_Layout">
+        <attr name="layout_order" format="integer" />
+
+        <!-- Negative numbers are invalid. -->
+        <attr name="layout_flexGrow" format="float" />
+
+        <!-- Negative numbers are invalid. -->
+        <attr name="layout_flexShrink" format="float" />
+
+        <!--
+            The initial length in a percentage format relative to its parent. This is similar to the
+            flex-basis property in the original CSS specification.
+            (https://www.w3.org/TR/css-flexbox-1/#flex-basis-property)
+            But unlike the flex-basis property, this attribute only accepts a value in fraction
+            (percentage), whereas flex-basis property accepts width values such as 1em, 10px and
+            the 'content' string.
+            But specifying initial fixed width values can be done by specifying width values in
+            layout_width (or layout_height, varies depending on the flexDirection). Also the same
+            effect can be done by specifying "wrap_content" in layout_width (or layout_height) if
+            developers want to achieve the same effect as 'content'.
+            Thus, this attribute only accepts fraction values, which can't be done through
+            layout_width (or layout_height) for simplicity.
+        -->
+        <attr name="layout_flexBasisPercent" format="fraction" />
+
+        <!--
+            Omitting flex property since it's a shorthand for layout_flexGrow and layout_flexShrink
+            and layout_percentInParent (flex-basis in the original CSS spec).
+        -->
+
+        <attr name="layout_alignSelf">
+            <enum name="auto" value="-1" />
+            <!-- The values below need to match the values of alignItems -->
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="baseline" value="3" />
+            <enum name="stretch" value="4" />
+        </attr>
+
+        <attr name="layout_minWidth" format="dimension" />
+        <attr name="layout_minHeight" format="dimension" />
+        <attr name="layout_maxWidth" format="dimension" />
+        <attr name="layout_maxHeight" format="dimension" />
+
+        <!--
+            This attribute forces a flex line wrapping. i.e. if this is set to true for a
+            flex item, the item will become the first item of a flex line. (A wrapping happens
+            regardless of the flex items being processed in the the previous flex line)
+            This attribute is ignored if the flex_wrap attribute is set to nowrap.
+            The equivalent attribute isn't defined in the original CSS Flexible Box Module
+            specification, but having this attribute is useful for Android developers to flatten
+            the layouts when building a grid like layout or for a situation where developers want
+            to put a new flex line to make a semantic difference from the previous one, etc.
+        -->
+        <attr name="layout_wrapBefore" format="boolean" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/gradle.properties b/OnTime_Driver_live/lib/flexbox-layout/gradle.properties
new file mode 100755
index 0000000..1f0a9ed
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/gradle.properties
@@ -0,0 +1,37 @@
+#
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/flexbox-layout/gradle/wrapper/gradle-wrapper.properties b/OnTime_Driver_live/lib/flexbox-layout/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..52aa872
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Mar 02 14:58:35 WIB 2026
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_Driver_live/lib/flexbox-layout/gradlew b/OnTime_Driver_live/lib/flexbox-layout/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/OnTime_Driver_live/lib/flexbox-layout/gradlew.bat b/OnTime_Driver_live/lib/flexbox-layout/gradlew.bat
new file mode 100755
index 0000000..e95643d
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_Driver_live/lib/flexbox-layout/settings.gradle b/OnTime_Driver_live/lib/flexbox-layout/settings.gradle
new file mode 100755
index 0000000..8d26cda
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/settings.gradle
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+include ':demo-playground', ':demo-cat-gallery', ':flexbox'
diff --git a/OnTime_Driver_live/lib/flexbox-layout/tool/codeStyleSettings.xml b/OnTime_Driver_live/lib/flexbox-layout/tool/codeStyleSettings.xml
new file mode 100755
index 0000000..bfd09bd
--- /dev/null
+++ b/OnTime_Driver_live/lib/flexbox-layout/tool/codeStyleSettings.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="FIELD_NAME_PREFIX" value="m" />
+        <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
+        <option name="IMPORT_LAYOUT_TABLE">
+          <value>
+            <package name="android" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="com.android" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="dalvik" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="libcore" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="com" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="gov" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="junit" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="net" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="org" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="java" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="javax" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="android" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com.android" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="dalvik" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="libcore" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="gov" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="junit" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="net" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="javax" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="false" />
+          </value>
+        </option>
+        <option name="RIGHT_MARGIN" value="100" />
+        <option name="JD_P_AT_EMPTY_LINES" value="false" />
+        <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+        <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+        <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
+        <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+        <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
+        <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+        <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+        <option name="BLANK_LINES_AROUND_FIELD" value="1" />
+        <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+        <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+        <option name="ALIGN_MULTILINE_FOR" value="false" />
+        <option name="CALL_PARAMETERS_WRAP" value="1" />
+        <option name="METHOD_PARAMETERS_WRAP" value="1" />
+        <option name="EXTENDS_LIST_WRAP" value="1" />
+        <option name="THROWS_LIST_WRAP" value="1" />
+        <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+        <option name="THROWS_KEYWORD_WRAP" value="1" />
+        <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+        <option name="BINARY_OPERATION_WRAP" value="1" />
+        <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+        <option name="TERNARY_OPERATION_WRAP" value="1" />
+        <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+        <option name="FOR_STATEMENT_WRAP" value="1" />
+        <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+        <option name="ASSIGNMENT_WRAP" value="1" />
+        <option name="PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE" value="true" />
+        <option name="WRAP_COMMENTS" value="true" />
+        <option name="IF_BRACE_FORCE" value="3" />
+        <option name="DOWHILE_BRACE_FORCE" value="3" />
+        <option name="WHILE_BRACE_FORCE" value="3" />
+        <option name="FOR_BRACE_FORCE" value="3" />
+        <Objective-C-extensions>
+          <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
+          <option name="RELEASE_STYLE" value="IVAR" />
+          <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" />
+          <file>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+          </file>
+          <class>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+          </class>
+          <extensions>
+            <pair source="cpp" header="h" />
+            <pair source="c" header="h" />
+          </extensions>
+        </Objective-C-extensions>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <ADDITIONAL_INDENT_OPTIONS fileType="java">
+          <option name="TAB_SIZE" value="8" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="js">
+          <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <codeStyleSettings language="JAVA">
+          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+          <option name="ALIGN_MULTILINE_FOR" value="false" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="PREFER_PARAMETERS_WRAP" value="true" />
+          <option name="METHOD_PARAMETERS_WRAP" value="1" />
+          <option name="RESOURCE_LIST_WRAP" value="1" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="THROWS_LIST_WRAP" value="1" />
+          <option name="THROWS_KEYWORD_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="1" />
+          <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+          <option name="TERNARY_OPERATION_WRAP" value="1" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="1" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="WRAP_LONG_LINES" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="XML">
+          <option name="FORCE_REARRANGE_MODE" value="1" />
+          <indentOptions>
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+          </indentOptions>
+          <arrangement>
+            <rules>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>xmlns:android</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>xmlns:.*</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:id</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:name</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>name</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>style</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_width</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_height</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_.*</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:width</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:height</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>.*</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+            </rules>
+          </arrangement>
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="AndroidStyle" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/overscroll-decor/.gitignore b/OnTime_Driver_live/lib/overscroll-decor/.gitignore
new file mode 100755
index 0000000..5df5e83
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/.gitignore
@@ -0,0 +1,9 @@
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+/.idea
+*iml
diff --git a/OnTime_Driver_live/lib/overscroll-decor/LICENSE b/OnTime_Driver_live/lib/overscroll-decor/LICENSE
new file mode 100755
index 0000000..2772b5d
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2015, DoAT Media Ltd.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/OnTime_Driver_live/lib/overscroll-decor/README.md b/OnTime_Driver_live/lib/overscroll-decor/README.md
new file mode 100755
index 0000000..3c552fc
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/README.md
@@ -0,0 +1,266 @@
+> **Announcement**
+>
+> An update regarding Bintray's shutdown: The library has been successfuly republished onto maven central, but with a different Group ID; Please update your Gradle dependencies as follows:
+>
+> ```diff
+> -implementation 'me.everything:overscroll-decor-android:1.1.0'
+> +implementation 'io.github.everythingme:overscroll-decor-android:1.1.1'
+> ```
+
+# Over-Scroll Support For Android's RecyclerView, ListView, GridView, ScrollView ...
+
+The library provides an iOS-like over-scrolling effect applicable over almost all Android native scrollable views. It is also built to allow for very easy adaptation to support custom views.
+
+The core effect classes are loose-[decorators](https://en.wikipedia.org/wiki/Decorator_pattern) of Android views, and are thus decoupled from the actual view classes' implementations. That allows developers to apply the effect over views while keeping them as untampered 'black-boxes'. Namely, it allows for keeping important optimizations such as view-recycling intact.
+
+![RecyclerView demo](recyclerview_demo.gif)
+
+# Gradle Dependency
+
+Add the following to your module's `build.gradle` file:
+
+```groovy
+dependencies {
+    // ...
+    
+    implementation 'io.github.everythingme:overscroll-decor-android:1.1.1'
+}
+```
+
+# Usage
+
+### RecyclerView
+
+Supports both linear and staggered-grid layout managers (i.e. all native Android layouts).
+Can be easily adapted to support custom layout managers.
+
+```java
+RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+    
+// Horizontal
+OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+// Vertical
+OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+```
+
+### RecyclerView with items swiping / dragging
+See _Advanced Usage_.
+
+
+### ListView
+
+```java
+ListView listView = (ListView) findViewById(R.id.list_view);
+OverScrollDecoratorHelper.setUpOverScroll(listView);
+```
+
+### GridView
+
+```java
+GridView gridView = (GridView) findViewById(R.id.grid_view);
+OverScrollDecoratorHelper.setUpOverScroll(gridView);
+```
+
+### ViewPager
+
+```java
+ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
+OverScrollDecoratorHelper.setUpOverScroll(viewPager);
+```
+
+### ScrollView, HorizontalScrollView
+
+```java
+ScrollView scrollView = (ScrollView) findViewById(R.id.scroll_view);
+OverScrollDecoratorHelper.setUpOverScroll(scrollView);
+    
+HorizontalScrollView horizontalScrollView = (HorizontalScrollView) findViewById(R.id.horizontal_scroll_view);
+OverScrollDecoratorHelper.setUpOverScroll(horizontalScrollView);
+```
+
+### Any View - Text, Image... (Always Over-Scroll Ready)
+
+```java
+View view = findViewById(R.id.demo_view);
+    
+// Horizontal
+OverScrollDecoratorHelper.setUpStaticOverScroll(view, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+// Vertical
+OverScrollDecoratorHelper.setUpStaticOverScroll(view, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+```
+
+# Advanced Usage
+
+```java
+// Horizontal RecyclerView
+RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+new HorizontalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView));
+
+// ListView (vertical)
+ListView listView = (ListView) findViewById(R.id.list_view);
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(listView));
+
+// GridView (vertical)
+GridView gridView = (GridView) findViewById(R.id.grid_view);
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(gridView));
+
+// ViewPager
+ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
+new HorizontalOverScrollBounceEffectDecorator(new ViewPagerOverScrollDecorAdapter(viewPager));
+
+// A simple TextView - horizontal
+View textView = findViewById(R.id.title);
+new HorizontalOverScrollBounceEffectDecorator(new StaticOverScrollDecorAdapter(view));
+```
+
+### RecyclerView with [ItemTouchHelper](http://developer.android.com/reference/android/support/v7/widget/helper/ItemTouchHelper.html) based swiping / dragging
+As of version 1.0.1, the effect can work smoothly with the RecyclerView's built-in mechanism for items swiping and dragging (based on [ItemTouchHelper](http://developer.android.com/reference/android/support/v7/widget/helper/ItemTouchHelper.html)). BUT, it requires some (very little) explicit configuration work:
+
+```java
+// Normally you would attach an ItemTouchHelper & a callback to a RecyclerView, this way:
+RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+ItemTouchHelper.Callback myCallback = new ItemTouchHelper.Callback() {
+	...
+};
+ItemTouchHelper myHelper = new ItemTouchHelper(myCallback);
+myHelper.attachToRecyclerView(recyclerView);
+
+// INSTEAD of attaching the helper yourself, simply use the dedicated adapter c'tor, e.g.:
+new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView, myCallback));
+
+```
+
+For more info on the swiping / dragging mechanism, try [this useful tutorial](https://medium.com/@ipaulpro/drag-and-swipe-with-recyclerview-b9456d2b1aaf).
+
+### Over-Scroll Listeners
+As of version 1.0.2, the effect provides a means for registering listeners of over-scroll related events. There are two types of listeners, as follows.
+
+#### State-Change Listener
+The over-scroll manager dispatches events onto a state-change listener denoting transitions in the effect's state:
+
+```java
+
+// Note: over-scroll is set-up using the helper method.
+IOverScrollDecor decor = OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+
+decor.setOverScrollStateListener(new IOverScrollStateListener() {
+    @Override
+	public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) {
+	    switch (newState) {
+	        case STATE_IDLE:
+	            // No over-scroll is in effect.
+	            break;
+	        case STATE_DRAG_START_SIDE:
+	            // Dragging started at the left-end.
+	            break;
+	        case STATE_DRAG_END_SIDE:
+	            // Dragging started at the right-end.
+	            break;
+	        case STATE_BOUNCE_BACK:
+	            if (oldState == STATE_DRAG_START_SIDE) {
+	                // Dragging stopped -- view is starting to bounce back from the *left-end* onto natural position.
+	            } else { // i.e. (oldState == STATE_DRAG_END_SIDE)
+	                // View is starting to bounce back from the *right-end*.
+	            }
+	            break;
+	    }
+	}
+}
+```
+
+#### Real-time Updates Listener
+The over-scroll manager can also dispatch *real-time*, as-it-happens over-scroll events denoting the current offset resulting due to an over-scroll being in-effect (the offset thus denotes the current 'intensity').
+
+```java
+// Note: over-scroll is set-up by explicity instantiating a decorator rather than using the helper; The two methods can be used interchangeably for registering listeners.
+VerticalOverScrollBounceEffectDecorator decor = new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView, itemTouchHelperCallback));
+
+decor.setOverScrollUpdateListener(new IOverScrollUpdateListener() {
+    @Override
+    public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) {
+    	final View view = decor.getView();
+    	if (offset > 0) {
+    		// 'view' is currently being over-scrolled from the top.
+    	} else if (offset < 0) {
+    		// 'view' is currently being over-scrolled from the bottom.
+    	} else {
+    		// No over-scroll is in-effect.
+    		// This is synonymous with having (state == STATE_IDLE).
+    	}
+    }
+});
+
+```
+
+
+The two type of listeners can be used either separately or in conjunction, depending on your needs. Refer to the demo project's RecyclerView-demo section for actual concrete usage.
+    
+### Custom Views
+
+```java
+public class CustomView extends View {
+    // ...
+}
+    
+final CustomView view = (CustomView) findViewById(R.id.custom_view);
+new VerticalOverScrollBounceEffectDecorator(new IOverScrollDecoratorAdapter() {
+
+    @Override
+    public View getView() {
+        return view;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+	    // canScrollUp() is an example of a method you must implement
+        return !view.canScrollUp();
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+	     // canScrollDown() is an example of a method you must implement
+        return !view.canScrollDown();
+    }
+});
+```
+
+### Effect Behavior Configuration
+
+```java
+/// Make over-scroll applied over a list-view feel more 'stiff'
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(view),
+        5f, // Default is 3
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK,
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_DECELERATE_FACTOR);
+                
+// Make over-scroll applied over a list-view bounce-back more softly
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(view),
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD,
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK,
+        -1f // Default is -2
+        );
+```
+
+### Dynamic Effect Disabling
+
+As of version 1.0.4, the effect can be dynamically disabled (detached) and reenabled (attached) at runtime:
+
+```java
+IOverScrollDecor decor = OverScrollDecoratorHelper.setUpOverScroll(view);
+
+// Detach. You are strongly encouraged to only call this when overscroll isn't
+// in-effect: Either add getCurrentState()==STATE_IDLE as a precondition,
+// or use a state-change listener.
+decor.detach();
+// Attach.
+decor.attach();
+```
+
+`attach()` and `detach()` can be used repeatedly - as necessary, as can be seen in the demo project (refer to action-bar menu in recycler-view demo).
+
+## Credits
+
+App icons by <a href="http://somerandomdude.com/work/iconic/">P.J. Onori</a>,
+<a href="http://graphicriver.net/item/wirecons-vector-icons/4586710?ref=tmthymllr">Timothy Miller</a>,
+<a href="http://icons4android.com">Icons4Android</a>, 
+<a href="http://icons8.com/android-icons">Icons8.com</a>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/.gitignore b/OnTime_Driver_live/lib/overscroll-decor/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/build.gradle b/OnTime_Driver_live/lib/overscroll-decor/app/build.gradle
new file mode 100755
index 0000000..74329bd
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion '29.0.3'
+
+    defaultConfig {
+        applicationId 'me.everything.overscrolldemo'
+        minSdkVersion 14
+        targetSdkVersion 30
+        versionCode 1
+        versionName '1.0'
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation project(':liboverscroll')
+//    implementation 'io.github.everythingme:overscroll-decor-android:1.1.1'
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/proguard-rules.pro b/OnTime_Driver_live/lib/overscroll-decor/app/proguard-rules.pro
new file mode 100755
index 0000000..8e4e143
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/amit/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..b452bdf
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="me.everything.overscrolldemo" >
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/app_icon"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name=".OverScrollDemoActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/OverScrollDemoActivity.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/OverScrollDemoActivity.java
new file mode 100755
index 0000000..3d162b5
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/OverScrollDemoActivity.java
@@ -0,0 +1,105 @@
+package me.everything.overscrolldemo;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import com.google.android.material.navigation.NavigationView;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import android.view.MenuItem;
+
+import me.everything.overscrolldemo.view.GridViewDemoFragment;
+import me.everything.overscrolldemo.view.ListViewDemoFragment;
+import me.everything.overscrolldemo.view.MiscViewsDemoFragment;
+import me.everything.overscrolldemo.view.NestedScrollViewDemoFragment;
+import me.everything.overscrolldemo.view.RecyclerViewDemoFragment;
+import me.everything.overscrolldemo.view.RecyclerViewStaggeredGridDemoFragment;
+import me.everything.overscrolldemo.view.ScrollViewDemoFragment;
+import me.everything.overscrolldemo.view.ViewPagerDemoFragment;
+
+public class OverScrollDemoActivity extends AppCompatActivity
+        implements NavigationView.OnNavigationItemSelectedListener {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_overscroll_demo);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setTitle(R.string.recycler_view_demo_title);
+        setSupportActionBar(toolbar);
+
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+        drawer.addDrawerListener(toggle);
+        toggle.syncState();
+
+        NavigationView navigationView = (NavigationView) findViewById(R.id.drawer_nav);
+        navigationView.setNavigationItemSelectedListener(this);
+
+        if (savedInstanceState == null) {
+            getSupportFragmentManager().beginTransaction()
+                    .add(R.id.fragment_placeholder, new RecyclerViewDemoFragment())
+                    .commit();
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        if (drawer.isDrawerOpen(GravityCompat.START)) {
+            drawer.closeDrawer(GravityCompat.START);
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+    @Override
+    public boolean onNavigationItemSelected(MenuItem item) {
+        final int id = item.getItemId();
+        item.setChecked(true);
+
+        switch (id) {
+            case R.id.drawer_item_recyclerview_demo:
+                replaceMainFragment(new RecyclerViewDemoFragment(), R.string.recycler_view_demo_title);
+                break;
+            case R.id.drawer_item_gridview_demo:
+                replaceMainFragment(new GridViewDemoFragment(), R.string.grid_view_demo_title);
+                break;
+            case R.id.drawer_item_listview_demo:
+                replaceMainFragment(new ListViewDemoFragment(), R.string.list_view_demo_title);
+                break;
+            case R.id.drawer_item_recyclerview_staggered_grid_demo:
+                replaceMainFragment(new RecyclerViewStaggeredGridDemoFragment(), R.string.recycler_view_staggered_grid_demo_title);
+                break;
+            case R.id.drawer_item_scrollview_demo:
+                replaceMainFragment(new ScrollViewDemoFragment(), R.string.scroll_view_demo_title);
+                break;
+            case R.id.drawer_item_viewpager_demo:
+                replaceMainFragment(new ViewPagerDemoFragment(),R.string.viewpager_demo_title);
+                break;
+            case R.id.drawer_item_nested_scrollview_demo:
+                replaceMainFragment(new NestedScrollViewDemoFragment(), R.string.nested_scrollview_demo_title);
+                break;
+            case R.id.drawer_item_misc_demo:
+                replaceMainFragment(new MiscViewsDemoFragment(), R.string.misc_views_demo_title);
+                break;
+        }
+
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        drawer.closeDrawer(GravityCompat.START);
+        return true;
+    }
+
+    private void replaceMainFragment(Fragment fragment, int titleResId) {
+        getSupportFragmentManager().beginTransaction()
+                .setCustomAnimations(R.animator.fade_in_slow, R.animator.fade_out_quick)
+                .replace(R.id.fragment_placeholder, fragment)
+                .commit();
+        getSupportActionBar().setTitle(titleResId);
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoContentHelper.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoContentHelper.java
new file mode 100755
index 0000000..87213f1
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoContentHelper.java
@@ -0,0 +1,52 @@
+package me.everything.overscrolldemo.control;
+
+import android.content.res.Resources;
+
+import java.util.Arrays;
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+
+public class DemoContentHelper {
+
+    private static List<DemoItem> sSpectrumItemsVioletToRed;
+    private static List<DemoItem> sSpectrumItemsRedToViolet;
+
+    public static List<DemoItem> getSpectrumItems(Resources res) {
+        if (sSpectrumItemsVioletToRed == null) {
+            sSpectrumItemsVioletToRed = Arrays.asList(
+                    new DemoItem(res.getColor(android.R.color.holo_purple), "PURPLE"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_dark), "BLUE"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_light), "LIGHT BLUE"),
+                    new DemoItem(res.getColor(R.color.spectrum_cyan), "CYAN"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_dark), "GREEN"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_light), "LIGHT GREEN"),
+                    new DemoItem(res.getColor(R.color.spectrum_yellow), "YELLOW"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_light), "LIGHT ORANGE"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_dark), "ORANGE"),
+                    new DemoItem(res.getColor(android.R.color.holo_red_light), "LIGHT RED"),
+                    new DemoItem(res.getColor(android.R.color.holo_red_dark), "RED")
+            );
+        }
+        return sSpectrumItemsVioletToRed;
+    }
+
+    public static List<DemoItem> getReverseSpectrumItems(Resources res) {
+        if (sSpectrumItemsRedToViolet == null) {
+            sSpectrumItemsRedToViolet = Arrays.asList(
+                    new DemoItem(res.getColor(android.R.color.holo_red_dark), "RED"),
+                    new DemoItem(res.getColor(android.R.color.holo_red_light), "LIGHT RED"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_dark), "ORANGE"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_light), "LIGHT ORANGE"),
+                    new DemoItem(res.getColor(R.color.spectrum_yellow), "YELLOW"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_light), "LIGHT GREEN"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_dark), "GREEN"),
+                    new DemoItem(res.getColor(R.color.spectrum_cyan), "CYAN"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_light), "LIGHT BLUE"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_dark), "BLUE"),
+                    new DemoItem(res.getColor(android.R.color.holo_purple), "PURPLE")
+            );
+        }
+        return sSpectrumItemsRedToViolet;
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoItem.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoItem.java
new file mode 100755
index 0000000..c9927a5
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoItem.java
@@ -0,0 +1,32 @@
+package me.everything.overscrolldemo.control;
+
+public class DemoItem {
+
+    private int mColor;
+    private String mColorName;
+
+    public DemoItem() {
+    }
+
+    public DemoItem(int color, String colorName) {
+        mColorName = colorName;
+        mColor = color;
+    }
+
+    public int getColor() {
+        return mColor;
+    }
+
+    public void setColor(int color) {
+        mColor = color;
+    }
+
+    public String getColorName() {
+        return mColorName;
+    }
+
+    public void setColorName(String colorName) {
+        mColorName = colorName;
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoGridAdapter.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoGridAdapter.java
new file mode 100755
index 0000000..aa16470
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoGridAdapter.java
@@ -0,0 +1,25 @@
+package me.everything.overscrolldemo.view;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class DemoGridAdapter extends DemoListAdapterBase {
+
+    protected DemoGridAdapter(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoGridAdapter(LayoutInflater inflater, List<DemoItem> items) {
+        super(inflater, items);
+    }
+
+    @Override
+    protected DemoViewHolder createViewHolder(ViewGroup parent) {
+        return new DemoViewHolder(R.layout.grid_item, parent, mInflater);
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapter.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapter.java
new file mode 100755
index 0000000..58c8bfd
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapter.java
@@ -0,0 +1,25 @@
+package me.everything.overscrolldemo.view;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class DemoListAdapter extends DemoListAdapterBase {
+
+    protected DemoListAdapter(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoListAdapter(LayoutInflater inflater, List<DemoItem> items) {
+        super(inflater, items);
+    }
+
+    @Override
+    protected DemoViewHolder createViewHolder(ViewGroup parent) {
+        return new DemoViewHolder(R.layout.vertical_list_item, parent, mInflater);
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapterBase.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapterBase.java
new file mode 100755
index 0000000..cb322b0
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapterBase.java
@@ -0,0 +1,104 @@
+package me.everything.overscrolldemo.view;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.control.DemoItem;
+
+public abstract class DemoListAdapterBase extends BaseAdapter {
+
+    private static final int COLOR_VIEW_TYPE = 0;
+
+    public static class DemoViewHolder {
+
+        TextView mTextView;
+
+        public DemoViewHolder(int resId, ViewGroup parent, LayoutInflater inflater) {
+            mTextView = (TextView) inflater.inflate(resId, parent, false);
+            mTextView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Toast.makeText(mTextView.getContext(), "Tapped on: "+mTextView.getText(), Toast.LENGTH_SHORT).show();
+                }
+            });
+            mTextView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    Toast.makeText(mTextView.getContext(), "Long-tapped on: "+mTextView.getText(), Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            });
+        }
+
+        public void init(DemoItem item) {
+            mTextView.setText(item.getColorName());
+
+            int color = item.getColor();
+            mTextView.setBackgroundColor(color);
+        }
+
+        public View getView() {
+            return mTextView;
+        }
+    }
+
+    protected final LayoutInflater mInflater;
+    protected List<DemoItem> mItems;
+
+    protected DemoListAdapterBase(LayoutInflater inflater) {
+        mInflater = inflater;
+    }
+
+    public DemoListAdapterBase(LayoutInflater inflater, List<DemoItem> items) {
+        mInflater = inflater;
+        mItems = items;
+    }
+
+    public void setItems(List items) {
+        mItems = items;
+    }
+
+    @Override
+    public int getCount() {
+        return mItems.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return mItems.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+
+        DemoViewHolder holder;
+        if (convertView == null) {
+            holder = createViewHolder(parent);
+            holder.getView().setTag(holder);
+        } else {
+            holder = (DemoViewHolder) convertView.getTag();
+        }
+
+        holder.init((DemoItem) getItem(position));
+        return holder.getView();
+    }
+
+    protected abstract DemoViewHolder createViewHolder(ViewGroup parent);
+
+    @Override
+    public int getItemViewType(int position) {
+        return COLOR_VIEW_TYPE;
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterBase.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterBase.java
new file mode 100755
index 0000000..5e4eaf1
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterBase.java
@@ -0,0 +1,85 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.control.DemoItem;
+
+public abstract class DemoRecyclerAdapterBase extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private static final int COLOR_VIEW_TYPE = 0;
+
+    public static class DemoViewHolder extends RecyclerView.ViewHolder {
+
+        public DemoViewHolder(int resId, ViewGroup parent, LayoutInflater inflater) {
+            super(inflater.inflate(resId, parent, false));
+
+            getTextView().setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Toast.makeText(getTextView().getContext(), "Tapped on: "+getTextView().getText(), Toast.LENGTH_SHORT).show();
+                }
+            });
+            getTextView().setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    Toast.makeText(getTextView().getContext(), "Long-tapped on: "+getTextView().getText(), Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            });
+        }
+
+        public void init(DemoItem item) {
+            TextView textView = getTextView();
+            textView.setText(item.getColorName());
+
+            int color = item.getColor();
+            textView.setBackgroundColor(color);
+        }
+
+        private TextView getTextView() {
+            return (TextView) itemView;
+        }
+    }
+
+    protected final LayoutInflater mInflater;
+    protected List<DemoItem> mItems;
+
+    protected DemoRecyclerAdapterBase(LayoutInflater inflater) {
+        mInflater = inflater;
+    }
+
+    public DemoRecyclerAdapterBase(LayoutInflater inflater, List<DemoItem> items) {
+        mInflater = inflater;
+        mItems = items;
+    }
+
+    public void setItems(List items) {
+        mItems = items;
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        DemoItem item = mItems.get(position);
+
+        DemoViewHolder demoHolder = (DemoViewHolder) holder;
+        demoHolder.init(item);
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return COLOR_VIEW_TYPE;
+    }
+
+    @Override
+    public int getItemCount() {
+        return mItems.size();
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterHorizontal.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterHorizontal.java
new file mode 100755
index 0000000..88baed5
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterHorizontal.java
@@ -0,0 +1,28 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+
+public class DemoRecyclerAdapterHorizontal extends DemoRecyclerAdapterBase {
+
+    public DemoRecyclerAdapterHorizontal(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoRecyclerAdapterHorizontal(List items, LayoutInflater inflater) {
+        super(inflater, items);
+    }
+
+    @Override
+    @NonNull
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new DemoViewHolder(R.layout.horizontal_list_item, parent, mInflater);
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterVertical.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterVertical.java
new file mode 100755
index 0000000..4956e76
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterVertical.java
@@ -0,0 +1,27 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+
+public class DemoRecyclerAdapterVertical extends DemoRecyclerAdapterBase {
+
+    public DemoRecyclerAdapterVertical(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoRecyclerAdapterVertical(List items, LayoutInflater inflater) {
+        super(inflater, items);
+    }
+
+    @Override
+    @NonNull
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new DemoViewHolder(R.layout.vertical_list_item, parent, mInflater);
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/GridViewDemoFragment.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/GridViewDemoFragment.java
new file mode 100755
index 0000000..c93bab1
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/GridViewDemoFragment.java
@@ -0,0 +1,34 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.GridView;
+import android.widget.ListAdapter;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class GridViewDemoFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.gridview_overscroll_demo, null, false);
+        initVerticalGridView(DemoContentHelper.getSpectrumItems(getResources()), (GridView) fragmentView.findViewById(R.id.grid_view));
+        return fragmentView;
+    }
+
+    private void initVerticalGridView(List<DemoItem> content, GridView gridView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        ListAdapter adapter = new DemoGridAdapter(appInflater, content);
+        gridView.setAdapter(adapter);
+
+        OverScrollDecoratorHelper.setUpOverScroll(gridView);
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ListViewDemoFragment.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ListViewDemoFragment.java
new file mode 100755
index 0000000..d4b4f9d
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ListViewDemoFragment.java
@@ -0,0 +1,36 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class ListViewDemoFragment extends Fragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.listview_overscroll_demo, null, false);
+        initVerticalListView(DemoContentHelper.getSpectrumItems(getResources()), (ListView) fragmentView.findViewById(R.id.list_view));
+        return fragmentView;
+    }
+
+    private void initVerticalListView(List<DemoItem> content, ListView listView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        ListAdapter adapter = new DemoListAdapter(appInflater, content);
+        listView.setAdapter(adapter);
+
+        OverScrollDecoratorHelper.setUpOverScroll(listView);
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/MiscViewsDemoFragment.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/MiscViewsDemoFragment.java
new file mode 100755
index 0000000..bca35af
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/MiscViewsDemoFragment.java
@@ -0,0 +1,45 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Chronometer;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+
+public class MiscViewsDemoFragment extends Fragment {
+
+    private static final String CHRONO_TIME_SAVE_ID = "chronoTime";
+
+    private Chronometer mChrono;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.misc_overscroll_demo, null, false);
+
+        View textView = fragmentView.findViewById(R.id.demo_text);
+        OverScrollDecoratorHelper.setUpStaticOverScroll(textView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+
+        View imageView = fragmentView.findViewById(R.id.demo_image);
+        OverScrollDecoratorHelper.setUpStaticOverScroll(imageView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+
+        mChrono = (Chronometer) fragmentView.findViewById(R.id.demo_chronometer);
+        if (savedInstanceState != null) {
+            mChrono.setBase(savedInstanceState.getLong(CHRONO_TIME_SAVE_ID));
+        }
+        OverScrollDecoratorHelper.setUpStaticOverScroll(mChrono, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+        mChrono.start();
+
+        return fragmentView;
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putLong(CHRONO_TIME_SAVE_ID, mChrono.getBase());
+
+        super.onSaveInstanceState(outState);
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/NestedScrollViewDemoFragment.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/NestedScrollViewDemoFragment.java
new file mode 100755
index 0000000..f57d411
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/NestedScrollViewDemoFragment.java
@@ -0,0 +1,21 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+
+public class NestedScrollViewDemoFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final ScrollView rootView = (ScrollView) inflater.inflate(R.layout.nested_scrollview_demo, null, false);
+        OverScrollDecoratorHelper.setUpOverScroll(rootView);
+        return rootView;
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewDemoFragment.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewDemoFragment.java
new file mode 100755
index 0000000..ad656eb
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewDemoFragment.java
@@ -0,0 +1,190 @@
+package me.everything.overscrolldemo.view;
+
+import android.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+import me.everything.android.ui.overscroll.IOverScrollDecor;
+import me.everything.android.ui.overscroll.IOverScrollStateListener;
+import me.everything.android.ui.overscroll.IOverScrollUpdateListener;
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.adapters.RecyclerViewOverScrollDecorAdapter;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+
+public class RecyclerViewDemoFragment extends Fragment {
+
+    private TextView mHorizScrollMeasure;
+    private TextView mVertScrollMeasure;
+
+    private IOverScrollDecor mHorizOverScrollEffect;
+    private IOverScrollDecor mVertOverScrollEffect;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        setHasOptionsMenu(true);
+
+        View fragmentView = inflater.inflate(R.layout.recyclerview_overscroll_demo, null, false);
+
+        mHorizScrollMeasure = (TextView) fragmentView.findViewById(R.id.horizontal_scroll_measure);
+        mVertScrollMeasure = (TextView) fragmentView.findViewById(R.id.vertical_scroll_measure);
+
+        initHorizontalRecyclerView((RecyclerView) fragmentView.findViewById(R.id.horizontal_recycler_view));
+        initVerticalRecyclerView((RecyclerView) fragmentView.findViewById(R.id.vertical_recycler_view));
+        return fragmentView;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        final MenuItem detachMenuItem = menu.add("Detach over-scroll").setVisible(true);
+        final MenuItem attachMenuItem = menu.add("Attach over-scroll").setVisible(false);
+        detachMenuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                detachMenuItem.setVisible(false);
+                attachMenuItem.setVisible(true);
+                mHorizOverScrollEffect.detach();
+                mVertOverScrollEffect.detach();
+                return true;
+            }
+        });
+        attachMenuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                detachMenuItem.setVisible(true);
+                attachMenuItem.setVisible(false);
+                initHorizontalRecyclerView((RecyclerView) getView().findViewById(R.id.horizontal_recycler_view));
+                initVerticalRecyclerView((RecyclerView) getView().findViewById(R.id.vertical_recycler_view));
+                return true;
+            }
+        });
+
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    private void initHorizontalRecyclerView(RecyclerView recyclerView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        RecyclerView.Adapter adapter = new DemoRecyclerAdapterHorizontal(DemoContentHelper.getSpectrumItems(getResources()), appInflater);
+        recyclerView.setAdapter(adapter);
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false));
+
+        // Apply over-scroll in 'standard form' - i.e. using the helper.
+        mHorizOverScrollEffect = OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+
+        // Over-scroll listeners can be applied in standard form as well.
+        mHorizOverScrollEffect.setOverScrollUpdateListener(new IOverScrollUpdateListener() {
+            @Override
+            public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) {
+                mHorizScrollMeasure.setText(String.valueOf((int) offset));
+            }
+        });
+        mHorizOverScrollEffect.setOverScrollStateListener(new IOverScrollStateListener() {
+
+            private final int mDragColorLeft = getResources().getColor(android.R.color.holo_purple);
+            private final int mBounceBackColorLeft = getResources().getColor(android.R.color.holo_blue_light);
+            private final int mDragColorRight = getResources().getColor(android.R.color.holo_red_light);
+            private final int mBounceBackColorRight = getResources().getColor(android.R.color.holo_orange_dark);
+            private final int mClearColor = mHorizScrollMeasure.getCurrentTextColor();
+
+            @Override
+            public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) {
+                if (newState == STATE_DRAG_START_SIDE) {
+                    mHorizScrollMeasure.setTextColor(mDragColorLeft);
+                } else if (newState == STATE_DRAG_END_SIDE) {
+                    mHorizScrollMeasure.setTextColor(mDragColorRight);
+                } else if (newState == STATE_BOUNCE_BACK) {
+                    mHorizScrollMeasure.setTextColor((oldState == STATE_DRAG_START_SIDE) ? mBounceBackColorLeft : mBounceBackColorRight);
+                } else {
+                    mHorizScrollMeasure.setTextColor(mClearColor);
+                }
+            }
+        });
+    }
+
+    private void initVerticalRecyclerView(RecyclerView recyclerView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        final DemoRecyclerAdapterBase adapter = new DemoRecyclerAdapterVertical(new ArrayList<>(DemoContentHelper.getReverseSpectrumItems(getResources())), appInflater);
+        recyclerView.setAdapter(adapter);
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+
+        // Set-up of recycler-view's native item swiping.
+        ItemTouchHelper.Callback itemTouchHelperCallback = new ItemTouchHelper.Callback() {
+            @Override
+            public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+                return makeMovementFlags(0, ItemTouchHelper.RIGHT);
+            }
+
+            @Override
+            public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+                return false;
+            }
+
+            @Override
+            public void onSwiped(final RecyclerView.ViewHolder viewHolder, int direction) {
+                AlertDialog dialog = new AlertDialog.Builder(getActivity())
+                        .setTitle("Item swiping is supported!")
+                        .setMessage("Recycler-view's native item swiping and the over-scrolling effect can co-exist! But, to get them to work WELL -- please apply the effect using the dedicated helper method!")
+                        .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                adapter.notifyDataSetChanged();
+                            }
+                        })
+                        .create();
+                dialog.show();
+            }
+        };
+
+        // Apply over-scroll in 'advanced form' - i.e. create an instance manually.
+        mVertOverScrollEffect = new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView, itemTouchHelperCallback));
+
+        // Over-scroll listeners are applied here via the mVertOverScrollEffect explicitly.
+        mVertOverScrollEffect.setOverScrollUpdateListener(new IOverScrollUpdateListener() {
+            @Override
+            public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) {
+                mVertScrollMeasure.setText(String.valueOf((int) offset));
+            }
+        });
+        mVertOverScrollEffect.setOverScrollStateListener(new IOverScrollStateListener() {
+            private final int mDragColorTop = getResources().getColor(android.R.color.holo_red_light);
+            private final int mBounceBackColorTop = getResources().getColor(android.R.color.holo_orange_dark);
+            private final int mDragColorBottom = getResources().getColor(android.R.color.holo_purple);
+            private final int mBounceBackColorBottom = getResources().getColor(android.R.color.holo_blue_light);
+            private final int mClearColor = mHorizScrollMeasure.getCurrentTextColor();
+
+            @Override
+            public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) {
+                if (newState == STATE_DRAG_START_SIDE) {
+                    mVertScrollMeasure.setTextColor(mDragColorTop);
+                } else if (newState == STATE_DRAG_END_SIDE) {
+                    mVertScrollMeasure.setTextColor(mDragColorBottom);
+                } else if (newState == STATE_BOUNCE_BACK) {
+                    mVertScrollMeasure.setTextColor(oldState == STATE_DRAG_START_SIDE ? mBounceBackColorTop : mBounceBackColorBottom);
+                } else {
+                    mVertScrollMeasure.setTextColor(mClearColor);
+                }
+            }
+        });
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewStaggeredGridDemoFragment.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewStaggeredGridDemoFragment.java
new file mode 100755
index 0000000..bbbc314
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewStaggeredGridDemoFragment.java
@@ -0,0 +1,39 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+
+public class RecyclerViewStaggeredGridDemoFragment extends Fragment {
+
+    private static final int GRID_SPAN_COUNT = 2;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.recyclerview_stgrid_overscroll_demo, null, false);
+        initVerticalRecyclerView((RecyclerView) fragmentView.findViewById(R.id.vertical_recycler_view));
+        return fragmentView;
+    }
+
+    private void initVerticalRecyclerView(RecyclerView recyclerView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        final DemoRecyclerAdapterBase adapter = new DemoRecyclerAdapterVertical(new ArrayList<>(DemoContentHelper.getReverseSpectrumItems(getResources())), appInflater);
+        recyclerView.setAdapter(adapter);
+
+        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(GRID_SPAN_COUNT, StaggeredGridLayoutManager.VERTICAL));
+        OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ScrollViewDemoFragment.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ScrollViewDemoFragment.java
new file mode 100755
index 0000000..2557eb2
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ScrollViewDemoFragment.java
@@ -0,0 +1,34 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+
+public class ScrollViewDemoFragment extends Fragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.scrollview_overscroll_demo, null, false);
+        initHorizontalScrollView((HorizontalScrollView) fragmentView.findViewById(R.id.horizontal_scroll_view));
+        initVerticalScrollView((ScrollView) fragmentView.findViewById(R.id.vertical_scroll_view));
+        return fragmentView;
+    }
+
+    private void initHorizontalScrollView(HorizontalScrollView scrollView) {
+        OverScrollDecoratorHelper.setUpOverScroll(scrollView);
+    }
+
+    private void initVerticalScrollView(ScrollView scrollView) {
+        OverScrollDecoratorHelper.setUpOverScroll(scrollView);
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ViewPagerDemoFragment.java b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ViewPagerDemoFragment.java
new file mode 100755
index 0000000..fd81c12
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ViewPagerDemoFragment.java
@@ -0,0 +1,78 @@
+package me.everything.overscrolldemo.view;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class ViewPagerDemoFragment extends Fragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.viewpager_overscroll_demo,null,false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initHorizontalViewPager(DemoContentHelper.getSpectrumItems(getResources()), ((ViewPager) view.findViewById(R.id.view_pager)));
+    }
+
+    private void initHorizontalViewPager(List<DemoItem> items, ViewPager viewPager) {
+
+        ViewPagerAdapter adapter = new ViewPagerAdapter(items);
+        viewPager.setAdapter(adapter);
+        OverScrollDecoratorHelper.setUpOverScroll(viewPager);
+    }
+
+    public static class ViewPagerAdapter extends PagerAdapter{
+
+        private List<DemoItem> items;
+        public ViewPagerAdapter(List<DemoItem> items){
+            this.items = items;
+        }
+
+        @Override
+        public int getCount() {
+            return items.size();
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object object) {
+            return view == object;
+        }
+
+        @Override
+        @NonNull
+        public Object instantiateItem(ViewGroup container, int position) {
+            TextView textView = new TextView(container.getContext());
+            textView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+            textView.setText(items.get(position).getColorName());
+            textView.setBackgroundColor(items.get(position).getColor());
+            textView.setGravity(Gravity.CENTER);
+            container.addView(textView);
+            return textView;
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            container.removeView((View) object);
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/animator/fade_in_slow.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/animator/fade_in_slow.xml
new file mode 100755
index 0000000..aa48445
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/animator/fade_in_slow.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/linear"
+    android:valueFrom="0.0"
+    android:valueTo="1.0"
+    android:propertyName="alpha"
+    android:duration="500"
+    />
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/animator/fade_out_quick.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/animator/fade_out_quick.xml
new file mode 100755
index 0000000..ea03297
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/animator/fade_out_quick.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/linear"
+    android:valueFrom="1.0"
+    android:valueTo="0.0"
+    android:propertyName="alpha"
+    android:duration="80"
+    />
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/color/drawer_items_text.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/color/drawer_items_text.xml
new file mode 100755
index 0000000..1c5b9ac
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/color/drawer_items_text.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:color="@android:color/white"
+        android:state_checked="true"
+        />
+    <item android:color="@android:color/darker_gray"/>
+</selector>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/app_icon.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/app_icon.png
new file mode 100755
index 0000000..1a06c30
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/app_icon.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_grid.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_grid.png
new file mode 100755
index 0000000..f1f6910
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_grid.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_list.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_list.png
new file mode 100755
index 0000000..1748953
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_list.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_misc.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_misc.png
new file mode 100755
index 0000000..60e5851
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_misc.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_recycler.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_recycler.png
new file mode 100755
index 0000000..be5e74d
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_recycler.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_scroller.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_scroller.png
new file mode 100755
index 0000000..43dd039
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_scroller.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_view_pager.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_view_pager.png
new file mode 100755
index 0000000..8003b4f
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_view_pager.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/app_icon.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/app_icon.png
new file mode 100755
index 0000000..b2d0ecd
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/app_icon.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_grid.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_grid.png
new file mode 100755
index 0000000..2ed88db
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_grid.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_list.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_list.png
new file mode 100755
index 0000000..43bd9d1
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_list.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_misc.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_misc.png
new file mode 100755
index 0000000..8a70585
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_misc.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_recycler.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_recycler.png
new file mode 100755
index 0000000..24826a0
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_recycler.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_scroller.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_scroller.png
new file mode 100755
index 0000000..a48a974
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_scroller.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_view_pager.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_view_pager.png
new file mode 100755
index 0000000..c7fcd53
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_view_pager.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/app_icon.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/app_icon.png
new file mode 100755
index 0000000..cb9e95e
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/app_icon.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_grid.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_grid.png
new file mode 100755
index 0000000..2ed2556
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_grid.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_list.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_list.png
new file mode 100755
index 0000000..52e0e49
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_list.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_misc.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_misc.png
new file mode 100755
index 0000000..d64883a
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_misc.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_recycler.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_recycler.png
new file mode 100755
index 0000000..7bf67b2
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_recycler.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_scroller.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_scroller.png
new file mode 100755
index 0000000..57689f0
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_scroller.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_view_pager.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_view_pager.png
new file mode 100755
index 0000000..61ec65e
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_view_pager.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/app_icon.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/app_icon.png
new file mode 100755
index 0000000..ff550d4
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/app_icon.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_grid.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_grid.png
new file mode 100755
index 0000000..051283b
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_grid.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_list.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_list.png
new file mode 100755
index 0000000..d24bc35
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_list.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_misc.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_misc.png
new file mode 100755
index 0000000..88eed60
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_misc.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_recycler.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_recycler.png
new file mode 100755
index 0000000..02291e8
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_recycler.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_scroller.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_scroller.png
new file mode 100755
index 0000000..cc3d3b1
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_scroller.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_view_pager.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_view_pager.png
new file mode 100755
index 0000000..edb43dc
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_view_pager.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/app_icon.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/app_icon.png
new file mode 100755
index 0000000..f9b9466
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/app_icon.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_grid.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_grid.png
new file mode 100755
index 0000000..003d111
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_grid.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_list.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_list.png
new file mode 100755
index 0000000..a499fff
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_list.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_misc.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_misc.png
new file mode 100755
index 0000000..c40b9fb
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_misc.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_recycler.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_recycler.png
new file mode 100755
index 0000000..17bd8fa
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_recycler.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_scroller.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_scroller.png
new file mode 100755
index 0000000..96d5ce4
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_scroller.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_view_pager.png b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_view_pager.png
new file mode 100755
index 0000000..e179580
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_view_pager.png differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_header_bkg.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_header_bkg.xml
new file mode 100755
index 0000000..99cea19
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_header_bkg.xml
@@ -0,0 +1,10 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <gradient
+        android:startColor="@android:color/holo_red_dark"
+        android:centerColor="@android:color/holo_green_light"
+        android:endColor="@android:color/holo_blue_dark"
+        android:type="linear"
+        android:angle="135"
+        />
+</shape>
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_items_bkg.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_items_bkg.xml
new file mode 100755
index 0000000..b8d7c41
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_items_bkg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@android:color/darker_gray"
+        android:state_checked="true"
+        />
+</selector>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo.xml
new file mode 100755
index 0000000..963e14f
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.drawerlayout.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start"
+    >
+
+    <include layout="@layout/activity_overscroll_demo_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/drawer_nav"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+
+        app:headerLayout="@layout/drawer_header_overscroll_demo"
+        app:menu="@menu/activity_overscroll_demo_drawer_items"
+
+        app:itemBackground="@drawable/drawer_items_bkg"
+        />
+
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo_content.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo_content.xml
new file mode 100755
index 0000000..d860284
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo_content.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".OverscrollDemo"
+    >
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        >
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/fragment_placeholder"
+        android:layout_below="@id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        />
+
+</RelativeLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/drawer_header_overscroll_demo.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/drawer_header_overscroll_demo.xml
new file mode 100755
index 0000000..a8a57cc
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/drawer_header_overscroll_demo.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/nav_header_height"
+    android:background="@color/colorPrimary"
+    android:padding="16dp"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark"
+    android:orientation="horizontal"
+    android:gravity="fill_horizontal"
+    >
+
+    <ImageView
+        android:layout_height="64dp"
+        android:layout_width="64dp"
+        android:src="@drawable/app_icon"
+        android:layout_gravity="center_vertical"
+        />
+
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:gravity="center_vertical"
+        android:paddingLeft="16dp"
+        >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:text="@string/drawer_title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+            android:textSize="18dp"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/drawer_subtitle"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/grid_item.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/grid_item.xml
new file mode 100755
index 0000000..130584a
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/grid_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_width="match_parent"
+    android:layout_height="200dp"
+    android:textSize="30dp"
+    android:textColor="@android:color/black"
+    android:gravity="center"
+    />
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/gridview_overscroll_demo.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/gridview_overscroll_demo.xml
new file mode 100755
index 0000000..b0f93e1
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/gridview_overscroll_demo.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/vert_drag_label"
+        android:lines="1"
+        />
+    <!--
+      When over-scrolling is applied over views that don't stretch over the entire vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:layout_weight="1"
+        >
+        <GridView
+            android:id="@+id/grid_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:numColumns="auto_fit"
+            android:stretchMode="columnWidth"
+            android:verticalSpacing="10dp"
+            android:horizontalSpacing="10dp"
+            android:gravity="center"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/horizontal_list_item.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/horizontal_list_item.xml
new file mode 100755
index 0000000..8b9fa98
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/horizontal_list_item.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_height="match_parent"
+    android:layout_width="100dp"
+    android:paddingTop="20dp"
+    android:paddingBottom="20dp"
+    android:paddingLeft="5dp"
+    android:paddingRight="5dp"
+    android:textSize="18dp"
+    android:textColor="@android:color/black"
+    android:gravity="center"
+    />
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/list_item.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/list_item.xml
new file mode 100755
index 0000000..53d3109
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/list_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="20dp"
+    android:paddingBottom="20dp"
+    android:textSize="40dp"
+    android:gravity="center"
+    android:clickable="true"
+    android:background="@android:color/black"
+    />
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/listview_overscroll_demo.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/listview_overscroll_demo.xml
new file mode 100755
index 0000000..d2dcc87
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/listview_overscroll_demo.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/vert_drag_label"
+        android:lines="1"
+        />
+    <!--
+      When over-scrolling is applied over views that don't stretch over the entire vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:layout_weight="1"
+        >
+        <ListView
+            android:id="@+id/list_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/misc_overscroll_demo.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/misc_overscroll_demo.xml
new file mode 100755
index 0000000..9c86bf9
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/misc_overscroll_demo.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:id="@+id/demo_text"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:clickable="true"
+        android:text="Practically any clickable widget can be over-scrolled.\nTry it!"
+        android:textSize="30sp"
+        android:layout_gravity="center"
+        android:gravity="center"
+        />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        >
+        <ImageView
+            android:id="@+id/demo_image"
+            android:layout_width="128dp"
+            android:layout_height="128dp"
+            android:layout_gravity="center"
+            android:clickable="true"
+            android:background="@drawable/app_icon"
+            />
+    </FrameLayout>
+
+    <Chronometer
+        android:id="@+id/demo_chronometer"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:textSize="30sp"
+        />
+
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/nested_scrollview_demo.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/nested_scrollview_demo.xml
new file mode 100755
index 0000000..0f7b172
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/nested_scrollview_demo.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbars="none"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        >
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/nested_scrollview_root"
+            android:layout_width="match_parent"
+            android:layout_height="180dp"
+            android:padding="14dp"
+            android:paddingTop="0dp"
+            >
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/nested_scrollview_text"
+                android:textSize="19sp"
+                android:textStyle="bold"
+                />
+        </androidx.core.widget.NestedScrollView>
+
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_overscroll_demo.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_overscroll_demo.xml
new file mode 100755
index 0000000..7ef1872
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_overscroll_demo.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+        <TextView
+            android:id="@+id/horizontal_recycler_view_header"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:textSize="@dimen/default_label_size"
+            android:text="@string/horiz_drag_label"
+            android:lines="1"
+            />
+        <TextView
+            android:id="@+id/horizontal_scroll_measure"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:textSize="@dimen/default_subtitle_size"
+            android:text="0"
+            android:textStyle="bold"
+            />
+    </LinearLayout>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/horizontal_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:layout_weight="3"
+        />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+        <TextView
+            android:id="@+id/vertical_recycler_view_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:textSize="@dimen/default_label_size"
+            android:text="@string/vert_drag_label"
+            android:lines="1"
+            />
+        <TextView
+            android:id="@+id/vertical_scroll_measure"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:textSize="@dimen/default_subtitle_size"
+            android:text="0"
+            android:textStyle="bold"
+            />
+    </LinearLayout>
+    <!--
+      When over-scrolling is applied over views that don't stretch though the full vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:layout_weight="7"
+        >
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/vertical_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_stgrid_overscroll_demo.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_stgrid_overscroll_demo.xml
new file mode 100755
index 0000000..9374ae6
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_stgrid_overscroll_demo.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:id="@+id/vertical_recycler_view_header"
+        >
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:textSize="@dimen/default_label_size"
+            android:text="@string/vert_drag_label"
+            android:lines="1"
+            />
+    </LinearLayout>
+    <!--
+      When over-scrolling is applied over views that don't stretch though the full vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="10dp"
+        >
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/vertical_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_horizontal_item.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_horizontal_item.xml
new file mode 100755
index 0000000..b211fd8
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_horizontal_item.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_marginRight="20dp"
+    >
+
+    <ImageView
+        android:layout_height="64dp"
+        android:layout_width="64dp"
+        android:src="@drawable/app_icon"
+        android:layout_gravity="center"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="EverythingMe"
+        />
+
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_overscroll_demo.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_overscroll_demo.xml
new file mode 100755
index 0000000..909b58f
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_overscroll_demo.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/horiz_drag_label"
+        android:lines="1"
+        />
+    <HorizontalScrollView
+        android:id="@+id/horizontal_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:layout_weight="3"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            >
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+        </LinearLayout>
+    </HorizontalScrollView>
+
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/vert_drag_label"
+        android:lines="1"
+        />
+
+    <!--
+     When over-scrolling is applied over views that don't stretch over the full vertical region,
+     an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+     in effect.
+     -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:layout_weight="7"
+        >
+        <ScrollView
+            android:id="@+id/vertical_scroll_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                >
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+            </LinearLayout>
+        </ScrollView>
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_vertical_item.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_vertical_item.xml
new file mode 100755
index 0000000..b059e38
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_vertical_item.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginBottom="10dp"
+    >
+
+    <ImageView
+        android:layout_height="64dp"
+        android:layout_width="64dp"
+        android:src="@drawable/app_icon"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:text="EverythingMe"
+        android:textSize="21dp"
+        android:gravity="left|center_vertical"
+        android:layout_gravity="center"
+        />
+
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/vert_recycler.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/vert_recycler.xml
new file mode 100755
index 0000000..d0da0f3
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/vert_recycler.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:showIn="@layout/app_bar_overscroll_demo"
+    tools:context=".OverscrollDemo"
+    >
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
+
+    </androidx.recyclerview.widget.RecyclerView>
+
+</RelativeLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/vertical_list_item.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/vertical_list_item.xml
new file mode 100755
index 0000000..adbd570
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/vertical_list_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="20dp"
+    android:paddingBottom="20dp"
+    android:textSize="40dp"
+    android:textColor="@android:color/black"
+    android:gravity="center"
+    />
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/viewpager_overscroll_demo.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/viewpager_overscroll_demo.xml
new file mode 100755
index 0000000..400fa2f
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/layout/viewpager_overscroll_demo.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/menu/activity_overscroll_demo_drawer_items.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/menu/activity_overscroll_demo_drawer_items.xml
new file mode 100755
index 0000000..c74bb49
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/menu/activity_overscroll_demo_drawer_items.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <group
+        android:checkableBehavior="single">
+
+        <item
+            android:id="@+id/drawer_item_recyclerview_demo"
+            android:icon="@drawable/ic_recycler"
+            android:title="RecyclerView Demo"
+            android:checked="true"
+            />
+        <item
+            android:id="@+id/drawer_item_recyclerview_staggered_grid_demo"
+            android:icon="@drawable/ic_recycler"
+            android:title="RecyclerView - St.Grid Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_gridview_demo"
+            android:icon="@drawable/ic_grid"
+            android:title="GridView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_listview_demo"
+            android:icon="@drawable/ic_list"
+            android:title="ListView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_scrollview_demo"
+            android:icon="@drawable/ic_scroller"
+            android:title="ScrollView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_viewpager_demo"
+            android:icon="@drawable/ic_view_pager"
+            android:title="ViewPager Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_nested_scrollview_demo"
+            android:title="NestedScrollView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_misc_demo"
+            android:icon="@drawable/ic_misc"
+            android:title="Misc-Views Demo"
+            />
+
+    </group>
+
+</menu>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values-v21/styles.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..65d0c39
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,8 @@
+<resources>>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values-w820dp/dimens.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/colors.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..bf11420
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/colors.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">@android:color/holo_orange_light</color>
+    <color name="colorPrimaryDark">@android:color/holo_orange_dark</color>
+    <color name="colorAccent">#FF4081</color>
+
+    <color name="spectrum_cyan">#00e0e0</color>
+    <color name="spectrum_yellow">#f0e000</color>
+</resources>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/dimens.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..730a34b
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/dimens.xml
@@ -0,0 +1,9 @@
+<resources>
+    <dimen name="nav_header_vertical_spacing">16dp</dimen>
+    <dimen name="nav_header_height">140dp</dimen>
+
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="default_label_size">26sp</dimen>
+    <dimen name="default_subtitle_size">22sp</dimen>
+</resources>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/strings.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..6fb15cf
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/strings.xml
@@ -0,0 +1,23 @@
+<resources>
+    <string name="app_name">OverscrollDemo</string>
+
+    <string name="drawer_title">Over-Scroll Demo App</string>
+    <string name="drawer_subtitle">EverythingMe</string>
+
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+
+    <string name="grid_view_demo_title">GridView Over-Scroll Demo</string>
+    <string name="list_view_demo_title">ListView Over-Scroll Demo</string>
+    <string name="recycler_view_demo_title">RecyclerView Over-Scroll Demo</string>
+    <string name="recycler_view_staggered_grid_demo_title">RecyclerView St.Grid Over-Scroll Demo</string>
+    <string name="scroll_view_demo_title">ScrollView Over-Scroll Demo</string>
+    <string name="viewpager_demo_title">ViewPager Over-Scroll Demo</string>
+    <string name="nested_scrollview_demo_title">NestedScrollView Over-Scroll Demo</string>
+    <string name="misc_views_demo_title">Misc. Over-Scroll Demo</string>
+    <string name="nested_scrollview_text">This text box is scrollable thanks to being situated inside a nested scroll view. That makes it scrollable regardless of the scrolling of the content of the entire screen, which can be scrolled independently.\nThe point here is to demonstrate how the over-scroll effect can work in the presence of nested scroll-views, provided it is applied over the parent (root) view, regardless of having inner nested scroll-views as children.\nIn this demo, the root view is merely a ScrollView, and therefore applying the effect over it is straightforward (i.e. using the OverScrollHelper).</string>
+
+    <string name="horiz_drag_label">⇔ Drag Horizontally</string>
+    <string name="vert_drag_label">⇳ Drag Vertically</string>
+
+</resources>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/styles.xml b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..44f664f
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/app/src/main/res/values/styles.xml
@@ -0,0 +1,17 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+</resources>
diff --git a/OnTime_Driver_live/lib/overscroll-decor/build.gradle b/OnTime_Driver_live/lib/overscroll-decor/build.gradle
new file mode 100755
index 0000000..6270b01
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/build.gradle
@@ -0,0 +1,26 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext {
+        _isOverscrollDecor = true
+    }
+
+    repositories {
+        mavenCentral()
+        google()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.0.2'
+    }
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+        google()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/gradle.properties b/OnTime_Driver_live/lib/overscroll-decor/gradle.properties
new file mode 100755
index 0000000..915f0e6
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/gradle.properties
@@ -0,0 +1,20 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/overscroll-decor/gradle/wrapper/gradle-wrapper.properties b/OnTime_Driver_live/lib/overscroll-decor/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..5a4891d
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Mar 02 14:56:48 WIB 2026
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_Driver_live/lib/overscroll-decor/gradlew b/OnTime_Driver_live/lib/overscroll-decor/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/.gitignore b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/build.gradle b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/build.gradle
new file mode 100755
index 0000000..755b956
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/build.gradle
@@ -0,0 +1,33 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'me.everything.android.ui.overscroll'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName '1.0'
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:3.1.0'
+    testImplementation 'org.robolectric:robolectric:4.3.1'
+}
+
+// Enable publishing
+if (rootProject.hasProperty('_isOverscrollDecor')) {
+    apply from: './publishing.gradle'
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/publish-pom.gradle b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/publish-pom.gradle
new file mode 100755
index 0000000..0710b48
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/publish-pom.gradle
@@ -0,0 +1,39 @@
+// Based on https://stackoverflow.com/a/42160584/453052
+
+project.ext.buildPomXmlDependencies = { pom, configurations ->
+    pom.withXml {
+        final rootNode = asNode().appendNode('dependencies')
+        addConfigurationDependencies(rootNode, configurations.api, 'compile')
+        addConfigurationDependencies(rootNode, configurations.compile, 'compile')
+        addConfigurationDependencies(rootNode, configurations.implementation, 'runtime')
+    }
+}
+
+private static def addConfigurationDependencies(rootNode, Configuration configuration, String scope) {
+    configuration.dependencies.each { dep -> addChildDependency(rootNode, dep, scope) }
+}
+
+private static def addChildDependency(rootNode, Dependency dep, String scope) {
+    if (dep.group == null || dep.version == null || dep.name == null || dep.name == "unspecified")
+        return
+
+    final childNode = rootNode.appendNode('dependency')
+    childNode.appendNode('groupId', dep.group)
+    childNode.appendNode('artifactId', dep.name)
+    childNode.appendNode('version', dep.version)
+    childNode.appendNode('scope', scope)
+
+    if (!dep.transitive) {
+        // If this dependency is transitive, we should force exclude all its dependencies them from the POM
+        final exclusionNode = childNode.appendNode('exclusions').appendNode('exclusion')
+        exclusionNode.appendNode('groupId', '*')
+        exclusionNode.appendNode('artifactId', '*')
+    } else if (!dep.properties.excludeRules.empty) {
+        // Otherwise add specified exclude rules
+        final exclusionNode = childNode.appendNode('exclusions').appendNode('exclusion')
+        dep.properties.excludeRules.each { ExcludeRule rule ->
+            exclusionNode.appendNode('groupId', rule.group ?: '*')
+            exclusionNode.appendNode('artifactId', rule.module ?: '*')
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/publishing.gradle b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/publishing.gradle
new file mode 100755
index 0000000..1eafeda
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/publishing.gradle
@@ -0,0 +1,205 @@
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+apply from: './publish-pom.gradle'
+
+String TARGET_MAVEN_CENTRAL_URL = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
+
+List DEVELOPERS = [
+    [name: 'd4vidi', email: 'amit.d4vidi@gmail.com'],
+]
+
+String _sonatypeUsername = 'd4vidi'
+String _sonatypePassword = System.getProperty('sonatypePassword')
+String _versionName = System.getProperty('version')
+String _mavenRepoUrl = TARGET_MAVEN_CENTRAL_URL
+Map _mavenCredentials = [
+        username: _sonatypeUsername,
+        password: _sonatypePassword,
+]
+def _selectedVariant = null
+
+def onPrePublish = {
+    assertDefined(_versionName, "Publishing: Version not specified (run 'gradle publish' with a -Dversion=1.2.3 argument)")
+    assertDefined(_sonatypePassword, "Publishing: Please specify the password to use for sonatype (run 'gradle publish' with a -DsonatypePassword=<pw> argument)")
+    logger.lifecycle("Publishing is now in session! 📣\n  Version: $_versionName\n  Target URL: ${_mavenRepoUrl}\n  Build-variant: '${_selectedVariant.name}'")
+}
+
+def declareArchive = { target ->
+    project.artifacts {
+        archives target
+    }
+}
+
+// Running from Gradle tab in IDE would create liboverscroll/build/libs/liboverscroll-sources.jar
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+    failOnError false
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+// Running from Gradle tab in IDE would create liboverscroll/build/libs/liboverscroll-javadoc.jar
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+/*
+ * Signing configuration
+ * https://docs.gradle.org/current/userguide/signing_plugin.html
+ */
+
+// Tell signing task to sign everything current and future we set as a project archive...
+signing {
+    sign configurations.archives
+}
+
+/*
+ * Plumbing work for actually having the publishing task work properly, if executed
+ */
+
+project.afterEvaluate {
+    project.tasks.all { Task task ->
+        android.libraryVariants.all { variant ->
+            String variantName = variant.name.capitalize()
+            if (task.name == "publishMaven${variantName}AarPublicationToMavenRepository") {
+                task.dependsOn "assemble${variantName}"
+                task.dependsOn project.tasks.signArchives
+                task.doFirst {
+                    onPrePublish()
+                }
+            }
+        }
+    }
+}
+
+/*
+ * Publishing configuration
+ */
+
+publishing {
+    repositories {
+        maven {
+            url _mavenRepoUrl
+            if (_mavenCredentials != null) {
+                credentials {
+                    username _mavenCredentials.username
+                    password _mavenCredentials.password
+                }
+            }
+        }
+    }
+
+    publications {
+        android.libraryVariants.all { variant ->
+            if (isReleaseVariant(variant)) {
+                _selectedVariant = variant
+
+                String variantNameCapitalized = variant.name.capitalize()
+
+                "maven${variantNameCapitalized}Aar"(MavenPublication) {
+                    groupId 'io.github.everythingme'
+                    artifactId 'overscroll-decor-android'
+                    version "$_versionName"
+
+                    // Register built .aar as published artifact (as a file, explicitly)
+                    variant.outputs.forEach { output ->
+                        artifact output.outputFile
+
+                        // Also register as an archive-artifact, for signing (via equivalent task's output)
+                        declareArchive project.tasks["bundle${variantNameCapitalized}Aar"]
+                    }
+
+                    // Register sources, javadoc as published artifacts (via equivalent tasks' output)
+                    artifact sourcesJar
+                    artifact javadocJar
+
+                    // Also register source, javadoc as archive-artifacts, for signing
+                    declareArchive sourcesJar
+                    declareArchive javadocJar
+
+                    // Add package metadata to the .pom
+                    pom {
+                        name = 'Overscroll-Decor'
+                        description = 'iOS-like over-scrolling effect for Android'
+                        url = 'https://github.com/EverythingMe/overscroll-decor'
+                        packaging 'aar' // Oh so important - or apps would ignore our code!!!!!
+                        scm {
+                            connection = 'scm:git:git://github.com/EverythingMe/overscroll-decor'
+                            developerConnection = 'scm:git:git@github.com/EverythingMe/overscroll-decor.git'
+                            url = 'https://github.com/EverythingMe/overscroll-decor'
+                        }
+                        licenses {
+                            license {
+                                name = 'BSD-2'
+                                url = 'https://github.com/EverythingMe/overscroll-decor/blob/master/LICENSE'
+                            }
+                        }
+                        developers {
+                            DEVELOPERS.each { d ->
+                                developer {
+                                    name = d.name
+                                    email = d.email
+                                }
+                            }
+                        }
+                    }
+
+                    // Add dependencies to the .pom
+                    buildPomXmlDependencies(pom, configurations)
+
+                    // Register pom.xml's signature file (pom.xml.asc) as published artifact
+                    // Note: this is done manually, instead of registering the pom as an archived artifact
+                    pom.withXml {
+                        def pomFile = file("${project.buildDir}/generated-pom.xml")
+                        writeTo(pomFile) // Need to force-write so as to have the signature generated over the finalized content
+
+                        def pomAscFile = signing.sign(pomFile).signatureFiles[0]
+                        artifact(pomAscFile) {
+                            classifier = null
+                            extension = 'pom.asc'
+                        }
+                    }
+
+                    // Register all artifacts we've previously registered as archives (i.e. .jar.asc's, .aar.asc's) as published artifacts.
+                    // Note: this relies on preregistering the equivalent generator-tasks as archive artifacts
+                    // inside a project.artifacts { ... } clause.
+                    project.tasks.signArchives.signatureFiles.each {
+                        artifact(it) {
+                            def matcherSrcDocs = (it.file =~ /-(sources|javadoc)\.jar\.asc$/)
+                            def matcherAAR = (it.file =~ /\.aar\.asc$/)
+                            if (matcherSrcDocs.find()) {
+                                classifier = matcherSrcDocs.group(1)
+                                extension = 'jar.asc'
+                            } else if (matcherAAR.find()) {
+                                classifier = null
+                                extension = 'aar.asc'
+                            } else {
+                                classifier = null
+                                extension = null
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/*
+ * Utils
+ */
+
+private static def isReleaseVariant(variant) {
+    return variant.buildType.name == 'release'
+}
+
+private static def assertDefined(target, message) {
+    if (target == null) {
+        throw new IllegalArgumentException(message)
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/AndroidManifest.xml b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..7e22fa1
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
+
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecorator.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecorator.java
new file mode 100755
index 0000000..8d23793
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecorator.java
@@ -0,0 +1,97 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+/**
+ * A concrete implementation of {@link OverScrollBounceEffectDecoratorBase} for a horizontal orientation.
+ */
+public class HorizontalOverScrollBounceEffectDecorator extends OverScrollBounceEffectDecoratorBase {
+
+    protected static class MotionAttributesHorizontal extends MotionAttributes {
+
+        public boolean init(View view, MotionEvent event) {
+
+            // We must have history available to calc the dx. Normally it's there - if it isn't temporarily,
+            // we declare the event 'invalid' and expect it in consequent events.
+            if (event.getHistorySize() == 0) {
+                return false;
+            }
+
+            // Allow for counter-orientation-direction operations (e.g. item swiping) to run fluently.
+            final float dy = event.getY(0) - event.getHistoricalY(0, 0);
+            final float dx = event.getX(0) - event.getHistoricalX(0, 0);
+            if (Math.abs(dx) < Math.abs(dy)) {
+                return false;
+            }
+
+            mAbsOffset = view.getTranslationX();
+            mDeltaOffset = dx;
+            mDir = mDeltaOffset > 0;
+
+            return true;
+        }
+    }
+
+    protected static class AnimationAttributesHorizontal extends AnimationAttributes {
+
+        public AnimationAttributesHorizontal() {
+            mProperty = View.TRANSLATION_X;
+        }
+
+        @Override
+        protected void init(View view) {
+            mAbsOffset = view.getTranslationX();
+            mMaxOffset = view.getWidth();
+        }
+    }
+
+    /**
+     * C'tor, creating the effect with default arguments:
+     * <br/>Touch-drag ratio in 'forward' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD.
+     * <br/>Touch-drag ratio in 'backwards' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK.
+     * <br/>Deceleration factor (for the bounce-back effect) will be set to DEFAULT_DECELERATE_FACTOR.
+     *
+     * @param viewAdapter The view's encapsulation.
+     */
+    public HorizontalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter) {
+        this(viewAdapter, DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD, DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK, DEFAULT_DECELERATE_FACTOR);
+    }
+
+    /**
+     * C'tor, creating the effect with explicit arguments.
+     * @param viewAdapter The view's encapsulation.
+     * @param touchDragRatioFwd Ratio of touch distance to actual drag distance when in 'forward' direction.
+     * @param touchDragRatioBck Ratio of touch distance to actual drag distance when in 'backward'
+     *                          direction (opposite to initial one).
+     * @param decelerateFactor Deceleration factor used when decelerating the motion to create the
+     *                         bounce-back effect.
+     */
+    public HorizontalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter,
+                                                     float touchDragRatioFwd, float touchDragRatioBck, float decelerateFactor) {
+        super(viewAdapter, decelerateFactor, touchDragRatioFwd, touchDragRatioBck);
+    }
+
+    @Override
+    protected MotionAttributes createMotionAttributes() {
+        return new MotionAttributesHorizontal();
+    }
+
+    @Override
+    protected AnimationAttributes createAnimationAttributes() {
+        return new AnimationAttributesHorizontal();
+    }
+
+    @Override
+    protected void translateView(View view, float offset) {
+        view.setTranslationX(offset);
+    }
+
+    @Override
+    protected void translateViewAndEvent(View view, float offset, MotionEvent event) {
+        view.setTranslationX(offset);
+        event.offsetLocation(offset - event.getX(0), 0f);
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollDecor.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollDecor.java
new file mode 100755
index 0000000..a662b99
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollDecor.java
@@ -0,0 +1,30 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.View;
+
+public interface IOverScrollDecor {
+    View getView();
+
+    void setOverScrollStateListener(IOverScrollStateListener listener);
+    void setOverScrollUpdateListener(IOverScrollUpdateListener listener);
+
+    /**
+     * Get the current decorator's runtime state, i.e. one of the values specified by {@link IOverScrollState}.
+     * @return The state.
+     */
+    int getCurrentState();
+
+    /**
+     * Detach the decorator from its associated view, thus disabling it entirely.
+     *
+     * <p>It is best to call this only when over-scroll isn't currently in-effect - i.e. verify that
+     * <code>getCurrentState()==IOverScrollState.STATE_IDLE</code> as a precondition, or otherwise
+     * use a state listener previously installed using
+     * {@link #setOverScrollStateListener(IOverScrollStateListener)}.</p>
+     *
+     * <p>Note: Upon detachment completion, the view in question will return to the default
+     * Android over-scroll configuration (i.e. {@link View.OVER_SCROLL_ALWAYS} mode). This can be
+     * overridden by calling <code>View.setOverScrollMode(mode)</code> immediately thereafter.</p>
+     */
+    void detach();
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollState.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollState.java
new file mode 100755
index 0000000..919ab00
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollState.java
@@ -0,0 +1,16 @@
+package me.everything.android.ui.overscroll;
+
+public interface IOverScrollState {
+
+    /** No over-scroll is in-effect. */
+    int STATE_IDLE = 0;
+
+    /** User is actively touch-dragging, thus enabling over-scroll at the view's <i>start</i> side. */
+    int STATE_DRAG_START_SIDE = 1;
+
+    /** User is actively touch-dragging, thus enabling over-scroll at the view's <i>end</i> side. */
+    int STATE_DRAG_END_SIDE = 2;
+
+    /** User has released their touch, thus throwing the view back into place via bounce-back animation. */
+    int STATE_BOUNCE_BACK = 3;
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollStateListener.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollStateListener.java
new file mode 100755
index 0000000..5493f07
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollStateListener.java
@@ -0,0 +1,23 @@
+package me.everything.android.ui.overscroll;
+
+/**
+ * A callback-listener enabling over-scroll effect clients to be notified of effect state transitions.
+ * <br/>Invoked whenever state is transitioned onto one of {@link IOverScrollState#STATE_IDLE},
+ * {@link IOverScrollState#STATE_DRAG_START_SIDE}, {@link IOverScrollState#STATE_DRAG_END_SIDE}
+ * or {@link IOverScrollState#STATE_BOUNCE_BACK}.
+ *
+ * @see IOverScrollUpdateListener
+ */
+public interface IOverScrollStateListener {
+
+    /**
+     * The invoked callback.
+     *
+     * @param decor The associated over-scroll 'decorator'.
+     * @param oldState The old over-scroll state; ID's specified by {@link IOverScrollState}, e.g.
+     *                 {@link IOverScrollState#STATE_IDLE}.
+     * @param newState The <b>new</b> over-scroll state; ID's specified by {@link IOverScrollState},
+     *                 e.g. {@link IOverScrollState#STATE_IDLE}.
+     */
+    void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState);
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollUpdateListener.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollUpdateListener.java
new file mode 100755
index 0000000..f435d01
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollUpdateListener.java
@@ -0,0 +1,20 @@
+package me.everything.android.ui.overscroll;
+
+/**
+ * A callback-listener enabling over-scroll effect clients to subscribe to <b>real-time</b> updates
+ * of over-scrolling intensity, provided as the view-translation offset from pre-scroll position.
+ *
+ * @see IOverScrollStateListener
+ */
+public interface IOverScrollUpdateListener {
+
+    /**
+     * The invoked callback.
+     *
+     * @param decor The associated over-scroll 'decorator'.
+     * @param state One of: {@link IOverScrollState#STATE_IDLE}, {@link IOverScrollState#STATE_DRAG_START_SIDE},
+     *              {@link IOverScrollState#STATE_DRAG_START_SIDE} or {@link IOverScrollState#STATE_BOUNCE_BACK}.
+     * @param offset The currently visible offset created due to over-scroll.
+     */
+    void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset);
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/ListenerStubs.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/ListenerStubs.java
new file mode 100755
index 0000000..4feaaec
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/ListenerStubs.java
@@ -0,0 +1,14 @@
+package me.everything.android.ui.overscroll;
+
+public interface ListenerStubs {
+
+    class OverScrollStateListenerStub implements IOverScrollStateListener {
+        @Override
+        public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) { }
+    }
+
+    class OverScrollUpdateListenerStub implements IOverScrollUpdateListener {
+        @Override
+        public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) { }
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollBounceEffectDecoratorBase.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollBounceEffectDecoratorBase.java
new file mode 100755
index 0000000..5ca6b6d
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollBounceEffectDecoratorBase.java
@@ -0,0 +1,481 @@
+package me.everything.android.ui.overscroll;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.util.Log;
+import android.util.Property;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.Interpolator;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+import me.everything.android.ui.overscroll.adapters.RecyclerViewOverScrollDecorAdapter;
+
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+import static me.everything.android.ui.overscroll.ListenerStubs.*;
+
+/**
+ * A standalone view decorator adding over-scroll with a smooth bounce-back effect to (potentially) any view -
+ * provided that an appropriate {@link IOverScrollDecoratorAdapter} implementation exists / can be written
+ * for that view type (e.g. {@link RecyclerViewOverScrollDecorAdapter}).
+ *
+ * <p>Design-wise, being a standalone class, this decorator powerfully provides the ability to add
+ * the over-scroll effect over any view without adjusting the view's implementation. In essence, this
+ * eliminates the need to repeatedly implement the effect per each view type (list-view,
+ * recycler-view, image-view, etc.). Therefore, using it is highly recommended compared to other
+ * more intrusive solutions.</p>
+ *
+ * <p>Note that this class is abstract, having {@link HorizontalOverScrollBounceEffectDecorator} and
+ * {@link VerticalOverScrollBounceEffectDecorator} providing concrete implementations that are
+ * view-orientation specific.</p>
+ *
+ * <hr width="97%"/>
+ * <h2>Implementation Notes</h2>
+ *
+ * <p>At it's core, the class simply registers itself as a touch-listener over the decorated view and
+ * intercepts touch events as needed.</p>
+ *
+ * <p>Internally, it delegates the over-scrolling calculations onto 3 state-based classes:
+ * <ol>
+ *     <li><b>Idle state</b> - monitors view state and touch events to intercept over-scrolling initiation
+ *     (in which case it hands control over to the Over-scrolling state).</li>
+ *     <li><b>Over-scrolling state</b> - handles motion events to apply the over-scroll effect as users
+ *     interact with the view.</li>
+ *     <li><b>Bounce-back state</b> - runs the bounce-back animation, all-the-while blocking all
+ *     touch events till the animation completes (in which case it hands control back to the idle
+ *     state).</li>
+ * </ol>
+ * </p>
+ *
+ * @see RecyclerViewOverScrollDecorAdapter
+ * @see IOverScrollDecoratorAdapter
+ */
+public abstract class OverScrollBounceEffectDecoratorBase implements IOverScrollDecor, View.OnTouchListener {
+
+    public static final String TAG = "OverScrollDecor";
+
+    public static final float DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD = 3f;
+    public static final float DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK = 1f;
+    public static final float DEFAULT_DECELERATE_FACTOR = -2f;
+
+    protected static final int MAX_BOUNCE_BACK_DURATION_MS = 800;
+    protected static final int MIN_BOUNCE_BACK_DURATION_MS = 200;
+
+    protected final OverScrollStartAttributes mStartAttr = new OverScrollStartAttributes();
+    protected final IOverScrollDecoratorAdapter mViewAdapter;
+
+    protected final IdleState mIdleState;
+    protected final OverScrollingState mOverScrollingState;
+    protected final BounceBackState mBounceBackState;
+    protected IDecoratorState mCurrentState;
+
+    protected IOverScrollStateListener mStateListener = new OverScrollStateListenerStub();
+    protected IOverScrollUpdateListener mUpdateListener = new OverScrollUpdateListenerStub();
+
+    /**
+     * When in over-scroll mode, keep track of dragging velocity to provide a smooth slow-down
+     * for the bounce-back effect.
+     */
+    protected float mVelocity;
+
+    /**
+     * Motion attributes: keeps data describing current motion event.
+     * <br/>Orientation agnostic: subclasses provide either horizontal or vertical
+     * initialization of the agnostic attributes.
+     */
+    protected abstract static class MotionAttributes {
+        public float mAbsOffset;
+        public float mDeltaOffset;
+        public boolean mDir; // True = 'forward', false = 'backwards'.
+
+        protected abstract boolean init(View view, MotionEvent event);
+    }
+
+    protected static class OverScrollStartAttributes {
+        protected int mPointerId;
+        protected float mAbsOffset;
+        protected boolean mDir; // True = 'forward', false = 'backwards'.
+    }
+
+    protected abstract static class AnimationAttributes {
+        public Property<View, Float> mProperty;
+        public float mAbsOffset;
+        public float mMaxOffset;
+
+        protected abstract void init(View view);
+    }
+
+    /**
+     * Interface of decorator-state delegation classes. Defines states as handles of two fundamental
+     * touch events: actual movement, up/cancel.
+     */
+    protected interface IDecoratorState {
+
+        /**
+         * Handle a motion (touch) event.
+         *
+         * @param event The event from onTouch.
+         * @return Return value for onTouch.
+         */
+        boolean handleMoveTouchEvent(MotionEvent event);
+
+        /**
+         * Handle up / touch-cancel events.
+         *
+         * @param event The event from onTouch.
+         * @return Return value for onTouch.
+         */
+        boolean handleUpOrCancelTouchEvent(MotionEvent event);
+
+        /**
+         * Handle a transition onto this state, as it becomes 'current' state.
+         * @param fromState
+         */
+        void handleEntryTransition(IDecoratorState fromState);
+
+        /**
+         * The client-perspective ID of the state associated with this (internal) one. ID's
+         * are as specified in {@link IOverScrollState}.
+         *
+         * @return The ID, e.g. {@link IOverScrollState#STATE_IDLE}.
+         */
+        int getStateId();
+    }
+
+    /**
+     * Idle state: monitors move events, trying to figure out whether over-scrolling should be
+     * initiated (i.e. when scrolled further when the view is at one of its displayable ends).
+     * <br/>When such is the case, it hands over control to the over-scrolling state.
+     */
+    protected class IdleState implements IDecoratorState {
+
+        final MotionAttributes mMoveAttr;
+
+        public IdleState() {
+            mMoveAttr = createMotionAttributes();
+        }
+
+        @Override
+        public int getStateId() {
+            return STATE_IDLE;
+        }
+
+        @Override
+        public boolean handleMoveTouchEvent(MotionEvent event) {
+
+            final View view = mViewAdapter.getView();
+            if (!mMoveAttr.init(view, event)) {
+                return false;
+            }
+
+            // Has over-scrolling officially started?
+            if ((mViewAdapter.isInAbsoluteStart() && mMoveAttr.mDir) ||
+                (mViewAdapter.isInAbsoluteEnd() && !mMoveAttr.mDir)) {
+
+                // Save initial over-scroll attributes for future reference.
+                mStartAttr.mPointerId = event.getPointerId(0);
+                mStartAttr.mAbsOffset = mMoveAttr.mAbsOffset;
+                mStartAttr.mDir = mMoveAttr.mDir;
+
+                issueStateTransition(mOverScrollingState);
+                return mOverScrollingState.handleMoveTouchEvent(event);
+            }
+
+            return false;
+        }
+
+        @Override
+        public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
+            return false;
+        }
+
+        @Override
+        public void handleEntryTransition(IDecoratorState fromState) {
+            mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
+        }
+    }
+
+    /**
+     * Handles the actual over-scrolling: thus translating the view according to configuration
+     * and user interactions, dynamically.
+     *
+     * <br/><br/>The state is exited - thus completing over-scroll handling, in one of two cases:
+     * <br/>When user lets go of the view, it transitions control to the bounce-back state.
+     * <br/>When user moves the view back onto a potential 'under-scroll' state, it abruptly
+     * transitions control to the idle-state, so as to return touch-events management to the
+     * normal over-scroll-less environment (thus preventing under-scrolling and potentially regaining
+     * regular scrolling).
+     */
+    protected class OverScrollingState implements IDecoratorState {
+
+        protected final float mTouchDragRatioFwd;
+        protected final float mTouchDragRatioBck;
+
+        final MotionAttributes mMoveAttr;
+        int mCurrDragState;
+
+        public OverScrollingState(float touchDragRatioFwd, float touchDragRatioBck) {
+            mMoveAttr = createMotionAttributes();
+            mTouchDragRatioFwd = touchDragRatioFwd;
+            mTouchDragRatioBck = touchDragRatioBck;
+        }
+
+        @Override
+        public int getStateId() {
+            // This is really a single class that implements 2 states, so our ID depends on what
+            // it was during the last invocation.
+            return mCurrDragState;
+        }
+
+        @Override
+        public boolean handleMoveTouchEvent(MotionEvent event) {
+
+            // Switching 'pointers' (e.g. fingers) on-the-fly isn't supported -- abort over-scroll
+            // smoothly using the default bounce-back animation in this case.
+            if (mStartAttr.mPointerId != event.getPointerId(0)) {
+                issueStateTransition(mBounceBackState);
+                return true;
+            }
+
+            final View view = mViewAdapter.getView();
+            if (!mMoveAttr.init(view, event)) {
+                // Keep intercepting the touch event as long as we're still over-scrolling...
+                return true;
+            }
+
+            float deltaOffset = mMoveAttr.mDeltaOffset / (mMoveAttr.mDir == mStartAttr.mDir ? mTouchDragRatioFwd : mTouchDragRatioBck);
+            float newOffset = mMoveAttr.mAbsOffset + deltaOffset;
+
+            // If moved in counter direction onto a potential under-scroll state -- don't. Instead, abort
+            // over-scrolling abruptly, thus returning control to which-ever touch handlers there
+            // are waiting (e.g. regular scroller handlers).
+            if ( (mStartAttr.mDir && !mMoveAttr.mDir && (newOffset <= mStartAttr.mAbsOffset)) ||
+                 (!mStartAttr.mDir && mMoveAttr.mDir && (newOffset >= mStartAttr.mAbsOffset)) ) {
+                translateViewAndEvent(view, mStartAttr.mAbsOffset, event);
+                mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, mCurrDragState, 0);
+
+                issueStateTransition(mIdleState);
+                return true;
+            }
+
+            if (view.getParent() != null) {
+                view.getParent().requestDisallowInterceptTouchEvent(true);
+            }
+
+            long dt = event.getEventTime() - event.getHistoricalEventTime(0);
+            if (dt > 0) { // Sometimes (though rarely) dt==0 cause originally timing is in nanos, but is presented in millis.
+                mVelocity = deltaOffset / dt;
+            }
+
+            translateView(view, newOffset);
+            mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, mCurrDragState, newOffset);
+
+            return true;
+        }
+
+        @Override
+        public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
+            issueStateTransition(mBounceBackState);
+            return false;
+        }
+
+        @Override
+        public void handleEntryTransition(IDecoratorState fromState) {
+            mCurrDragState = (mStartAttr.mDir ? STATE_DRAG_START_SIDE : STATE_DRAG_END_SIDE);
+            mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
+        }
+    }
+
+    /**
+     * When entered, starts the bounce-back animation.
+     * <br/>Upon animation completion, transitions control onto the idle state; Does so by
+     * registering itself as an animation listener.
+     * <br/>In the meantime, blocks (intercepts) all touch events.
+     */
+    protected class BounceBackState implements IDecoratorState, Animator.AnimatorListener, ValueAnimator.AnimatorUpdateListener {
+
+        protected final Interpolator mBounceBackInterpolator = new DecelerateInterpolator();
+        protected final float mDecelerateFactor;
+        protected final float mDoubleDecelerateFactor;
+
+        protected final AnimationAttributes mAnimAttributes;
+
+        public BounceBackState(float decelerateFactor) {
+            mDecelerateFactor = decelerateFactor;
+            mDoubleDecelerateFactor = 2f * decelerateFactor;
+
+            mAnimAttributes = createAnimationAttributes();
+        }
+
+        @Override
+        public int getStateId() {
+            return STATE_BOUNCE_BACK;
+        }
+
+        @Override
+        public void handleEntryTransition(IDecoratorState fromState) {
+
+            mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
+
+            Animator bounceBackAnim = createAnimator();
+            bounceBackAnim.addListener(this);
+
+            bounceBackAnim.start();
+        }
+
+        @Override
+        public boolean handleMoveTouchEvent(MotionEvent event) {
+            // Flush all touches down the drain till animation is over.
+            return true;
+        }
+
+        @Override
+        public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
+            // Flush all touches down the drain till animation is over.
+            return true;
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            issueStateTransition(mIdleState);
+        }
+
+        @Override
+        public void onAnimationUpdate(ValueAnimator animation) {
+            mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, STATE_BOUNCE_BACK, (Float) animation.getAnimatedValue());
+        }
+
+        @Override public void onAnimationStart(Animator animation) {}
+        @Override public void onAnimationCancel(Animator animation) {}
+        @Override public void onAnimationRepeat(Animator animation) {}
+
+        protected Animator createAnimator() {
+
+            final View view = mViewAdapter.getView();
+
+            mAnimAttributes.init(view);
+
+            // Set up a low-duration slow-down animation IN the drag direction.
+
+            // Exception: If wasn't dragging in 'forward' direction (or velocity=0 -- i.e. not dragging at all),
+            // skip slow-down anim directly to the bounce-back.
+            if (mVelocity == 0f || (mVelocity < 0 && mStartAttr.mDir) || (mVelocity > 0 && !mStartAttr.mDir)) {
+                return createBounceBackAnimator(mAnimAttributes.mAbsOffset);
+            }
+
+            // dt = (Vt - Vo) / a; Vt=0 ==> dt = -Vo / a
+            float slowdownDuration = -mVelocity / mDecelerateFactor;
+            slowdownDuration = (slowdownDuration < 0 ? 0 : slowdownDuration); // Happens in counter-direction dragging
+
+            // dx = (Vt^2 - Vo^2) / 2a; Vt=0 ==> dx = -Vo^2 / 2a
+            float slowdownDistance = -mVelocity * mVelocity / mDoubleDecelerateFactor;
+            float slowdownEndOffset = mAnimAttributes.mAbsOffset + slowdownDistance;
+
+            ObjectAnimator slowdownAnim = createSlowdownAnimator(view, (int) slowdownDuration, slowdownEndOffset);
+
+            // Set up the bounce back animation, bringing the view back into the original, pre-overscroll position (translation=0).
+
+            ObjectAnimator bounceBackAnim = createBounceBackAnimator(slowdownEndOffset);
+
+            // Play the 2 animations as a sequence.
+            AnimatorSet wholeAnim = new AnimatorSet();
+            wholeAnim.playSequentially(slowdownAnim, bounceBackAnim);
+            return wholeAnim;
+        }
+
+        protected ObjectAnimator createSlowdownAnimator(View view, int slowdownDuration, float slowdownEndOffset) {
+            ObjectAnimator slowdownAnim = ObjectAnimator.ofFloat(view, mAnimAttributes.mProperty, slowdownEndOffset);
+            slowdownAnim.setDuration(slowdownDuration);
+            slowdownAnim.setInterpolator(mBounceBackInterpolator);
+            slowdownAnim.addUpdateListener(this);
+            return slowdownAnim;
+        }
+
+        protected ObjectAnimator createBounceBackAnimator(float startOffset) {
+
+            final View view = mViewAdapter.getView();
+
+            // Duration is proportional to the view's size.
+            float bounceBackDuration = (Math.abs(startOffset) / mAnimAttributes.mMaxOffset) * MAX_BOUNCE_BACK_DURATION_MS;
+            ObjectAnimator bounceBackAnim = ObjectAnimator.ofFloat(view, mAnimAttributes.mProperty, mStartAttr.mAbsOffset);
+            bounceBackAnim.setDuration(Math.max((int) bounceBackDuration, MIN_BOUNCE_BACK_DURATION_MS));
+            bounceBackAnim.setInterpolator(mBounceBackInterpolator);
+            bounceBackAnim.addUpdateListener(this);
+            return bounceBackAnim;
+        }
+    }
+
+    public OverScrollBounceEffectDecoratorBase(IOverScrollDecoratorAdapter viewAdapter, float decelerateFactor, float touchDragRatioFwd, float touchDragRatioBck) {
+        mViewAdapter = viewAdapter;
+
+        mBounceBackState = new BounceBackState(decelerateFactor);
+        mOverScrollingState = new OverScrollingState(touchDragRatioFwd, touchDragRatioBck);
+        mIdleState = new IdleState();
+
+        mCurrentState = mIdleState;
+
+        attach();
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_MOVE:
+                return mCurrentState.handleMoveTouchEvent(event);
+
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP:
+                return mCurrentState.handleUpOrCancelTouchEvent(event);
+        }
+
+        return false;
+    }
+
+    @Override
+    public void setOverScrollStateListener(IOverScrollStateListener listener) {
+        mStateListener = (listener != null ? listener : new OverScrollStateListenerStub());
+    }
+
+    @Override
+    public void setOverScrollUpdateListener(IOverScrollUpdateListener listener) {
+        mUpdateListener = (listener != null ? listener : new OverScrollUpdateListenerStub());
+    }
+
+    @Override
+    public int getCurrentState() {
+        return mCurrentState.getStateId();
+    }
+
+    @Override
+    public View getView() {
+        return mViewAdapter.getView();
+    }
+
+    protected void issueStateTransition(IDecoratorState state) {
+        IDecoratorState oldState = mCurrentState;
+        mCurrentState = state;
+        mCurrentState.handleEntryTransition(oldState);
+    }
+
+    protected void attach() {
+        getView().setOnTouchListener(this);
+        getView().setOverScrollMode(View.OVER_SCROLL_NEVER);
+    }
+
+    @Override
+    public void detach() {
+        if (mCurrentState != mIdleState) {
+            Log.w(TAG, "Decorator detached while over-scroll is in effect. You might want to add a precondition of that getCurrentState()==STATE_IDLE, first.");
+        }
+        getView().setOnTouchListener(null);
+        getView().setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    protected abstract MotionAttributes createMotionAttributes();
+    protected abstract AnimationAttributes createAnimationAttributes();
+    protected abstract void translateView(View view, float offset);
+    protected abstract void translateViewAndEvent(View view, float offset, MotionEvent event);
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollDecoratorHelper.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollDecoratorHelper.java
new file mode 100755
index 0000000..25b246a
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollDecoratorHelper.java
@@ -0,0 +1,90 @@
+package me.everything.android.ui.overscroll;
+
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+import android.view.View;
+import android.widget.GridView;
+import android.widget.HorizontalScrollView;
+import android.widget.ListView;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.adapters.AbsListViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.HorizontalScrollViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.RecyclerViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.ScrollViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.StaticOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.ViewPagerOverScrollDecorAdapter;
+
+public class OverScrollDecoratorHelper {
+
+    public static final int ORIENTATION_VERTICAL = 0;
+    public static final int ORIENTATION_HORIZONTAL = 1;
+
+    /**
+     * Set up the over-scroll effect over a specified {@link RecyclerView} view.
+     * <br/>Only recycler-views using <b>native</b> Android layout managers (i.e. {@link LinearLayoutManager},
+     * {@link GridLayoutManager} and {@link StaggeredGridLayoutManager}) are currently supported
+     * by this convenience method.
+     *
+     * @param recyclerView The view.
+     * @param orientation Either {@link #ORIENTATION_HORIZONTAL} or {@link #ORIENTATION_VERTICAL}.
+     *
+     * @return The over-scroll effect 'decorator', enabling further effect configuration.
+     */
+    public static IOverScrollDecor setUpOverScroll(RecyclerView recyclerView, int orientation) {
+        switch (orientation) {
+            case ORIENTATION_HORIZONTAL:
+                return new HorizontalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView));
+            case ORIENTATION_VERTICAL:
+                return new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView));
+            default:
+                throw new IllegalArgumentException("orientation");
+        }
+    }
+
+    public static IOverScrollDecor setUpOverScroll(ListView listView) {
+        return new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(listView));
+    }
+
+    public static IOverScrollDecor setUpOverScroll(GridView gridView) {
+        return new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(gridView));
+    }
+
+    public static IOverScrollDecor setUpOverScroll(ScrollView scrollView) {
+        return new VerticalOverScrollBounceEffectDecorator(new ScrollViewOverScrollDecorAdapter(scrollView));
+    }
+
+    public static IOverScrollDecor setUpOverScroll(HorizontalScrollView scrollView) {
+        return new HorizontalOverScrollBounceEffectDecorator(new HorizontalScrollViewOverScrollDecorAdapter(scrollView));
+    }
+
+    /**
+     * Set up the over-scroll over a generic view, assumed to always be over-scroll ready (e.g.
+     * a plain text field, image view).
+     *
+     * @param view The view.
+     * @param orientation One of {@link #ORIENTATION_HORIZONTAL} or {@link #ORIENTATION_VERTICAL}.
+     *
+     * @return The over-scroll effect 'decorator', enabling further effect configuration.
+     */
+    public static IOverScrollDecor setUpStaticOverScroll(View view, int orientation) {
+        switch (orientation) {
+            case ORIENTATION_HORIZONTAL:
+                return new HorizontalOverScrollBounceEffectDecorator(new StaticOverScrollDecorAdapter(view));
+
+            case ORIENTATION_VERTICAL:
+                return new VerticalOverScrollBounceEffectDecorator(new StaticOverScrollDecorAdapter(view));
+
+            default:
+                throw new IllegalArgumentException("orientation");
+        }
+    }
+
+    public static IOverScrollDecor setUpOverScroll(ViewPager viewPager) {
+        return new HorizontalOverScrollBounceEffectDecorator(new ViewPagerOverScrollDecorAdapter(viewPager));
+    }
+
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecorator.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecorator.java
new file mode 100755
index 0000000..5d10f73
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecorator.java
@@ -0,0 +1,97 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+/**
+ * A concrete implementation of {@link OverScrollBounceEffectDecoratorBase} for a vertical orientation.
+ */
+public class VerticalOverScrollBounceEffectDecorator extends OverScrollBounceEffectDecoratorBase {
+
+    protected static class MotionAttributesVertical extends MotionAttributes {
+
+        public boolean init(View view, MotionEvent event) {
+
+            // We must have history available to calc the dx. Normally it's there - if it isn't temporarily,
+            // we declare the event 'invalid' and expect it in consequent events.
+            if (event.getHistorySize() == 0) {
+                return false;
+            }
+
+            // Allow for counter-orientation-direction operations (e.g. item swiping) to run fluently.
+            final float dy = event.getY(0) - event.getHistoricalY(0, 0);
+            final float dx = event.getX(0) - event.getHistoricalX(0, 0);
+            if (Math.abs(dx) > Math.abs(dy)) {
+                return false;
+            }
+
+            mAbsOffset = view.getTranslationY();
+            mDeltaOffset = dy;
+            mDir = mDeltaOffset > 0;
+
+            return true;
+        }
+    }
+
+    protected static class AnimationAttributesVertical extends AnimationAttributes {
+
+        public AnimationAttributesVertical() {
+            mProperty = View.TRANSLATION_Y;
+        }
+
+        @Override
+        protected void init(View view) {
+            mAbsOffset = view.getTranslationY();
+            mMaxOffset = view.getHeight();
+        }
+    }
+
+    /**
+     * C'tor, creating the effect with default arguments:
+     * <br/>Touch-drag ratio in 'forward' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD.
+     * <br/>Touch-drag ratio in 'backwards' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK.
+     * <br/>Deceleration factor (for the bounce-back effect) will be set to DEFAULT_DECELERATE_FACTOR.
+     *
+     * @param viewAdapter The view's encapsulation.
+     */
+    public VerticalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter) {
+        this(viewAdapter, DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD, DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK, DEFAULT_DECELERATE_FACTOR);
+    }
+
+    /**
+     * C'tor, creating the effect with explicit arguments.
+     * @param viewAdapter The view's encapsulation.
+     * @param touchDragRatioFwd Ratio of touch distance to actual drag distance when in 'forward' direction.
+     * @param touchDragRatioBck Ratio of touch distance to actual drag distance when in 'backward'
+     *                          direction (opposite to initial one).
+     * @param decelerateFactor Deceleration factor used when decelerating the motion to create the
+     *                         bounce-back effect.
+     */
+    public VerticalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter,
+                                                   float touchDragRatioFwd, float touchDragRatioBck, float decelerateFactor) {
+        super(viewAdapter, decelerateFactor, touchDragRatioFwd, touchDragRatioBck);
+    }
+
+    @Override
+    protected MotionAttributes createMotionAttributes() {
+        return new MotionAttributesVertical();
+    }
+
+    @Override
+    protected AnimationAttributes createAnimationAttributes() {
+        return new AnimationAttributesVertical();
+    }
+
+    @Override
+    protected void translateView(View view, float offset) {
+        view.setTranslationY(offset);
+    }
+
+    @Override
+    protected void translateViewAndEvent(View view, float offset, MotionEvent event) {
+        view.setTranslationY(offset);
+        event.offsetLocation(offset - event.getY(0), 0f);
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/AbsListViewOverScrollDecorAdapter.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/AbsListViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..d873ad4
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/AbsListViewOverScrollDecorAdapter.java
@@ -0,0 +1,55 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+import android.widget.AbsListView;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter to enable over-scrolling over object of {@link AbsListView}, namely {@link
+ * android.widget.ListView} and it's extensions, and {@link android.widget.GridView}.
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class AbsListViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final AbsListView mView;
+
+    public AbsListViewOverScrollDecorAdapter(AbsListView view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return mView.getChildCount() > 0 && !canScrollListUp();
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return mView.getChildCount() > 0 && !canScrollListDown();
+    }
+
+    public boolean canScrollListUp() {
+        // Ported from AbsListView#canScrollList() which isn't compatible to all API levels
+        final int firstTop = mView.getChildAt(0).getTop();
+        final int firstPosition = mView.getFirstVisiblePosition();
+        return firstPosition > 0 || firstTop < mView.getListPaddingTop();
+    }
+
+    public boolean canScrollListDown() {
+        // Ported from AbsListView#canScrollList() which isn't compatible to all API levels
+        final int childCount = mView.getChildCount();
+        final int itemsCount = mView.getCount();
+        final int firstPosition = mView.getFirstVisiblePosition();
+        final int lastPosition = firstPosition + childCount;
+        final int lastBottom = mView.getChildAt(childCount - 1).getBottom();
+        return lastPosition < itemsCount || lastBottom > mView.getHeight() - mView.getListPaddingBottom();
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/HorizontalScrollViewOverScrollDecorAdapter.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/HorizontalScrollViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..3377f53
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/HorizontalScrollViewOverScrollDecorAdapter.java
@@ -0,0 +1,39 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+import android.widget.HorizontalScrollView;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter that enables over-scrolling support over a {@link HorizontalScrollView}.
+ * <br/>Seeing that {@link HorizontalScrollView} only supports horizontal scrolling, this adapter
+ * should only be used with a {@link HorizontalOverScrollBounceEffectDecorator}.
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class HorizontalScrollViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final HorizontalScrollView mView;
+
+    public HorizontalScrollViewOverScrollDecorAdapter(HorizontalScrollView view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return !mView.canScrollHorizontally(-1);
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return !mView.canScrollHorizontally(1);
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/IOverScrollDecoratorAdapter.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/IOverScrollDecoratorAdapter.java
new file mode 100755
index 0000000..ed0c0f2
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/IOverScrollDecoratorAdapter.java
@@ -0,0 +1,31 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+
+/**
+ * @see HorizontalOverScrollBounceEffectDecorator
+ */
+public interface IOverScrollDecoratorAdapter {
+
+    View getView();
+
+    /**
+     * Is view in it's absolute start position - such that a negative over-scroll can potentially
+     * be initiated. For example, in list-views, this is synonymous with the first item being
+     * fully visible.
+     *
+     * @return Whether in absolute start position.
+     */
+    boolean isInAbsoluteStart();
+
+    /**
+     * Is view in it's absolute end position - such that an over-scroll can potentially
+     * be initiated. For example, in list-views, this is synonymous with the last item being
+     * fully visible.
+     *
+     * @return Whether in absolute end position.
+     */
+    boolean isInAbsoluteEnd();
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/RecyclerViewOverScrollDecorAdapter.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/RecyclerViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..08959d1
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/RecyclerViewOverScrollDecorAdapter.java
@@ -0,0 +1,226 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.graphics.Canvas;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import android.view.View;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class RecyclerViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    /**
+     * A delegation of the adapter implementation of this view that should provide the processing
+     * of {@link #isInAbsoluteStart()} and {@link #isInAbsoluteEnd()}. Essentially needed simply
+     * because the implementation depends on the layout manager implementation being used.
+     */
+    protected interface Impl {
+        boolean isInAbsoluteStart();
+        boolean isInAbsoluteEnd();
+    }
+
+    protected final RecyclerView mRecyclerView;
+    protected final Impl mImpl;
+
+    protected boolean mIsItemTouchInEffect = false;
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView) {
+
+        mRecyclerView = recyclerView;
+
+        final RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
+        if (layoutManager instanceof LinearLayoutManager ||
+            layoutManager instanceof StaggeredGridLayoutManager)
+        {
+            final int orientation =
+                    (layoutManager instanceof LinearLayoutManager
+                        ? ((LinearLayoutManager) layoutManager).getOrientation()
+                        : ((StaggeredGridLayoutManager) layoutManager).getOrientation());
+
+            if (orientation == LinearLayoutManager.HORIZONTAL) {
+                mImpl = new ImplHorizLayout();
+            } else {
+                mImpl = new ImplVerticalLayout();
+            }
+        }
+        else
+        {
+            throw new IllegalArgumentException("Recycler views with custom layout managers are not supported by this adapter out of the box." +
+                    "Try implementing and providing an explicit 'impl' parameter to the other c'tors, or otherwise create a custom adapter subclass of your own.");
+        }
+    }
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, Impl impl) {
+        mRecyclerView = recyclerView;
+        mImpl = impl;
+    }
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, ItemTouchHelper.Callback itemTouchHelperCallback) {
+        this(recyclerView);
+        setUpTouchHelperCallback(itemTouchHelperCallback);
+    }
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, Impl impl, ItemTouchHelper.Callback itemTouchHelperCallback) {
+        this(recyclerView, impl);
+        setUpTouchHelperCallback(itemTouchHelperCallback);
+    }
+
+    protected void setUpTouchHelperCallback(final ItemTouchHelper.Callback itemTouchHelperCallback) {
+        new ItemTouchHelper(new ItemTouchHelperCallbackWrapper(itemTouchHelperCallback) {
+            @Override
+            public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
+                mIsItemTouchInEffect = actionState != 0;
+                super.onSelectedChanged(viewHolder, actionState);
+            }
+        }).attachToRecyclerView(mRecyclerView);
+    }
+
+    @Override
+    public View getView() {
+        return mRecyclerView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return !mIsItemTouchInEffect && mImpl.isInAbsoluteStart();
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return !mIsItemTouchInEffect && mImpl.isInAbsoluteEnd();
+    }
+
+    protected class ImplHorizLayout implements Impl {
+
+        @Override
+        public boolean isInAbsoluteStart() {
+            return !mRecyclerView.canScrollHorizontally(-1);
+        }
+
+        @Override
+        public boolean isInAbsoluteEnd() {
+            return !mRecyclerView.canScrollHorizontally(1);
+        }
+    }
+
+    protected class ImplVerticalLayout implements Impl {
+
+        @Override
+        public boolean isInAbsoluteStart() {
+            return !mRecyclerView.canScrollVertically(-1);
+        }
+
+        @Override
+        public boolean isInAbsoluteEnd() {
+            return !mRecyclerView.canScrollVertically(1);
+        }
+    }
+
+    private static class ItemTouchHelperCallbackWrapper extends ItemTouchHelper.Callback {
+
+        final ItemTouchHelper.Callback mCallback;
+
+        private ItemTouchHelperCallbackWrapper(ItemTouchHelper.Callback callback) {
+            mCallback = callback;
+        }
+
+        @Override
+        public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+            return mCallback.getMovementFlags(recyclerView, viewHolder);
+        }
+
+        @Override
+        public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+            return mCallback.onMove(recyclerView, viewHolder, target);
+        }
+
+        @Override
+        public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+            mCallback.onSwiped(viewHolder, direction);
+        }
+
+        @Override
+        public int convertToAbsoluteDirection(int flags, int layoutDirection) {
+            return mCallback.convertToAbsoluteDirection(flags, layoutDirection);
+        }
+
+        @Override
+        public boolean canDropOver(RecyclerView recyclerView, RecyclerView.ViewHolder current, RecyclerView.ViewHolder target) {
+            return mCallback.canDropOver(recyclerView, current, target);
+        }
+
+        @Override
+        public boolean isLongPressDragEnabled() {
+            return mCallback.isLongPressDragEnabled();
+        }
+
+        @Override
+        public boolean isItemViewSwipeEnabled() {
+            return mCallback.isItemViewSwipeEnabled();
+        }
+
+        @Override
+        public int getBoundingBoxMargin() {
+            return mCallback.getBoundingBoxMargin();
+        }
+
+        @Override
+        public float getSwipeThreshold(RecyclerView.ViewHolder viewHolder) {
+            return mCallback.getSwipeThreshold(viewHolder);
+        }
+
+        @Override
+        public float getMoveThreshold(RecyclerView.ViewHolder viewHolder) {
+            return mCallback.getMoveThreshold(viewHolder);
+        }
+
+        @Override
+        public RecyclerView.ViewHolder chooseDropTarget(RecyclerView.ViewHolder selected, List<RecyclerView.ViewHolder> dropTargets, int curX, int curY) {
+            return mCallback.chooseDropTarget(selected, dropTargets, curX, curY);
+        }
+
+        @Override
+        public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
+            mCallback.onSelectedChanged(viewHolder, actionState);
+        }
+
+        @Override
+        public void onMoved(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, int fromPos, RecyclerView.ViewHolder target, int toPos, int x, int y) {
+            mCallback.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y);
+        }
+
+        @Override
+        public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+            mCallback.clearView(recyclerView, viewHolder);
+        }
+
+        @Override
+        public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+            mCallback.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+        }
+
+        @Override
+        public void onChildDrawOver(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+            mCallback.onChildDrawOver(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+        }
+
+        @Override
+        public long getAnimationDuration(RecyclerView recyclerView, int animationType, float animateDx, float animateDy) {
+            return mCallback.getAnimationDuration(recyclerView, animationType, animateDx, animateDy);
+        }
+
+        @Override
+        public int interpolateOutOfBoundsScroll(RecyclerView recyclerView, int viewSize, int viewSizeOutOfBounds, int totalSize, long msSinceStartScroll) {
+            return mCallback.interpolateOutOfBoundsScroll(recyclerView, viewSize, viewSizeOutOfBounds, totalSize, msSinceStartScroll);
+        }
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ScrollViewOverScrollDecorAdapter.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ScrollViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..d71ba43
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ScrollViewOverScrollDecorAdapter.java
@@ -0,0 +1,41 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter that enables over-scrolling over a {@link ScrollView}.
+ * <br/>Seeing that {@link ScrollView} only supports vertical scrolling, this adapter
+ * should only be used with a {@link VerticalOverScrollBounceEffectDecorator}. For horizontal
+ * over-scrolling, use {@link HorizontalScrollViewOverScrollDecorAdapter} in conjunction with
+ * a {@link android.widget.HorizontalScrollView}.
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class ScrollViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final ScrollView mView;
+
+    public ScrollViewOverScrollDecorAdapter(ScrollView view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return !mView.canScrollVertically(-1);
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return !mView.canScrollVertically(1);
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/StaticOverScrollDecorAdapter.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/StaticOverScrollDecorAdapter.java
new file mode 100755
index 0000000..024b413
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/StaticOverScrollDecorAdapter.java
@@ -0,0 +1,36 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * A static adapter for views that are ALWAYS over-scroll-able (e.g. image view).
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class StaticOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final View mView;
+
+    public StaticOverScrollDecorAdapter(View view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return true;
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return true;
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ViewPagerOverScrollDecorAdapter.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ViewPagerOverScrollDecorAdapter.java
new file mode 100755
index 0000000..7aaedbd
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ViewPagerOverScrollDecorAdapter.java
@@ -0,0 +1,63 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+
+import androidx.viewpager.widget.ViewPager;
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter to enable over-scrolling over object of {@link ViewPager}
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ */
+public class ViewPagerOverScrollDecorAdapter implements IOverScrollDecoratorAdapter, ViewPager.OnPageChangeListener {
+
+    protected final ViewPager mViewPager;
+
+    protected int mLastPagerPosition = 0;
+    protected float mLastPagerScrollOffset;
+
+    public ViewPagerOverScrollDecorAdapter(ViewPager viewPager) {
+        this.mViewPager = viewPager;
+
+        mViewPager.addOnPageChangeListener(this);
+
+        mLastPagerPosition = mViewPager.getCurrentItem();
+        mLastPagerScrollOffset = 0f;
+    }
+
+    @Override
+    public View getView() {
+        return mViewPager;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+
+        return mLastPagerPosition == 0 &&
+                mLastPagerScrollOffset == 0f;
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+
+        return mLastPagerPosition == mViewPager.getAdapter().getCount()-1 &&
+                mLastPagerScrollOffset == 0f;
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        mLastPagerPosition = position;
+        mLastPagerScrollOffset = positionOffset;
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecoratorTest.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecoratorTest.java
new file mode 100755
index 0000000..1e06199
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecoratorTest.java
@@ -0,0 +1,636 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+import static me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator.DEFAULT_DECELERATE_FACTOR;
+import static me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class HorizontalOverScrollBounceEffectDecoratorTest {
+
+    View mView;
+    IOverScrollDecoratorAdapter mViewAdapter;
+    IOverScrollStateListener mStateListener;
+    IOverScrollUpdateListener mUpdateListener;
+
+    @Before
+    public void setUp() {
+        mView = mock(View.class);
+        mViewAdapter = mock(IOverScrollDecoratorAdapter.class);
+        when(mViewAdapter.getView()).thenReturn(mView);
+
+        mStateListener = mock(IOverScrollStateListener.class);
+        mUpdateListener = mock(IOverScrollUpdateListener.class);
+    }
+
+    @Test
+    public void detach_decoratorIsAttached_detachFromView() {
+
+        // Arrange
+
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter);
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    @Test
+    public void detach_overScrollInEffect_detachFromView() {
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, createShortRightMoveEvent());
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    /*
+     * Move-action event
+     */
+
+    @Test
+    public void onTouchMoveAction_notInViewEnds_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragRightInLeftEnd_overscrollRight() {
+
+        // Arrange
+
+        MotionEvent event = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        final float expectedTransX = (event.getX() - event.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragLeftInRightEnd_overscrollLeft() {
+
+        // Arrange
+
+        MotionEvent event = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        final float expectedTransX = (event.getX() - event.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragLeftInLeftEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragRightInRightEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndRightDragInLeftEnd_overscrollRightFurther() {
+
+        // Arrange
+
+        // Bring UUT to a right-overscroll state
+        MotionEvent event1 = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd right-drag event
+        MotionEvent event2 = createLongRightMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransX1 = (event1.getX() - event1.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransX2 = (event2.getX() - event2.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX2);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndLeftDragInRightEnd_overscrollLeftFurther() {
+
+        // Arrange
+
+        // Bring UUT to a left-overscroll state
+        MotionEvent event1 = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd left-drag event
+        MotionEvent event2 = createLongLeftMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransX1 = (event1.getX() - event1.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransX2 = (event2.getX() - event2.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX2);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (to the right in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to
+     * remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragLeftWhenRightOverscolled_continueOverscrollingLeft() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a right-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveRight = createLongRightMoveEvent();
+        uut.onTouch(mView, eventMoveRight);
+        reset(mView);
+        float startTransX = (eventMoveRight.getX() - eventMoveRight.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the left-drag event
+        MotionEvent eventMoveLeft = createShortLeftMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveLeft);
+
+        // Assert
+
+        float expectedTransX = startTransX +
+                                (eventMoveLeft.getX() - eventMoveLeft.getHistoricalX(0)) / touchDragRatioBck;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (to the left in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragRightWhenLeftOverscolled_continueOverscrollingRight() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a left-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveLeft = createLongLeftMoveEvent();
+        uut.onTouch(mView, eventMoveLeft);
+        reset(mView);
+
+        float startTransX = (eventMoveLeft.getX() - eventMoveLeft.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the right-drag event
+        MotionEvent eventMoveRight = createShortRightMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveRight);
+
+        // Assert
+
+        float expectedTransX = startTransX + (eventMoveRight.getX() - eventMoveRight.getHistoricalX(0)) / touchDragRatioBck;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenRightOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a right-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveRight = createLongRightMoveEvent();
+        uut.onTouch(mView, eventMoveRight);
+        reset(mView);
+        float startTransX = (eventMoveRight.getX() - eventMoveRight.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the left-drag event
+        MotionEvent eventMoveLeft = createLongLeftMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveLeft);
+
+        // Assert
+
+        verify(mView).setTranslationX(0);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_START_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenLeftOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a left-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveLeft = createLongLeftMoveEvent();
+        uut.onTouch(mView, eventMoveLeft);
+        reset(mView);
+        float startTransX = (eventMoveLeft.getX() - eventMoveLeft.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the left-drag event
+        MotionEvent eventMoveRight = createLongRightMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveRight);
+
+        // Assert
+
+        verify(mView).setTranslationX(0);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_END_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+
+    /*
+     * Up action event
+     */
+
+    @Test
+    public void onTouchUpAction_eventWhenNotOverscrolled_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createDefaultUpActionEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * TODO: Make this work using a decent animation shadows / newer Robolectric
+     * @throws Exception
+     */
+    @Ignore
+    @Test
+    public void onTouchUpAction_eventWhenLeftOverscrolling_smoothScrollBackToRightEnd() {
+
+        // Arrange
+
+        // Bring UUT to a left-overscroll state
+        MotionEvent moveEvent = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, moveEvent);
+        reset(mView);
+
+        // Make the view as though it's been moved by the move event
+        float viewX = moveEvent.getX();
+        when(mView.getTranslationX()).thenReturn(viewX);
+
+        MotionEvent upEvent = createDefaultUpActionEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, upEvent);
+
+        // Assert
+
+        assertTrue(ret);
+
+        verify(mView, atLeastOnce()).setTranslationX(anyFloat());
+    }
+
+    protected MotionEvent createShortRightMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(100f);
+        when(event.getY()).thenReturn(200f);
+        when(event.getX(0)).thenReturn(100f);
+        when(event.getY(0)).thenReturn(200f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(80f);
+        when(event.getHistoricalY(eq(0))).thenReturn(190f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(80f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(190f);
+        return event;
+    }
+
+    protected MotionEvent createLongRightMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(150f);
+        when(event.getY()).thenReturn(250f);
+        when(event.getX(0)).thenReturn(150f);
+        when(event.getY(0)).thenReturn(250f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0))).thenReturn(200f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(200f);
+        return event;
+    }
+
+    protected MotionEvent createShortLeftMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(100f);
+        when(event.getY()).thenReturn(200f);
+        when(event.getX(0)).thenReturn(100f);
+        when(event.getY(0)).thenReturn(200f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(120f);
+        when(event.getHistoricalY(eq(0))).thenReturn(220f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(120f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(220f);
+        return event;
+    }
+
+    protected MotionEvent createLongLeftMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(50f);
+        when(event.getY()).thenReturn(150f);
+        when(event.getX(0)).thenReturn(50f);
+        when(event.getY(0)).thenReturn(150f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0))).thenReturn(200f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(200f);
+        return event;
+    }
+
+    protected MotionEvent createDefaultUpActionEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_UP);
+        return event;
+    }
+
+    protected HorizontalOverScrollBounceEffectDecorator getUUT() {
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+
+    protected HorizontalOverScrollBounceEffectDecorator getUUT(float touchDragRatioFwd, float touchDragRatioBck) {
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter, touchDragRatioFwd, touchDragRatioBck, DEFAULT_DECELERATE_FACTOR);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+}
diff --git a/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecoratorTest.java b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecoratorTest.java
new file mode 100755
index 0000000..eeb2102
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecoratorTest.java
@@ -0,0 +1,596 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+import static me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator.DEFAULT_DECELERATE_FACTOR;
+import static me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class VerticalOverScrollBounceEffectDecoratorTest {
+
+    View mView;
+    IOverScrollDecoratorAdapter mViewAdapter;
+    IOverScrollStateListener mStateListener;
+    IOverScrollUpdateListener mUpdateListener;
+
+    @Before
+    public void setUp() {
+        mView = mock(View.class);
+        mViewAdapter = mock(IOverScrollDecoratorAdapter.class);
+        when(mViewAdapter.getView()).thenReturn(mView);
+
+        mStateListener = mock(IOverScrollStateListener.class);
+        mUpdateListener = mock(IOverScrollUpdateListener.class);
+    }
+
+    @Test
+    public void detach_decoratorIsAttached_detachFromView() {
+
+        // Arrange
+
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter);
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    @Test
+    public void detach_overScrollInEffect_detachFromView() {
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, createShortDownwardsMoveEvent());
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    /*
+     * Move-action event
+     */
+
+    @Test
+    public void onTouchMoveAction_notInViewEnds_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut),anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragDownInUpperEnd_overscrollDownwards() {
+
+        // Arrange
+
+        MotionEvent event = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        float expectedTransY = (event.getY() - event.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragUpInBottomEnd_overscrollUpwards() {
+
+        // Arrange
+
+        MotionEvent event = createShortUpwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        float expectedTransY = (event.getY() - event.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragUpInUpperEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortUpwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragDownInBottomEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndDownDragInUpperEnd_overscrollDownwardsFurther() {
+
+        // Arrange
+
+        // Bring UUT to a downwards-overscroll state
+        MotionEvent event1 = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd downwards-drag event
+        MotionEvent event2 = createLongDownwardsMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransY1 = (event1.getY() - event1.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransY2 = (event2.getY() - event2.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY2);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndUpDragInBottomEnd_overscrollUpwardsFurther() {
+
+        // Arrange
+
+        // Bring UUT to an upwards-overscroll state
+        MotionEvent event1 = createShortUpwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd upward-drag event
+        MotionEvent event2 = createLongUpwardsMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransY1 = (event1.getY() - event1.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransY2 = (event2.getY() - event2.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY2);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (downwards in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragUpWhenDownOverscolled_continueOverscrollingUpwards() {
+
+        // Arrange
+
+        // In down & up drag tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a downwrads-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveRight = createLongDownwardsMoveEvent();
+        uut.onTouch(mView, eventMoveRight);
+        reset(mView);
+        float startTransY = (eventMoveRight.getY() - eventMoveRight.getHistoricalY(0)) / touchDragRatioFwd;
+        when(mView.getTranslationY()).thenReturn(startTransY);
+
+        // Create the up-drag event
+        MotionEvent eventMoveUpwards = createShortUpwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveUpwards);
+
+        // Assert
+
+        float expectedTransY = startTransY +
+                (eventMoveUpwards.getY() - eventMoveUpwards.getHistoricalY(0)) / touchDragRatioBck;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransY));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (upwards in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragDownWhenUpOverscolled_continueOverscrollingDownwards() {
+
+        // Arrange
+
+        // In up & down drag tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to an upwards-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveUp = createLongUpwardsMoveEvent();
+        uut.onTouch(mView, eventMoveUp);
+        reset(mView);
+
+        float startTransY = (eventMoveUp.getY() - eventMoveUp.getHistoricalY(0)) / touchDragRatioFwd;
+        when(mView.getTranslationY()).thenReturn(startTransY);
+
+        // Create the down-drag event
+        MotionEvent eventMoveDown = createShortDownwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveDown);
+
+        // Assert
+
+        float expectedTransY = startTransY + (eventMoveDown.getY() - eventMoveDown.getHistoricalY(0)) / touchDragRatioBck;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransY));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenDownOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a downwards-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveDown = createLongDownwardsMoveEvent();
+        uut.onTouch(mView, eventMoveDown);
+        reset(mView);
+        float startTransX = (eventMoveDown.getX() - eventMoveDown.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the (negative) upwards-drag event
+        MotionEvent eventMoveUp = createLongUpwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveUp);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView).setTranslationY(0);
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_START_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenUpOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a left-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveUp = createLongUpwardsMoveEvent();
+        uut.onTouch(mView, eventMoveUp);
+        reset(mView);
+        float startTransX = (eventMoveUp.getX() - eventMoveUp.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the (negative) downwards-drag event
+        MotionEvent eventMoveDown = createLongDownwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveDown);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView).setTranslationY(0);
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_END_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /*
+     * Up action event
+     */
+
+    @Test
+    public void onTouchUpAction_eventWhenNotOverscrolled_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createDefaultUpActionEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    protected MotionEvent createShortDownwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(200f);
+        when(event.getY()).thenReturn(100f);
+        when(event.getX(0)).thenReturn(200f);
+        when(event.getY(0)).thenReturn(100f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(190f);
+        when(event.getHistoricalY(eq(0))).thenReturn(80f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(190f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(80f);
+        return event;
+    }
+
+    protected MotionEvent createLongDownwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(250f);
+        when(event.getY()).thenReturn(150f);
+        when(event.getX(0)).thenReturn(250f);
+        when(event.getY(0)).thenReturn(150f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(200f);
+        when(event.getHistoricalY(eq(0))).thenReturn(100f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(200f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(100f);
+        return event;
+    }
+
+    protected MotionEvent createShortUpwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(200f);
+        when(event.getY()).thenReturn(100f);
+        when(event.getX(0)).thenReturn(200f);
+        when(event.getY(0)).thenReturn(100f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(220f);
+        when(event.getHistoricalY(eq(0))).thenReturn(120f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(220f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(120f);
+        return event;
+    }
+
+    protected MotionEvent createLongUpwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(200f);
+        when(event.getY()).thenReturn(100f);
+        when(event.getX(0)).thenReturn(200f);
+        when(event.getY(0)).thenReturn(100f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(250f);
+        when(event.getHistoricalY(eq(0))).thenReturn(150f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(250f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(150f);
+        return event;
+    }
+
+    protected MotionEvent createDefaultUpActionEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_UP);
+        return event;
+    }
+
+    protected VerticalOverScrollBounceEffectDecorator getUUT() {
+        VerticalOverScrollBounceEffectDecorator uut = new VerticalOverScrollBounceEffectDecorator(mViewAdapter);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+
+    protected VerticalOverScrollBounceEffectDecorator getUUT(float touchDragRatioFwd, float touchDragRatioBck) {
+        VerticalOverScrollBounceEffectDecorator uut = new VerticalOverScrollBounceEffectDecorator(mViewAdapter, touchDragRatioFwd, touchDragRatioBck, DEFAULT_DECELERATE_FACTOR);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Driver_live/lib/overscroll-decor/recyclerview_demo.gif b/OnTime_Driver_live/lib/overscroll-decor/recyclerview_demo.gif
new file mode 100755
index 0000000..3610e9d
Binary files /dev/null and b/OnTime_Driver_live/lib/overscroll-decor/recyclerview_demo.gif differ
diff --git a/OnTime_Driver_live/lib/overscroll-decor/settings.gradle b/OnTime_Driver_live/lib/overscroll-decor/settings.gradle
new file mode 100755
index 0000000..cddea94
--- /dev/null
+++ b/OnTime_Driver_live/lib/overscroll-decor/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':liboverscroll'
diff --git a/OnTime_Driver_live/settings.gradle b/OnTime_Driver_live/settings.gradle
old mode 100644
new mode 100755
index e7b4def..d3afc7a
--- a/OnTime_Driver_live/settings.gradle
+++ b/OnTime_Driver_live/settings.gradle
@@ -1 +1,13 @@
 include ':app'
+
+// Local lib (in this app's lib/ folder) for optional use
+include ':rating-view'
+project(':rating-view').projectDir = new File(settingsDir, 'lib/RatingView/rating-view')
+include ':liboverscroll'
+project(':liboverscroll').projectDir = new File(settingsDir, 'lib/overscroll-decor/liboverscroll')
+include ':prdownloader'
+project(':prdownloader').projectDir = new File(settingsDir, 'lib/PRDownloader/prdownloader')
+include ':textdrawable'
+project(':textdrawable').projectDir = new File(settingsDir, 'lib/TextDrawable/library')
+include ':fragmentanimations'
+project(':fragmentanimations').projectDir = new File(settingsDir, 'lib/FragmentAnimations/fragmentanimations')
diff --git a/OnTime_Merchant_live/.gitignore b/OnTime_Merchant_live/.gitignore
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/.gitignore b/OnTime_Merchant_live/app/.gitignore
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/build.gradle b/OnTime_Merchant_live/app/build.gradle
old mode 100644
new mode 100755
index 6e572ae..efd6917
--- a/OnTime_Merchant_live/app/build.gradle
+++ b/OnTime_Merchant_live/app/build.gradle
@@ -17,12 +17,12 @@ android {
             keyPassword '123456@ontime'
         }
     }
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "id.ontime.merchant"
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdkVersion 23
+        targetSdkVersion 34
         versionCode 10
         versionName '1.1.0'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -65,11 +65,11 @@ dependencies {
     implementation 'com.google.android.libraries.places:places:2.5.0'
     implementation 'com.google.android.gms:play-services-maps:18.0.2'
     implementation 'com.google.android.gms:play-services-auth:20.1.0'
-    implementation 'com.google.firebase:firebase-database:20.0.4'
-    implementation 'com.google.firebase:firebase-storage:20.0.1'
-    implementation 'com.google.firebase:firebase-core:20.1.0'
-    implementation 'com.google.firebase:firebase-messaging:20.2.0'
-    implementation 'com.google.firebase:firebase-auth:19.3.1'
+    implementation platform('com.google.firebase:firebase-bom:33.1.0')
+    implementation 'com.google.firebase:firebase-database'
+    implementation 'com.google.firebase:firebase-storage'
+    implementation 'com.google.firebase:firebase-messaging'
+    implementation 'com.google.firebase:firebase-auth'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'com.google.android.material:material:1.5.0'
diff --git a/OnTime_Merchant_live/app/butterknife-proguard-rules.pro b/OnTime_Merchant_live/app/butterknife-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/guava-proguard-rules.pro b/OnTime_Merchant_live/app/guava-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/okhttp3-proguard-rules.pro b/OnTime_Merchant_live/app/okhttp3-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/proguard-rules.pro b/OnTime_Merchant_live/app/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/release/output-metadata.json b/OnTime_Merchant_live/app/release/output-metadata.json
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/retrofit-proguard-rules.pro b/OnTime_Merchant_live/app/retrofit-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/saripaar-proguard-rules.pro b/OnTime_Merchant_live/app/saripaar-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/AndroidManifest.xml b/OnTime_Merchant_live/app/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
index 78fecfa..4f9c7cb
--- a/OnTime_Merchant_live/app/src/main/AndroidManifest.xml
+++ b/OnTime_Merchant_live/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="id.ontime.merchant"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
diff --git a/OnTime_Merchant_live/app/src/main/assets/fonts/Montserrat_Bold.ttf b/OnTime_Merchant_live/app/src/main/assets/fonts/Montserrat_Bold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/assets/fonts/Montserrat_Medium.ttf b/OnTime_Merchant_live/app/src/main/assets/fonts/Montserrat_Medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/assets/fonts/Montserrat_Regular.ttf b/OnTime_Merchant_live/app/src/main/assets/fonts/Montserrat_Regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/assets/fonts/Montserrat_SemiBold.ttf b/OnTime_Merchant_live/app/src/main/assets/fonts/Montserrat_SemiBold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/assets/fonts/NeoSansPro_Medium.ttf b/OnTime_Merchant_live/app/src/main/assets/fonts/NeoSansPro_Medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/assets/fonts/NeoSans_Pro_Regular.ttf b/OnTime_Merchant_live/app/src/main/assets/fonts/NeoSans_Pro_Regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/assets/fonts/OpenSans-Bold.ttf b/OnTime_Merchant_live/app/src/main/assets/fonts/OpenSans-Bold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/assets/fonts/OpenSans-Light.ttf b/OnTime_Merchant_live/app/src/main/assets/fonts/OpenSans-Light.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/assets/fonts/OpenSans-Regular.ttf b/OnTime_Merchant_live/app/src/main/assets/fonts/OpenSans-Regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/assets/fonts/ride_rewrite_bungee.ttf b/OnTime_Merchant_live/app/src/main/assets/fonts/ride_rewrite_bungee.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/ic_launcher-playstore.png b/OnTime_Merchant_live/app/src/main/ic_launcher-playstore.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/customfonts/AutoCompleteTextViewSFProDisplayRegular.java b/OnTime_Merchant_live/app/src/main/java/customfonts/AutoCompleteTextViewSFProDisplayRegular.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/customfonts/Button_SF_Pro_Display_Medium.java b/OnTime_Merchant_live/app/src/main/java/customfonts/Button_SF_Pro_Display_Medium.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/customfonts/EditTextSFProDisplayMedium.java b/OnTime_Merchant_live/app/src/main/java/customfonts/EditTextSFProDisplayMedium.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/customfonts/EditTextSFProDisplayRegular.java b/OnTime_Merchant_live/app/src/main/java/customfonts/EditTextSFProDisplayRegular.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/customfonts/RadioButton_SF_Pro_Display_Medium.java b/OnTime_Merchant_live/app/src/main/java/customfonts/RadioButton_SF_Pro_Display_Medium.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/customfonts/TextViewSFProDisplayMedium.java b/OnTime_Merchant_live/app/src/main/java/customfonts/TextViewSFProDisplayMedium.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/customfonts/TextViewSFProDisplayRegular.java b/OnTime_Merchant_live/app/src/main/java/customfonts/TextViewSFProDisplayRegular.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/AddmenuActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/AddmenuActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/ChangepassActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/ChangepassActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/ChatActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/ChatActivity.java
old mode 100644
new mode 100755
index 4164f64..ba4056f
--- a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/ChatActivity.java
+++ b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/ChatActivity.java
@@ -1417,7 +1417,9 @@ public class ChatActivity extends AppCompatActivity {
     }
 
     private void sendMessageToDriver(final String regIDTujuan, final Chat chat) {
-
+        if (regIDTujuan == null || regIDTujuan.trim().isEmpty()) {
+            return;
+        }
         final FCMMessage message = new FCMMessage();
         message.setTo(regIDTujuan);
         message.setData(chat);
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/ConfirmWAActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/ConfirmWAActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/EditmenuActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/EditmenuActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/EditmitraActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/EditmitraActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/EditstoreActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/EditstoreActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/IntroActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/IntroActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/LoginActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/LoginActivity.java
old mode 100644
new mode 100755
index 8280f69..f0fa112
--- a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/LoginActivity.java
+++ b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/LoginActivity.java
@@ -31,8 +31,8 @@ import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.PhoneAuthCredential;
 import com.google.firebase.auth.PhoneAuthProvider;
+import com.google.firebase.messaging.FirebaseMessaging;
 
-import com.google.firebase.iid.FirebaseInstanceId;
 import id.ontime.merchant.constants.BaseApp;
 import id.ontime.merchant.R;
 import id.ontime.merchant.constants.Constants;
@@ -478,7 +478,7 @@ public class LoginActivity extends AppCompatActivity {
 
     private void onSignInClick() {
         progressshow();
-        LoginRequestJson request = new LoginRequestJson();
+        final LoginRequestJson request = new LoginRequestJson();
         String emailText = email.getText().toString().trim();
         String phoneDigits = phoneText.getText().toString().trim();
 
@@ -490,13 +490,36 @@ public class LoginActivity extends AppCompatActivity {
             request.setNotelepon(countryCode.getText().toString().replace("+", "") + phoneDigits);
         }
         request.setPassword(password.getText().toString());
-        try {
-            FirebaseInstanceId token = FirebaseInstanceId.getInstance();
-            request.setRegId(token.getToken());
-        } catch (Exception e) {
-            request.setRegId(null);
+
+        // FCM token is mandatory for login: use cached token if available, otherwise fetch a fresh one.
+        io.realm.Realm realm = BaseApp.getInstance(this).getRealmInstance();
+        FirebaseToken storedToken = realm.where(FirebaseToken.class).findFirst();
+        if (storedToken != null && storedToken.getTokenId() != null && !storedToken.getTokenId().isEmpty()) {
+            request.setRegId(storedToken.getTokenId());
+            performLoginRequest(request, emailText);
+            return;
         }
 
+        FirebaseMessaging.getInstance().getToken()
+                .addOnCompleteListener(task -> {
+                    if (task.isSuccessful() && task.getResult() != null && !task.getResult().isEmpty()) {
+                        String fcmToken = task.getResult();
+                        request.setRegId(fcmToken);
+                        // Persist so subsequent logins can reuse without refetch.
+                        realm.executeTransaction(r -> {
+                            FirebaseToken t = new FirebaseToken(fcmToken);
+                            r.delete(FirebaseToken.class);
+                            r.copyToRealm(t);
+                        });
+                        performLoginRequest(request, emailText);
+                    } else {
+                        progresshide();
+                        notif("Firebase token not ready, please check your network and try again.");
+                    }
+                });
+    }
+
+    private void performLoginRequest(final LoginRequestJson request, String emailText) {
         String basicUser = !TextUtils.isEmpty(emailText) ? emailText : request.getNotelepon();
         MerchantService service = ServiceGenerator.createService(MerchantService.class, basicUser, request.getPassword());
         service.login(request).enqueue(new Callback<LoginResponseJson>() {
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/LupapassActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/LupapassActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/MainActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/MainActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/MenuActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/MenuActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/OperatorProviderListActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/OperatorProviderListActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/OrdervalidasiActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/OrdervalidasiActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/PicklocationActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/PicklocationActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/PpobActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/PpobActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/PrivacyActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/PrivacyActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/RegisterActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/RegisterActivity.java
old mode 100644
new mode 100755
index 3e46e77..3817864
--- a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/RegisterActivity.java
+++ b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/RegisterActivity.java
@@ -70,7 +70,7 @@ import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.PhoneAuthCredential;
 import com.google.firebase.auth.PhoneAuthProvider;
-import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.messaging.FirebaseMessaging;
 import id.ontime.merchant.R;
 import id.ontime.merchant.constants.Constants;
 import id.ontime.merchant.models.FiturModel;
@@ -174,7 +174,12 @@ public class RegisterActivity extends AppCompatActivity {
         rlnotif2 = findViewById(R.id.rlnotif2);
         textnotif2 = findViewById(R.id.textnotif2);
         confirmButton = findViewById(R.id.buttonconfirm);
-        token = FirebaseInstanceId.getInstance().getToken();
+        // FCM v1: async token via FirebaseMessaging.getToken()
+        FirebaseMessaging.getInstance().getToken().addOnCompleteListener(task -> {
+            if (task.isSuccessful() && task.getResult() != null && !task.getResult().isEmpty()) {
+                token = task.getResult();
+            }
+        });
         numOne = findViewById(R.id.numone);
         numTwo = findViewById(R.id.numtwo);
         numThree = findViewById(R.id.numthree);
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/SplashActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/SplashActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/TopUpBpjsActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/TopUpBpjsActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/TopUpPlnActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/TopUpPlnActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/TopUpPulsaActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/TopUpPulsaActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/TopupSaldoActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/TopupSaldoActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/WalletActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/WalletActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/WithdrawActivity.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/activity/WithdrawActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/BaseApp.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/BaseApp.java
old mode 100644
new mode 100755
index 95bc30d..202747b
--- a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/BaseApp.java
+++ b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/BaseApp.java
@@ -3,7 +3,7 @@ package id.ontime.merchant.constants;
 import android.app.Application;
 import android.content.Context;
 
-import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.FirebaseApp;
 import com.google.firebase.messaging.FirebaseMessaging;
 import id.ontime.merchant.models.FirebaseToken;
 import id.ontime.merchant.models.User;
@@ -15,8 +15,8 @@ import io.realm.RealmConfiguration;
 
 /**
  * Created by Ourdevelops Team on 10/13/2019.
+ * FCM v1: async token and topic subscribe (reference: test app).
  */
-
 public class BaseApp extends Application {
 
     private static final int SCHEMA_VERSION = 0;
@@ -34,23 +34,40 @@ public class BaseApp extends Application {
         super.onCreate();
 
         Realm.init(this);
-
         RealmConfiguration config = new RealmConfiguration.Builder()
                 .schemaVersion(SCHEMA_VERSION)
                 .deleteRealmIfMigrationNeeded()
                 .build();
-
-        FirebaseToken token = new FirebaseToken(FirebaseInstanceId.getInstance().getToken());
-        FirebaseMessaging.getInstance().subscribeToTopic("ouride");
-        FirebaseMessaging.getInstance().subscribeToTopic("mitra");
         Realm.setDefaultConfiguration(config);
-
-//        realmInstance = Realm.getInstance(config);
         realmInstance = Realm.getDefaultInstance();
-        realmInstance.beginTransaction();
-        realmInstance.delete(FirebaseToken.class);
-        realmInstance.copyToRealm(token);
-        realmInstance.commitTransaction();
+
+        try {
+            FirebaseApp app = FirebaseApp.initializeApp(this);
+            if (app != null) {
+                FirebaseMessaging.getInstance().getToken()
+                        .addOnCompleteListener(task -> {
+                            if (task.isSuccessful() && task.getResult() != null && !task.getResult().isEmpty()) {
+                                String fcmToken = task.getResult();
+                                FirebaseToken token = new FirebaseToken(fcmToken);
+                                FirebaseMessaging.getInstance().subscribeToTopic("ouride");
+                                FirebaseMessaging.getInstance().subscribeToTopic("mitra");
+                                try {
+                                    realmInstance.beginTransaction();
+                                    realmInstance.delete(FirebaseToken.class);
+                                    realmInstance.copyToRealm(token);
+                                    realmInstance.commitTransaction();
+                                } catch (Exception e) {
+                                    if (realmInstance.isInTransaction()) realmInstance.cancelTransaction();
+                                    e.printStackTrace();
+                                }
+                            }
+                        });
+            }
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         start();
     }
 
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/Constants.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/Constants.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/Functions.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/Functions.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/TopUpType.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/TopUpType.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/VersionChecker.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/constants/VersionChecker.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/EnableLlocationFragment.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/EnableLlocationFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/FullImageFragment.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/FullImageFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/HistoryFragment.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/HistoryFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/HomeFragment.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/HomeFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/MenuFragment.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/MenuFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/MessageFragment.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/MessageFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/PlayAudioFragment.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/PlayAudioFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/SettingsFragment.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/fragment/SettingsFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/BankItem.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/BankItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/CategoryItem.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/CategoryItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/CategoryNonItem.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/CategoryNonItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/ItemChat.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/ItemChat.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/MenuItem.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/MenuItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/MenusItem.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/MenusItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/MessageItem.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/MessageItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/OrderItem.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/OrderItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/TopUpBPJSHistoryItem.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/TopUpBPJSHistoryItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/TopUpItem.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/TopUpItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/TopUpPlnHistoryItem.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/TopUpPlnHistoryItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/WalletItem.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/WalletItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/onRecyclerViewOnClicked.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/item/onRecyclerViewOnClicked.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/ActivekatRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/ActivekatRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/AddEditItemRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/AddEditItemRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/AddEditKategoriRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/AddEditKategoriRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/BankResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/BankResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/ChangePassRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/ChangePassRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/DetailRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/DetailRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/DetailTransResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/DetailTransResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/EditMerchantRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/EditMerchantRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/EditProfileRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/EditProfileRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/GetAyoPulsaBaseResponse.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/GetAyoPulsaBaseResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/GetFiturResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/GetFiturResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/GetOnRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/GetOnRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/HistoryRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/HistoryRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/HistoryResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/HistoryResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/HomeRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/HomeRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/HomeResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/HomeResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/ItemRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/ItemRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/ItemResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/ItemResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/KategoriRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/KategoriRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/KategoriResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/KategoriResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/LoginRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/LoginRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/LoginResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/LoginResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobilePulsaHealthBPJSBaseResponse.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobilePulsaHealthBPJSBaseResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobilePulsaHealthBPJSDesc.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobilePulsaHealthBPJSDesc.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobilePulsaHealthBPJSResponseModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobilePulsaHealthBPJSResponseModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobilePulsaPLNCheckResponse.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobilePulsaPLNCheckResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobilePulsaPlnDetailResponse.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobilePulsaPlnDetailResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobileTopUpDetailResponseModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobileTopUpDetailResponseModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobileTopUpPostPaidStatusJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobileTopUpPostPaidStatusJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobileTopUpRequestModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobileTopUpRequestModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobileTopUpResponseModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/MobileTopUpResponseModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/PrivacyRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/PrivacyRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/PrivacyResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/PrivacyResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/RegionResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/RegionResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/RegisterRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/RegisterRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/RegisterResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/RegisterResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/ResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/ResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopUpAyoPulsaRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopUpAyoPulsaRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopUpAyoPulsaResponseModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopUpAyoPulsaResponseModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopUpBaseResponse.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopUpBaseResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopUpRequestResponse.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopUpRequestResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopUpTrackingResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopUpTrackingResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopupRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopupRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopupResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/TopupResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/WalletRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/WalletRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/WalletResponseJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/WalletResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/WithdrawRequestJson.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/WithdrawRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/fcm/FCMMessage.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/fcm/FCMMessage.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/fcm/FCMType.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/json/fcm/FCMType.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/BankModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/BankModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/Chat.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/Chat.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ChatModels.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ChatModels.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/DriverModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/DriverModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/FirebaseToken.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/FirebaseToken.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/FiturModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/FiturModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ItemModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ItemModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ItemPesananModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ItemPesananModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/KategoriItemModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/KategoriItemModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/KategoriItemNonModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/KategoriItemNonModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/KategoriModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/KategoriModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/MessageModels.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/MessageModels.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/Notif.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/Notif.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/PelangganModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/PelangganModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/RegionModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/RegionModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/SettingsModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/SettingsModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/TransaksiMerchantModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/TransaksiMerchantModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/TransaksiModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/TransaksiModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/User.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/User.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/WalletModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/WalletModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ayopulsa/PriceListDataModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ayopulsa/PriceListDataModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ayopulsa/PriceListDetailModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ayopulsa/PriceListDetailModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ayopulsa/PriceListPulsaGeneralModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ayopulsa/PriceListPulsaGeneralModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ayopulsa/TopUpDetailModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ayopulsa/TopUpDetailModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ayopulsa/TopUpStatusModel.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/ayopulsa/TopUpStatusModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/fcm/DriverRequest.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/fcm/DriverRequest.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/fcm/DriverResponse.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/fcm/DriverResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/fcm/FCMMessage.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/fcm/FCMMessage.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/fcm/FCMType.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/models/fcm/FCMType.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/AppIntroPagerAdapter.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/AppIntroPagerAdapter.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/BooleanSerializerDeserializer.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/BooleanSerializerDeserializer.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/Log.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/Log.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/NetworkUtils.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/NetworkUtils.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/PhoneProviderHelper.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/PhoneProviderHelper.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/PicassoTrustAll.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/PicassoTrustAll.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/ProjectUtils.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/ProjectUtils.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/SendAudio.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/SendAudio.java
old mode 100644
new mode 100755
index 05d7477..0efee1c
--- a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/SendAudio.java
+++ b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/SendAudio.java
@@ -343,7 +343,9 @@ public class SendAudio {
     }
 
     private void sendMessageToDriver(final String regIDTujuan, final Chat chat) {
-
+        if (regIDTujuan == null || regIDTujuan.trim().isEmpty()) {
+            return;
+        }
         final FCMMessage message = new FCMMessage();
         message.setTo(regIDTujuan);
         message.setData(chat);
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/SettingPreference.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/SettingPreference.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/SharedPrefrence.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/SharedPrefrence.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/Utility.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/Utility.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/AyoPulsaApiHelper.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/AyoPulsaApiHelper.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/FCMHelper.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/FCMHelper.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/MobilePulsaApiHelper.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/MobilePulsaApiHelper.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/ServiceGenerator.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/ServiceGenerator.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/service/ApiListener.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/service/ApiListener.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/service/MerchantService.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/service/MerchantService.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/service/MessagingService.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/service/MessagingService.java
old mode 100644
new mode 100755
index 3e39c58..1355733
--- a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/service/MessagingService.java
+++ b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/api/service/MessagingService.java
@@ -20,6 +20,7 @@ import id.ontime.merchant.activity.MainActivity;
 import id.ontime.merchant.activity.OrdervalidasiActivity;
 import id.ontime.merchant.activity.SplashActivity;
 import id.ontime.merchant.constants.BaseApp;
+import id.ontime.merchant.models.FirebaseToken;
 import id.ontime.merchant.models.User;
 import id.ontime.merchant.models.fcm.DriverResponse;
 
@@ -39,7 +40,6 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
  * Created by Ourdevelops Team on 10/13/2019.
  */
 
-@SuppressLint("MissingFirebaseInstanceTokenRefresh")
 public class MessagingService extends FirebaseMessagingService {
     Intent intent;
     public static final String BROADCAST_ACTION = "id.ontime.merchant";
@@ -53,6 +53,23 @@ public class MessagingService extends FirebaseMessagingService {
         intentOrder = new Intent(BROADCAST_ORDER);
     }
 
+    /** FCM v1: when token is refreshed, persist in Realm (reference: test app). */
+    @Override
+    public void onNewToken(@NonNull String token) {
+        super.onNewToken(token);
+        try {
+            FirebaseToken t = new FirebaseToken(token);
+            io.realm.Realm realm = BaseApp.getInstance(this).getRealmInstance();
+            realm.executeTransaction(r -> {
+                r.delete(FirebaseToken.class);
+                r.copyToRealm(t);
+            });
+            EventBus.getDefault().postSticky(t);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 
     @RequiresApi(api = Build.VERSION_CODES.M)
     @Override
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/local_interface/OnBpjsItemClick.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/local_interface/OnBpjsItemClick.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/local_interface/OnItemClicked.java b/OnTime_Merchant_live/app/src/main/java/id/ontime/merchant/utils/local_interface/OnItemClicked.java
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/anim/from_left.xml b/OnTime_Merchant_live/app/src/main/res/anim/from_left.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/anim/from_right.xml b/OnTime_Merchant_live/app/src/main/res/anim/from_right.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/anim/indicator_animator.xml b/OnTime_Merchant_live/app/src/main/res/anim/indicator_animator.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/anim/slide_in_bottom.xml b/OnTime_Merchant_live/app/src/main/res/anim/slide_in_bottom.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/anim/slide_out_bottom.xml b/OnTime_Merchant_live/app/src/main/res/anim/slide_out_bottom.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/anim/to_left.xml b/OnTime_Merchant_live/app/src/main/res/anim/to_left.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/anim/to_right.xml b/OnTime_Merchant_live/app/src/main/res/anim/to_right.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/color/selector.xml b/OnTime_Merchant_live/app/src/main/res/color/selector.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_back.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_bank_building.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_bank_building.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_call.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_call.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_camera.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_cancel.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_card.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_chat.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_chats.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_chats.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_checklist.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_checklist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_close.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_close.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_debit_card.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_debit_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_delivery.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_delivery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_destination.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_detailwallet.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_drivers.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_drivers.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_edit.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_editlist.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_edits.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_edits.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_email.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_gallery.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_gender.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_gender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_history.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_history.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_history_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_history_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_home.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_home_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_job.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_job.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_kalender.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_lock.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_logoutlist.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_menu.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_menu.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_menu_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_menu_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_mic.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_pesan.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_pesan_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_phone.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_pickup.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_price.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_price.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_privacy_policy.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_privacy_policy.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_privacylist.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_profil.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_profil_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_progress.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_progress.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_ratelist.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_reports.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_reports.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_reports_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_reports_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_send.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_settings.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_settings.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_settings_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_settings_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_sharelist.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_store.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_store.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_store_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_store_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_tag.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_tag.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_time.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_time.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_topup.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_transaksi.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_transaksi_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_trash.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_trash.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_user.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_vehicle.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_vehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_web.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_withdraw.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/logo.png b/OnTime_Merchant_live/app/src/main/res/drawable-hdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_back.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_bank_building.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_bank_building.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_call.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_call.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_camera.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_cancel.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_card.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_chat.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_chats.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_chats.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_checklist.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_checklist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_close.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_close.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_debit_card.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_debit_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_delivery.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_delivery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_destination.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_detailwallet.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_drivers.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_drivers.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_edit.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_editlist.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_edits.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_edits.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_email.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_gallery.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_gender.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_gender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_history.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_history.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_history_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_history_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_home.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_home_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_job.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_job.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_kalender.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_lock.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_logoutlist.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_menu.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_menu.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_menu_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_menu_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_mic.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_pesan.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_pesan_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_phone.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_pickup.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_price.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_price.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_privacy_policy.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_privacy_policy.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_privacylist.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_profil.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_profil_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_progress.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_progress.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_ratelist.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_reports.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_reports.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_reports_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_reports_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_send.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_settings.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_settings.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_settings_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_settings_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_sharelist.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_store.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_store.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_store_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_store_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_tag.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_tag.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_time.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_time.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_topup.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_transaksi.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_transaksi_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_trash.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_trash.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_user.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_vehicle.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_vehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_web.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_withdraw.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/logo.png b/OnTime_Merchant_live/app/src/main/res/drawable-mdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_back.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_bank_building.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_bank_building.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_call.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_call.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_camera.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_cancel.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_card.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_chat.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_chats.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_chats.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_checklist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_checklist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_close.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_close.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_debit_card.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_debit_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_delivery.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_delivery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_destination.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_detailwallet.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_drivers.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_drivers.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_edit.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_editlist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_edits.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_edits.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_email.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_gallery.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_gender.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_gender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_history.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_history.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_history_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_history_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_home.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_home_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_job.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_job.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_kalender.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_lock.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_logoutlist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_menu.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_menu.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_menu_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_menu_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_mic.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_pesan.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_pesan_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_phone.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_pickup.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_price.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_price.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_privacy_policy.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_privacy_policy.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_privacylist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_profil.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_profil_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_progress.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_progress.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_ratelist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_reports.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_reports.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_reports_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_reports_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_send.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_settings.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_settings.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_settings_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_settings_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_sharelist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_store.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_store.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_store_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_store_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_tag.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_tag.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_time.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_time.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_topup.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_transaksi.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_transaksi_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_trash.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_trash.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_user.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_vehicle.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_vehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_web.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_withdraw.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/logo.png b/OnTime_Merchant_live/app/src/main/res/drawable-xhdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/btn_min.xml b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/btn_min.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/btn_plus.xml b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/btn_plus.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_back.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_bank_building.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_bank_building.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_call.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_call.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_camera.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_cancel.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_card.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_chat.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_chats.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_chats.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_checklist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_checklist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_close.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_close.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_debit_card.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_debit_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_delivery.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_delivery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_destination.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_detailwallet.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_drivers.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_drivers.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_edit.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_editlist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_edits.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_edits.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_email.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_gallery.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_gender.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_gender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_history.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_history.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_history_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_history_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_home.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_home_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_job.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_job.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_kalender.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_lock.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_logoutlist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_menu.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_menu.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_menu_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_menu_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_mic.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_pesan.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_pesan_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_phone.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_pickup.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_price.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_price.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_privacy_policy.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_privacy_policy.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_privacylist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_profil.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_profil_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_progress.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_progress.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_ratelist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_reports.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_reports.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_reports_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_reports_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_send.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_settings.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_settings.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_settings_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_settings_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_sharelist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_store.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_store.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_store_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_store_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_tag.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_tag.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_time.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_time.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_topup.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_transaksi.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_transaksi_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_trash.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_trash.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_user.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_vehicle.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_vehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_web.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_withdraw.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/logo.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxhdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_back.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_bank_building.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_bank_building.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_call.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_call.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_camera.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_cancel.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_card.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_chat.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_chats.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_chats.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_checklist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_checklist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_close.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_close.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_debit_card.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_debit_card.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_delivery.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_delivery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_destination.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_detailwallet.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_drivers.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_drivers.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_edit.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_editlist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_edits.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_edits.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_email.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_gallery.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_gender.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_gender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_history.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_history.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_history_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_history_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_home.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_home_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_job.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_job.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_kalender.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_lock.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_logoutlist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_menu.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_menu.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_menu_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_menu_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_mic.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_pesan.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_pesan_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_phone.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_pickup.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_price.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_price.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_privacy_policy.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_privacy_policy.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_privacylist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_profil.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_profil_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_progress.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_progress.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_ratelist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_reports.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_reports.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_reports_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_reports_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_send.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_settings.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_settings.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_settings_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_settings_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_sharelist.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_store.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_store.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_store_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_store_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_tag.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_tag.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_time.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_time.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_topup.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi_s.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_trash.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_trash.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_user.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_vehicle.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_vehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_web.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_withdraw.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/logo.png b/OnTime_Merchant_live/app/src/main/res/drawable-xxxhdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/aboutshape.png b/OnTime_Merchant_live/app/src/main/res/drawable/aboutshape.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/american_express.png b/OnTime_Merchant_live/app/src/main/res/drawable/american_express.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/atm.png b/OnTime_Merchant_live/app/src/main/res/drawable/atm.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/avaliable.png b/OnTime_Merchant_live/app/src/main/res/drawable/avaliable.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/background_chat.png b/OnTime_Merchant_live/app/src/main/res/drawable/background_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/background_chat_other.xml b/OnTime_Merchant_live/app/src/main/res/drawable/background_chat_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/background_my_chat.xml b/OnTime_Merchant_live/app/src/main/res/drawable/background_my_chat.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/backgroundabout.png b/OnTime_Merchant_live/app/src/main/res/drawable/backgroundabout.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/backrouddrawable.xml b/OnTime_Merchant_live/app/src/main/res/drawable/backrouddrawable.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/banktransfer.png b/OnTime_Merchant_live/app/src/main/res/drawable/banktransfer.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/bg_border.xml b/OnTime_Merchant_live/app/src/main/res/drawable/bg_border.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/bpjs.png b/OnTime_Merchant_live/app/src/main/res/drawable/bpjs.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/btn_bordered.xml b/OnTime_Merchant_live/app/src/main/res/drawable/btn_bordered.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/btn_rect.xml b/OnTime_Merchant_live/app/src/main/res/drawable/btn_rect.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/btn_rect_red.xml b/OnTime_Merchant_live/app/src/main/res/drawable/btn_rect_red.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/btn_stroke.xml b/OnTime_Merchant_live/app/src/main/res/drawable/btn_stroke.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/burst.png b/OnTime_Merchant_live/app/src/main/res/drawable/burst.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/button_del.xml b/OnTime_Merchant_live/app/src/main/res/drawable/button_del.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/button_round_1.xml b/OnTime_Merchant_live/app/src/main/res/drawable/button_round_1.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/button_round_2.xml b/OnTime_Merchant_live/app/src/main/res/drawable/button_round_2.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/button_round_3.xml b/OnTime_Merchant_live/app/src/main/res/drawable/button_round_3.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/changepass.png b/OnTime_Merchant_live/app/src/main/res/drawable/changepass.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/chip.png b/OnTime_Merchant_live/app/src/main/res/drawable/chip.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/custom_left_arrow.xml b/OnTime_Merchant_live/app/src/main/res/drawable/custom_left_arrow.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/destination.png b/OnTime_Merchant_live/app/src/main/res/drawable/destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/diners_club.png b/OnTime_Merchant_live/app/src/main/res/drawable/diners_club.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/discover.png b/OnTime_Merchant_live/app/src/main/res/drawable/discover.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/editvehicle.png b/OnTime_Merchant_live/app/src/main/res/drawable/editvehicle.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/fitur.png b/OnTime_Merchant_live/app/src/main/res/drawable/fitur.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/ic_bank.xml b/OnTime_Merchant_live/app/src/main/res/drawable/ic_bank.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/ic_content_copy_24.xml b/OnTime_Merchant_live/app/src/main/res/drawable/ic_content_copy_24.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/ic_koin.xml b/OnTime_Merchant_live/app/src/main/res/drawable/ic_koin.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/ic_not_send_message.png b/OnTime_Merchant_live/app/src/main/res/drawable/ic_not_send_message.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/ic_pause.png b/OnTime_Merchant_live/app/src/main/res/drawable/ic_pause.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/ic_play.png b/OnTime_Merchant_live/app/src/main/res/drawable/ic_play.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/ic_playsound.png b/OnTime_Merchant_live/app/src/main/res/drawable/ic_playsound.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/ic_star_filled.png b/OnTime_Merchant_live/app/src/main/res/drawable/ic_star_filled.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/ic_star_half.png b/OnTime_Merchant_live/app/src/main/res/drawable/ic_star_half.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/ic_starempty.png b/OnTime_Merchant_live/app/src/main/res/drawable/ic_starempty.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/image_placeholder.png b/OnTime_Merchant_live/app/src/main/res/drawable/image_placeholder.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/jcb.png b/OnTime_Merchant_live/app/src/main/res/drawable/jcb.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/login.png b/OnTime_Merchant_live/app/src/main/res/drawable/login.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/loginmerchant.png b/OnTime_Merchant_live/app/src/main/res/drawable/loginmerchant.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/logo.png b/OnTime_Merchant_live/app/src/main/res/drawable/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/logoflash.png b/OnTime_Merchant_live/app/src/main/res/drawable/logoflash.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/logointro.png b/OnTime_Merchant_live/app/src/main/res/drawable/logointro.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/lupapass.png b/OnTime_Merchant_live/app/src/main/res/drawable/lupapass.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/map.png b/OnTime_Merchant_live/app/src/main/res/drawable/map.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/mastercard.png b/OnTime_Merchant_live/app/src/main/res/drawable/mastercard.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/midtrans.png b/OnTime_Merchant_live/app/src/main/res/drawable/midtrans.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/neworder.png b/OnTime_Merchant_live/app/src/main/res/drawable/neworder.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/nonselecteditem_dot.xml b/OnTime_Merchant_live/app/src/main/res/drawable/nonselecteditem_dot.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/offstock.png b/OnTime_Merchant_live/app/src/main/res/drawable/offstock.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/paypal.png b/OnTime_Merchant_live/app/src/main/res/drawable/paypal.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/payumoney.png b/OnTime_Merchant_live/app/src/main/res/drawable/payumoney.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/pickup.png b/OnTime_Merchant_live/app/src/main/res/drawable/pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/pln.png b/OnTime_Merchant_live/app/src/main/res/drawable/pln.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/promobadge.png b/OnTime_Merchant_live/app/src/main/res/drawable/promobadge.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/promoitem.png b/OnTime_Merchant_live/app/src/main/res/drawable/promoitem.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/round_edittext_background.xml b/OnTime_Merchant_live/app/src/main/res/drawable/round_edittext_background.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/rounded_corners_button.xml b/OnTime_Merchant_live/app/src/main/res/drawable/rounded_corners_button.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/rounded_corners_button_red.xml b/OnTime_Merchant_live/app/src/main/res/drawable/rounded_corners_button_red.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/rounded_delip.xml b/OnTime_Merchant_live/app/src/main/res/drawable/rounded_delip.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/selecteditem_dot.xml b/OnTime_Merchant_live/app/src/main/res/drawable/selecteditem_dot.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/selector.xml b/OnTime_Merchant_live/app/src/main/res/drawable/selector.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/slide_one.png b/OnTime_Merchant_live/app/src/main/res/drawable/slide_one.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/slide_one1.png b/OnTime_Merchant_live/app/src/main/res/drawable/slide_one1.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/slide_three.png b/OnTime_Merchant_live/app/src/main/res/drawable/slide_three.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/slide_three1.png b/OnTime_Merchant_live/app/src/main/res/drawable/slide_three1.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/slide_three2.png b/OnTime_Merchant_live/app/src/main/res/drawable/slide_three2.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/slide_two.png b/OnTime_Merchant_live/app/src/main/res/drawable/slide_two.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/slide_two1.png b/OnTime_Merchant_live/app/src/main/res/drawable/slide_two1.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/underdevelopment.png b/OnTime_Merchant_live/app/src/main/res/drawable/underdevelopment.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/verify.png b/OnTime_Merchant_live/app/src/main/res/drawable/verify.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/visa_logo.png b/OnTime_Merchant_live/app/src/main/res/drawable/visa_logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/visamaster.png b/OnTime_Merchant_live/app/src/main/res/drawable/visamaster.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/withdraw.png b/OnTime_Merchant_live/app/src/main/res/drawable/withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/drawable/word_map.png b/OnTime_Merchant_live/app/src/main/res/drawable/word_map.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/font/montserrat_bold.ttf b/OnTime_Merchant_live/app/src/main/res/font/montserrat_bold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/font/montserrat_medium.ttf b/OnTime_Merchant_live/app/src/main/res/font/montserrat_medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/font/montserrat_regular.ttf b/OnTime_Merchant_live/app/src/main/res/font/montserrat_regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/font/montserrat_semibold.ttf b/OnTime_Merchant_live/app/src/main/res/font/montserrat_semibold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/font/neosans_pro_regular.ttf b/OnTime_Merchant_live/app/src/main/res/font/neosans_pro_regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/font/neosanspro_medium.ttf b/OnTime_Merchant_live/app/src/main/res/font/neosanspro_medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/font/questv_bold.otf b/OnTime_Merchant_live/app/src/main/res/font/questv_bold.otf
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_addmenu.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_addmenu.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_changepassword.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_changepassword.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_chat.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_chat.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_confirm_wa.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_confirm_wa.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_edit_menu.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_edit_menu.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_editmitra.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_editmitra.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_editstore.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_editstore.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_intro.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_intro.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_login.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_login.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_lupapassword.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_lupapassword.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_main.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_menu.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_menu.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_ordervalidasi.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_ordervalidasi.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_picklocation.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_picklocation.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_ppob.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_ppob.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_privacy.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_privacy.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_provider_list.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_provider_list.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_register.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_register.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_splash.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_splash.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_top_up_bpjs.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_top_up_bpjs.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_top_up_pulsa.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_top_up_pulsa.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_topup.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_topup.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_wallet.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_wallet.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/activity_withdraw.xml b/OnTime_Merchant_live/app/src/main/res/layout/activity_withdraw.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/dialog_aboutus.xml b/OnTime_Merchant_live/app/src/main/res/layout/dialog_aboutus.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/dialog_addcategory.xml b/OnTime_Merchant_live/app/src/main/res/layout/dialog_addcategory.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/dialog_editorder.xml b/OnTime_Merchant_live/app/src/main/res/layout/dialog_editorder.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/dialog_payment_details.xml b/OnTime_Merchant_live/app/src/main/res/layout/dialog_payment_details.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/dialog_spinner_dropdown_item.xml b/OnTime_Merchant_live/app/src/main/res/layout/dialog_spinner_dropdown_item.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/dialog_spinner_item.xml b/OnTime_Merchant_live/app/src/main/res/layout/dialog_spinner_item.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/fragment_enablelocation.xml b/OnTime_Merchant_live/app/src/main/res/layout/fragment_enablelocation.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/fragment_fullimage.xml b/OnTime_Merchant_live/app/src/main/res/layout/fragment_fullimage.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/fragment_history.xml b/OnTime_Merchant_live/app/src/main/res/layout/fragment_history.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/fragment_home.xml b/OnTime_Merchant_live/app/src/main/res/layout/fragment_home.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/fragment_menu.xml b/OnTime_Merchant_live/app/src/main/res/layout/fragment_menu.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/fragment_playaudio.xml b/OnTime_Merchant_live/app/src/main/res/layout/fragment_playaudio.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/fragment_recycle.xml b/OnTime_Merchant_live/app/src/main/res/layout/fragment_recycle.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/fragment_reports.xml b/OnTime_Merchant_live/app/src/main/res/layout/fragment_reports.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/fragment_settings.xml b/OnTime_Merchant_live/app/src/main/res/layout/fragment_settings.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_bank.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_bank.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_category.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_category.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_chat_alert.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_chat_alert.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_chat_audio_other.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_chat_audio_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_chat_image_my.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_chat_image_my.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_chat_image_other.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_chat_image_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_chat_my.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_chat_my.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_chat_other.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_chat_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_chataudio.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_chataudio.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_menu.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_menu.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_menus.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_menus.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_message.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_message.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_order.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_order.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_slider_layout.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_slider_layout.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_top_up.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_top_up.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_topup_request.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_topup_request.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/item_wallet.xml b/OnTime_Merchant_live/app/src/main/res/layout/item_wallet.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/sheet_doc_upload.xml b/OnTime_Merchant_live/app/src/main/res/layout/sheet_doc_upload.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/sheet_list.xml b/OnTime_Merchant_live/app/src/main/res/layout/sheet_list.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/sheet_upload.xml b/OnTime_Merchant_live/app/src/main/res/layout/sheet_upload.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/shimerpromo.xml b/OnTime_Merchant_live/app/src/main/res/layout/shimerpromo.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/shimerwallet.xml b/OnTime_Merchant_live/app/src/main/res/layout/shimerwallet.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/shimmercat.xml b/OnTime_Merchant_live/app/src/main/res/layout/shimmercat.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/shimmeritem.xml b/OnTime_Merchant_live/app/src/main/res/layout/shimmeritem.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/shimmermenu.xml b/OnTime_Merchant_live/app/src/main/res/layout/shimmermenu.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/shimmerorder.xml b/OnTime_Merchant_live/app/src/main/res/layout/shimmerorder.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/spinner.xml b/OnTime_Merchant_live/app/src/main/res/layout/spinner.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/top_up_pln_activity.xml b/OnTime_Merchant_live/app/src/main/res/layout/top_up_pln_activity.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/layout/verifycode.xml b/OnTime_Merchant_live/app/src/main/res/layout/verifycode.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/menu/navigation.xml b/OnTime_Merchant_live/app/src/main/res/menu/navigation.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Merchant_live/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Merchant_live/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Merchant_live/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Merchant_live/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Merchant_live/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/raw/notification.mp3 b/OnTime_Merchant_live/app/src/main/res/raw/notification.mp3
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/raw/style_json.json b/OnTime_Merchant_live/app/src/main/res/raw/style_json.json
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/values/colors.xml b/OnTime_Merchant_live/app/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/values/dimens.xml b/OnTime_Merchant_live/app/src/main/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/values/ic_launcher_background.xml b/OnTime_Merchant_live/app/src/main/res/values/ic_launcher_background.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/values/strings.xml b/OnTime_Merchant_live/app/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/values/styles.xml b/OnTime_Merchant_live/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/xml/file_paths.xml b/OnTime_Merchant_live/app/src/main/res/xml/file_paths.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/app/src/main/res/xml/network_security_config.xml b/OnTime_Merchant_live/app/src/main/res/xml/network_security_config.xml
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/build.gradle b/OnTime_Merchant_live/build.gradle
old mode 100644
new mode 100755
index 945c7eb..d48bf78
--- a/OnTime_Merchant_live/build.gradle
+++ b/OnTime_Merchant_live/build.gradle
@@ -4,7 +4,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
     dependencies {
         // Android Gradle Plugin compatible with Gradle 8.x and JDK 21
@@ -23,7 +22,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
         maven { url 'https://jitpack.io' }
     }
 }
diff --git a/OnTime_Merchant_live/gradle.properties b/OnTime_Merchant_live/gradle.properties
old mode 100644
new mode 100755
index 3f53071..331d584
--- a/OnTime_Merchant_live/gradle.properties
+++ b/OnTime_Merchant_live/gradle.properties
@@ -11,6 +11,7 @@
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
 android.useAndroidX=true
+android.suppressUnsupportedCompileSdk=35
 org.gradle.jvmargs=-Xmx1024m --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/OnTime_Merchant_live/gradle/wrapper/gradle-wrapper.properties b/OnTime_Merchant_live/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/gradlew.bat b/OnTime_Merchant_live/gradlew.bat
old mode 100644
new mode 100755
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/LICENSE b/OnTime_Merchant_live/lib/FragmentAnimations/LICENSE
new file mode 100755
index 0000000..e06d208
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/README.md b/OnTime_Merchant_live/lib/FragmentAnimations/README.md
new file mode 100755
index 0000000..3af3459
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/README.md
@@ -0,0 +1,112 @@
+# FragmentAnimations
+
+[![Platform](https://img.shields.io/badge/platform-android-green.svg)](http://developer.android.com/index.html)
+<img src="https://img.shields.io/badge/license-Apache 2.0-green.svg?style=flat">
+[![API](https://img.shields.io/badge/API-4%2B-yellow.svg?style=flat)](https://android-arsenal.com/api?level=4)
+[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FragmentAnimations-green.svg?style=true)](https://android-arsenal.com/details/1/3526)
+
+Animation examples for `support.v4.Fragment` transition.
+
+These animations do not depends on any external libraries.
+
+[<img src="https://dply.me/h7azvd/button/large" alt="Try it on your device via DeployGate">](https://dply.me/h7azvd)
+
+## Usage Example
+
+In your `Fragment`, just code like this.
+
+```java
+@Override
+public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
+    return CubeAnimation.create(CubeAnimation.UP, enter, DURATION);
+}
+```
+
+See more example in [ExampleFragment.java](https://github.com/kakajika/FragmentAnimations/blob/master/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java)
+
+## Contents
+
+### Cube Animation
+
+[CubeAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java)
+
+![Cube](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/cube.gif)
+
+### Flip Animation
+
+[FlipAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java)
+
+![Flip](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/flip.gif)
+
+### Push/Pull Animation
+
+[PushPullAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java)
+
+![Push/Pull](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/pushpull.gif)
+
+### Sides Animation
+
+[SidesAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java)
+
+### Move Animation
+
+[MoveAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java)
+
+![Move](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/move.gif)
+
+## Combination
+
+You can use above Animations with another one.
+
+```java
+@Override
+public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
+    if (enter) {
+        return MoveAnimation.create(MoveAnimation.UP, enter, DURATION);
+    } else {
+        return CubeAnimation.create(CubeAnimation.UP, enter, DURATION);
+    }
+}
+```
+
+### Cube/Move Animation
+
+![Cube/Move](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/cubemove.gif)
+
+### Move/Cube Animation
+
+![Move/Cube](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/movecube.gif)
+
+### Push/Move Animation
+
+![Push/Move](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/pushmove.gif)
+
+### Move/Pull Animation
+
+![Move/Pull](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/movepull.gif)
+
+## Install
+
+This library is available in jcenter.
+
+```groovy
+dependencies {
+    compile 'com.labo.kaji:fragmentanimations:0.1.1'
+}
+```
+
+## License
+
+    Copyright 2015 kakajika
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/.gitignore b/OnTime_Merchant_live/lib/FragmentAnimations/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/build.gradle b/OnTime_Merchant_live/lib/FragmentAnimations/app/build.gradle
new file mode 100755
index 0000000..cbcb969
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'com.android.application'
+apply plugin: 'deploygate'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.1"
+
+    defaultConfig {
+        applicationId "com.labo.kaji.fragmentanimations"
+        minSdkVersion 7
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(':fragmentanimations')
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:24.1.1'
+    compile 'com.android.support:design:24.1.1'
+    compile 'com.android.support:support-v4:24.1.1'
+    compile 'com.jakewharton:butterknife:7.0.1'
+    compile 'com.deploygate:sdk:3.1'
+}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/proguard-rules.pro b/OnTime_Merchant_live/lib/FragmentAnimations/app/proguard-rules.pro
new file mode 100755
index 0000000..664a4d6
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/kakajika/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
new file mode 100755
index 0000000..bf9686e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.labo.kaji.fragmentanimations;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..9f74823
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.labo.kaji.fragmentanimations.example"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:name=".App"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/App.java b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/App.java
new file mode 100755
index 0000000..9b0b992
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/App.java
@@ -0,0 +1,18 @@
+package com.labo.kaji.fragmentanimations.example;
+
+import android.app.Application;
+
+import com.deploygate.sdk.DeployGate;
+
+/**
+ * @author kakajika
+ * @since 2016/04/20
+ */
+public class App extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        DeployGate.install(this);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java
new file mode 100755
index 0000000..e49b473
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java
@@ -0,0 +1,389 @@
+package com.labo.kaji.fragmentanimations.example;
+
+import android.annotation.SuppressLint;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.widget.TextView;
+
+import com.labo.kaji.fragmentanimations.CubeAnimation;
+import com.labo.kaji.fragmentanimations.FlipAnimation;
+import com.labo.kaji.fragmentanimations.MoveAnimation;
+import com.labo.kaji.fragmentanimations.PushPullAnimation;
+import com.labo.kaji.fragmentanimations.SidesAnimation;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * @author kakajika
+ * @since 2015/11/27
+ */
+public class ExampleFragment extends Fragment {
+
+    @IntDef({NONE, MOVE, CUBE, FLIP, PUSHPULL, SIDES, CUBEMOVE, MOVECUBE, PUSHMOVE, MOVEPULL, FLIPMOVE, MOVEFLIP, FLIPCUBE, CUBEFLIP})
+    public @interface AnimationStyle {}
+    public static final int NONE     = 0;
+    public static final int MOVE     = 1;
+    public static final int CUBE     = 2;
+    public static final int FLIP     = 3;
+    public static final int PUSHPULL = 4;
+    public static final int SIDES    = 5;
+    public static final int CUBEMOVE = 6;
+    public static final int MOVECUBE = 7;
+    public static final int PUSHMOVE = 8;
+    public static final int MOVEPULL = 9;
+    public static final int FLIPMOVE = 10;
+    public static final int MOVEFLIP = 11;
+    public static final int FLIPCUBE = 12;
+    public static final int CUBEFLIP = 13;
+
+    @IntDef({NODIR, UP, DOWN, LEFT, RIGHT})
+    public @interface AnimationDirection {}
+    public static final int NODIR = 0;
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    private static final long DURATION = 500;
+
+    @AnimationStyle
+    private static int sAnimationStyle = CUBE;
+
+    @Bind(R.id.textAnimationStyle)
+    TextView mTextAnimationStyle;
+
+    public static ExampleFragment newInstance(@AnimationDirection int direction) {
+        ExampleFragment f = new ExampleFragment();
+        f.setArguments(new Bundle());
+        f.getArguments().putInt("direction", direction);
+        return f;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.content_anim, container, false);
+        int color = Color.rgb((int) Math.floor(Math.random() * 128) + 64,
+                              (int) Math.floor(Math.random() * 128) + 64,
+                              (int) Math.floor(Math.random() * 128) + 64);
+        view.setBackgroundColor(color);
+        ButterKnife.bind(this, view);
+        setAnimationStyleText();
+        return view;
+    }
+
+    @Override
+    public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
+        switch (sAnimationStyle) {
+            case MOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return MoveAnimation.create(MoveAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case CUBE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return CubeAnimation.create(CubeAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case FLIP:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return FlipAnimation.create(FlipAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case PUSHPULL:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return PushPullAnimation.create(PushPullAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return PushPullAnimation.create(PushPullAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return PushPullAnimation.create(PushPullAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return PushPullAnimation.create(PushPullAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case SIDES:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return SidesAnimation.create(SidesAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return SidesAnimation.create(SidesAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return SidesAnimation.create(SidesAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return SidesAnimation.create(SidesAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case CUBEMOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case MOVECUBE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? CubeAnimation.create(CubeAnimation.UP, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case PUSHMOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? MoveAnimation.create(MoveAnimation.UP, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return enter ? MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return enter ? MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return enter ? MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case MOVEPULL:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.UP, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.DOWN, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.LEFT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.RIGHT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case FLIPMOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? MoveAnimation.create(MoveAnimation.UP, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return enter ? MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return enter ? MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return enter ? MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case MOVEFLIP:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? FlipAnimation.create(FlipAnimation.UP, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case FLIPCUBE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? CubeAnimation.create(CubeAnimation.UP, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return enter ? CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return enter ? CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return enter ? CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case CUBEFLIP:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? FlipAnimation.create(FlipAnimation.UP, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case NONE:
+                break;
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonUp)
+    void onButtonUp() {
+        getArguments().putInt("direction", UP);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(UP));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonDown)
+    void onButtonDown() {
+        getArguments().putInt("direction", DOWN);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(DOWN));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonLeft)
+    void onButtonLeft() {
+        getArguments().putInt("direction", LEFT);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(LEFT));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonRight)
+    void onButtonRight() {
+        getArguments().putInt("direction", RIGHT);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(RIGHT));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.textAnimationStyle)
+    public void switchAnimationStyle(View view) {
+        @AnimationStyle int[] styles;
+        styles = new int[]{MOVE, CUBE, FLIP, PUSHPULL, SIDES, CUBEMOVE, MOVECUBE, PUSHMOVE, MOVEPULL, FLIPMOVE, MOVEFLIP, FLIPCUBE, CUBEFLIP};
+        for (int i = 0; i<styles.length-1; ++i) {
+            if (styles[i] == sAnimationStyle) {
+                setAnimationStyle(styles[i+1]);
+                return;
+            }
+        }
+        setAnimationStyle(MOVE);
+    }
+
+    public void setAnimationStyle(@AnimationStyle int style) {
+        if (sAnimationStyle != style) {
+            sAnimationStyle = style;
+            setAnimationStyleText();
+            Snackbar.make(getView(), "Animation Style is Changed", Snackbar.LENGTH_SHORT).show();
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private void setAnimationStyleText() {
+        switch (sAnimationStyle) {
+            case NONE:
+                mTextAnimationStyle.setText("None");
+                break;
+            case MOVE:
+                mTextAnimationStyle.setText("Move");
+                break;
+            case CUBE:
+                mTextAnimationStyle.setText("Cube");
+                break;
+            case FLIP:
+                mTextAnimationStyle.setText("Flip");
+                break;
+            case PUSHPULL:
+                mTextAnimationStyle.setText("Push/Pull");
+                break;
+            case SIDES:
+                mTextAnimationStyle.setText("Sides");
+                break;
+            case CUBEMOVE:
+                mTextAnimationStyle.setText("Cube/Move");
+                break;
+            case MOVECUBE:
+                mTextAnimationStyle.setText("Move/Cube");
+                break;
+            case PUSHMOVE:
+                mTextAnimationStyle.setText("Push/Move");
+                break;
+            case MOVEPULL:
+                mTextAnimationStyle.setText("Move/Pull");
+                break;
+            case FLIPMOVE:
+                mTextAnimationStyle.setText("Flip/Move");
+                break;
+            case MOVEFLIP:
+                mTextAnimationStyle.setText("Move/Flip");
+                break;
+            case FLIPCUBE:
+                mTextAnimationStyle.setText("Flip/Cube");
+                break;
+            case CUBEFLIP:
+                mTextAnimationStyle.setText("Cube/Flip");
+                break;
+        }
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/MainActivity.java b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/MainActivity.java
new file mode 100755
index 0000000..a2e5ee8
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/MainActivity.java
@@ -0,0 +1,68 @@
+package com.labo.kaji.fragmentanimations.example;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import butterknife.ButterKnife;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ButterKnife.bind(this);
+
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(ExampleFragment.NODIR));
+        ft.commit();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        ExampleFragment f = (ExampleFragment)getSupportFragmentManager().findFragmentById(R.id.layout_main);
+        switch (id) {
+            case R.id.style_move:
+                f.setAnimationStyle(ExampleFragment.MOVE);
+                return true;
+            case R.id.style_cube:
+                f.setAnimationStyle(ExampleFragment.CUBE);
+                return true;
+            case R.id.style_flip:
+                f.setAnimationStyle(ExampleFragment.FLIP);
+                return true;
+            case R.id.style_pushpull:
+                f.setAnimationStyle(ExampleFragment.PUSHPULL);
+                return true;
+            case R.id.style_sides:
+                f.setAnimationStyle(ExampleFragment.SIDES);
+                return true;
+            case R.id.style_cubemove:
+                f.setAnimationStyle(ExampleFragment.CUBEMOVE);
+                return true;
+            case R.id.style_movecube:
+                f.setAnimationStyle(ExampleFragment.MOVECUBE);
+                return true;
+            case R.id.style_pushmove:
+                f.setAnimationStyle(ExampleFragment.PUSHMOVE);
+                return true;
+            case R.id.style_movepull:
+                f.setAnimationStyle(ExampleFragment.MOVEPULL);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_changestyle.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_changestyle.png
new file mode 100755
index 0000000..6807e6a
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_changestyle.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_down.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_down.png
new file mode 100755
index 0000000..0f2b97e
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_down.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_left.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_left.png
new file mode 100755
index 0000000..bf06ba6
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_left.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_right.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_right.png
new file mode 100755
index 0000000..ea1ecda
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_right.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_up.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_up.png
new file mode 100755
index 0000000..6474aa9
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_up.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_changestyle.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_changestyle.png
new file mode 100755
index 0000000..55c7711
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_changestyle.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_down.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_down.png
new file mode 100755
index 0000000..902eda7
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_down.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_left.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_left.png
new file mode 100755
index 0000000..bd2d183
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_left.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_right.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_right.png
new file mode 100755
index 0000000..2a962cf
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_right.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_up.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_up.png
new file mode 100755
index 0000000..dd1635c
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_up.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_changestyle.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_changestyle.png
new file mode 100755
index 0000000..90e017a
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_changestyle.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_down.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_down.png
new file mode 100755
index 0000000..49930b8
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_down.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_left.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_left.png
new file mode 100755
index 0000000..ee04399
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_left.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_right.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_right.png
new file mode 100755
index 0000000..b2d8d65
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_right.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_up.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_up.png
new file mode 100755
index 0000000..6c49170
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_up.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/layout/activity_main.xml b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..8132246
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".MainActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_main"/>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/layout/content_anim.xml b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/layout/content_anim.xml
new file mode 100755
index 0000000..53e29ec
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/layout/content_anim.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/textAnimationStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="8dp"
+        android:textColor="@android:color/white"
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonLeft"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left|center"
+        android:src="@drawable/ic_left"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonRight"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right|center"
+        android:src="@drawable/ic_right"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonUp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|center"
+        android:src="@drawable/ic_up"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonDown"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center"
+        android:src="@drawable/ic_down"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/layout/content_main.xml b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/layout/content_main.xml
new file mode 100755
index 0000000..e8f12a1
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/layout/content_main.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:background="#444"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".MainActivity"
+    tools:showIn="@layout/activity_main">
+
+    <FrameLayout
+        android:id="@+id/layout_main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="32dp"
+        android:layout_centerInParent="true"/>
+
+</RelativeLayout>
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/menu/menu_main.xml b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/menu/menu_main.xml
new file mode 100755
index 0000000..3df93f1
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/menu/menu_main.xml
@@ -0,0 +1,41 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".example.MainActivity">
+    <item
+        android:id="@+id/style_move"
+        android:title="Move"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_cube"
+        android:title="Cube"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_flip"
+        android:title="Flip"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_pushpull"
+        android:title="Push/Pull"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_sides"
+        android:title="Sides"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_cubemove"
+        android:title="Cube/Move"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_movecube"
+        android:title="Move/Cube"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_pushmove"
+        android:title="Push/Move"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_movepull"
+        android:title="Move/Pull"
+        app:showAsAction="never"/>
+</menu>
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..cde69bc
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..c133a0c
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..bfa42f0
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..324e72c
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..aee44e1
Binary files /dev/null and b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values-v21/styles.xml b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..251fb9f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,9 @@
+<resources>>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values-w820dp/dimens.xml b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/colors.xml b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..3ab3e9c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/dimens.xml b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..812cb7b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/strings.xml b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..d1647aa
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">FragmentAnimations</string>
+    <string name="action_settings">Settings</string>
+</resources>
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/styles.xml b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..177cefc
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/main/res/values/styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
+
+</resources>
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/app/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
new file mode 100755
index 0000000..a3f4fb7
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/app/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package com.labo.kaji.fragmentanimations;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/build.gradle b/OnTime_Merchant_live/lib/FragmentAnimations/build.gradle
new file mode 100755
index 0000000..bef8f5c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.novoda:bintray-release:0.3.4'
+        classpath 'com.deploygate:gradle:1.0.4'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/.gitignore b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/build.gradle b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/build.gradle
new file mode 100755
index 0000000..9a337d8
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'com.labo.kaji.fragmentanimations'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName "0.1.1"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.annotation:annotation:1.7.1'
+    testImplementation 'junit:junit:4.13.2'
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/proguard-rules.pro b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/proguard-rules.pro
new file mode 100755
index 0000000..664a4d6
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/kakajika/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
new file mode 100755
index 0000000..bf9686e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.labo.kaji.fragmentanimations;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..0a0938a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java
new file mode 100755
index 0000000..95a0f12
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java
@@ -0,0 +1,107 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Cube Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class CubeAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull CubeAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalCubeAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalCubeAnimation(direction, enter, duration);
+        }
+    }
+
+    private CubeAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalCubeAnimation extends CubeAnimation {
+
+        private VerticalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == UP)) ? 0.0f : height;
+            mCameraZ = -height * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == DOWN) value *= -1.0f;
+            mRotationX = value * 90.0f;
+            mTranslationY = -value * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalCubeAnimation extends CubeAnimation {
+
+        private HorizontalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == LEFT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+            mCameraZ = -width * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == RIGHT) value *= -1.0f;
+            mRotationY = -value * 90.0f;
+            mTranslationX = -value * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java
new file mode 100755
index 0000000..0145dbe
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java
@@ -0,0 +1,123 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Flip Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class FlipAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull FlipAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalFlipAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalFlipAnimation(direction, enter, duration);
+        }
+    }
+
+    private FlipAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalFlipAnimation extends FlipAnimation {
+
+        public VerticalFlipAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == UP)) ? 0.0f : height;
+            mCameraZ = -height * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == DOWN) value *= -1.0f;
+            mRotationX = value * 180.0f;
+            mTranslationY = -value * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+
+            // Hide entering/exiting view before/after half point.
+            if (mEnter) {
+                mAlpha = interpolatedTime <= 0.5f ? 0.0f : 1.0f;
+            } else {
+                mAlpha = interpolatedTime <= 0.5f ? 1.0f : 0.0f;
+            }
+
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalFlipAnimation extends FlipAnimation {
+
+        public HorizontalFlipAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == LEFT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+            mCameraZ = -width * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == RIGHT) value *= -1.0f;
+            mRotationY = -value * 180.0f;
+            mTranslationX = -value * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+
+            // Hide entering/exiting view before/after half point.
+            if (mEnter) {
+                mAlpha = interpolatedTime <= 0.5f ? 0.0f : 1.0f;
+            } else {
+                mAlpha = interpolatedTime <= 0.5f ? 1.0f : 0.0f;
+            }
+
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java
new file mode 100755
index 0000000..311c67f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java
@@ -0,0 +1,89 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Move Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class MoveAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull MoveAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalMoveAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalMoveAnimation(direction, enter, duration);
+        }
+    }
+
+    private MoveAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalMoveAnimation extends MoveAnimation {
+
+        private VerticalMoveAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == DOWN) value *= -1.0f;
+            mTranslationY = -value * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalMoveAnimation extends MoveAnimation {
+
+        private HorizontalMoveAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == RIGHT) value *= -1.0f;
+            mTranslationX = -value * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java
new file mode 100755
index 0000000..5110920
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java
@@ -0,0 +1,105 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Push/Pull Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class PushPullAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull PushPullAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalPushPullAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalPushPullAnimation(direction, enter, duration);
+        }
+    }
+
+    private PushPullAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalPushPullAnimation extends PushPullAnimation {
+
+        private VerticalPushPullAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == DOWN)) ? 0.0f : height;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == UP) value *= -1.0f;
+            mRotationX = value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalPushPullAnimation extends PushPullAnimation {
+
+        private HorizontalPushPullAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == RIGHT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == LEFT) value *= -1.0f;
+            mRotationY = -value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java
new file mode 100755
index 0000000..bacd95f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java
@@ -0,0 +1,109 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Cube Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class SidesAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull SidesAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalCubeAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalCubeAnimation(direction, enter, duration);
+        }
+    }
+
+    private SidesAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+        setInterpolator(new AccelerateDecelerateInterpolator());
+    }
+
+    private static class VerticalCubeAnimation extends SidesAnimation {
+
+        private VerticalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == DOWN)) ? 0.0f : height;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == UP) value *= -1.0f;
+            mRotationX = value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+            mTranslationZ = (1.0f - mAlpha) * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalCubeAnimation extends SidesAnimation {
+
+        private HorizontalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == RIGHT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == LEFT) value *= -1.0f;
+            mRotationY = -value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+            mTranslationZ = (1.0f - mAlpha) * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/ViewPropertyAnimation.java b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/ViewPropertyAnimation.java
new file mode 100755
index 0000000..b999ced
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/ViewPropertyAnimation.java
@@ -0,0 +1,100 @@
+package com.labo.kaji.fragmentanimations;
+
+import android.graphics.Camera;
+import android.graphics.Matrix;
+import android.os.Build;
+import androidx.annotation.FloatRange;
+import android.view.animation.Animation;
+import android.view.animation.Transformation;
+
+/**
+ * @author kakajika
+ * @since 2015/11/27
+ */
+public class ViewPropertyAnimation extends Animation {
+
+    private final Camera mCamera = new Camera();
+    protected int mWidth  = 0;
+    protected int mHeight = 0;
+    protected float mAlpha = 1.0f;
+    protected float mPivotX = 0.0f;
+    protected float mPivotY = 0.0f;
+    protected float mScaleX = 1.0f;
+    protected float mScaleY = 1.0f;
+    protected float mRotationX = 0.0f;
+    protected float mRotationY = 0.0f;
+    protected float mRotationZ = 0.0f;
+    protected float mTranslationX = 0.0f;
+    protected float mTranslationY = 0.0f;
+    protected float mTranslationZ = 0.0f;
+    protected float mCameraX = 0.0f;
+    protected float mCameraY = 0.0f;
+    protected float mCameraZ = -8.0f;
+
+    private float mFromAlpha = -1.0f;
+    private float mToAlpha   = -1.0f;
+
+    public ViewPropertyAnimation fading(@FloatRange(from=0.0f,to=1.0f) float fromAlpha, @FloatRange(from=0.0f,to=1.0f) float toAlpha) {
+        mFromAlpha = fromAlpha;
+        mToAlpha = toAlpha;
+        return this;
+    }
+
+    @Override
+    public void initialize(int width, int height, int parentWidth, int parentHeight) {
+        super.initialize(width, height, parentWidth, parentHeight);
+        mWidth = width;
+        mHeight = height;
+    }
+
+    @Override
+    protected void applyTransformation(float interpolatedTime, Transformation t) {
+        super.applyTransformation(interpolatedTime, t);
+        if (mFromAlpha >= 0 && mToAlpha >= 0) {
+            mAlpha = mFromAlpha + (mToAlpha - mFromAlpha) * interpolatedTime;
+        }
+    }
+
+    protected void applyTransformation(Transformation t) {
+        final Matrix m = t.getMatrix();
+        final float w = mWidth;
+        final float h = mHeight;
+        final float pX = mPivotX;
+        final float pY = mPivotY;
+
+        final float rX = mRotationX;
+        final float rY = mRotationY;
+        final float rZ = mRotationZ;
+        if ((rX != 0) || (rY != 0) || (rZ != 0)) {
+            final Camera camera = mCamera;
+            camera.save();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1) {
+                camera.setLocation(mCameraX, mCameraY, mCameraZ);
+            }
+            if (mTranslationZ != 0) {
+                camera.translate(0, 0, mTranslationZ);
+            }
+            camera.rotateX(rX);
+            camera.rotateY(rY);
+            camera.rotateZ(-rZ);
+            camera.getMatrix(m);
+            camera.restore();
+            m.preTranslate(-pX, -pY);
+            m.postTranslate(pX, pY);
+        }
+
+        final float sX = mScaleX;
+        final float sY = mScaleY;
+        if ((sX != 1.0f) || (sY != 1.0f)) {
+            m.postScale(sX, sY);
+            final float sPX = -(pX / w) * ((sX * w) - w);
+            final float sPY = -(pY / h) * ((sY * h) - h);
+            m.postTranslate(sPX, sPY);
+        }
+
+        m.postTranslate(mTranslationX, mTranslationY);
+
+        t.setAlpha(mAlpha);
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
new file mode 100755
index 0000000..a3f4fb7
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/fragmentanimations/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package com.labo.kaji.fragmentanimations;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/gradle.properties b/OnTime_Merchant_live/lib/FragmentAnimations/gradle.properties
new file mode 100755
index 0000000..1d3591c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/gradle/wrapper/gradle-wrapper.properties b/OnTime_Merchant_live/lib/FragmentAnimations/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..60eab91
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Apr 22 14:42:45 JST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/gradlew b/OnTime_Merchant_live/lib/FragmentAnimations/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/gradlew.bat b/OnTime_Merchant_live/lib/FragmentAnimations/gradlew.bat
new file mode 100755
index 0000000..aec9973
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_Merchant_live/lib/FragmentAnimations/settings.gradle b/OnTime_Merchant_live/lib/FragmentAnimations/settings.gradle
new file mode 100755
index 0000000..4288300
--- /dev/null
+++ b/OnTime_Merchant_live/lib/FragmentAnimations/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':fragmentanimations'
diff --git a/OnTime_Merchant_live/lib/PRDownloader/.gitignore b/OnTime_Merchant_live/lib/PRDownloader/.gitignore
new file mode 100755
index 0000000..5bf645d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/.gitignore
@@ -0,0 +1,10 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+/.idea
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/CONTRIBUTING.md b/OnTime_Merchant_live/lib/PRDownloader/CONTRIBUTING.md
new file mode 100755
index 0000000..39e2777
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/CONTRIBUTING.md
@@ -0,0 +1,9 @@
+# Contributing
+
+1. Fork it!
+2. Checkout the development branch: `git checkout development`
+3. Create your feature branch: `git checkout -b my-new-feature`
+4. Add your changes to the index: `git add .`
+5. Commit your changes: `git commit -m 'Add some feature'`
+6. Push to the branch: `git push origin my-new-feature`
+7. Submit a pull request against the `development` branch
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/LICENSE b/OnTime_Merchant_live/lib/PRDownloader/LICENSE
new file mode 100755
index 0000000..7a4a3ea
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/README.md b/OnTime_Merchant_live/lib/PRDownloader/README.md
new file mode 100755
index 0000000..94c08d0
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/README.md
@@ -0,0 +1,190 @@
+<p align="center">
+<img alt="PRDownloader" src=https://raw.githubusercontent.com/amitshekhariitbhu/PRDownloader/master/assets/prdownloader.png />
+</p>
+
+# PRDownloader - A file downloader library for Android with pause and resume support
+
+## Sample Download
+<img src=https://raw.githubusercontent.com/amitshekhariitbhu/PRDownloader/master/assets/sample_download.png width=360 height=640 />
+
+### Overview of PRDownloader library
+* PRDownloader can be used to download any type of files like image, video, pdf, apk and etc.
+* This file downloader library supports pause and resume while downloading a file.
+* Supports large file download.
+* This downloader library has a simple interface to make download request.
+* We can check if the status of downloading with the given download Id.
+* PRDownloader gives callbacks for everything like onProgress, onCancel, onStart, onError and etc while downloading a file.
+* Supports proper request canceling.
+* Many requests can be made in parallel.
+* All types of customization are possible.
+
+## About me
+
+Hi, I am Amit Shekhar, Founder @ [Outcome School](https://outcomeschool.com) • IIT 2010-14 • I have taught and mentored many developers, and their efforts landed them high-paying tech jobs, helped many tech companies in solving their unique problems, and created many open-source libraries being used by top companies. I am passionate about sharing knowledge through open-source, blogs, and videos.
+
+### Follow Amit Shekhar
+
+- [X/Twitter](https://twitter.com/amitiitbhu)
+- [LinkedIn](https://www.linkedin.com/in/amit-shekhar-iitbhu)
+- [GitHub](https://github.com/amitshekhariitbhu)
+
+### Follow Outcome School
+
+- [YouTube](https://youtube.com/@OutcomeSchool)
+- [X/Twitter](https://x.com/outcome_school)
+- [LinkedIn](https://www.linkedin.com/company/outcomeschool)
+- [GitHub](http://github.com/OutcomeSchool)
+
+## I teach at Outcome School
+
+- AI and Machine Learning
+- Android
+
+Join Outcome School and get a high-paying tech job: [Outcome School](https://outcomeschool.com)
+
+## Using PRDownloader Library in your Android application
+
+Add this in your `settings.gradle`:
+```groovy
+maven { url 'https://jitpack.io' }
+```
+
+If you are using `settings.gradle.kts`, add the following:
+```kotlin
+maven { setUrl("https://jitpack.io") }
+```
+
+Add this in your `build.gradle`
+```groovy
+implementation 'com.github.amitshekhariitbhu:PRDownloader:1.0.2'
+```
+
+If you are using `build.gradle.kts`, add the following:
+```kotlin
+implementation("com.github.amitshekhariitbhu:PRDownloader:1.0.2")
+```
+
+Do not forget to add internet permission in manifest if already not present
+```xml
+<uses-permission android:name="android.permission.INTERNET" />
+```
+Then initialize it in onCreate() Method of application class :
+```java
+PRDownloader.initialize(getApplicationContext());
+```
+Initializing it with some customization
+```java
+// Enabling database for resume support even after the application is killed:
+PRDownloaderConfig config = PRDownloaderConfig.newBuilder()
+                .setDatabaseEnabled(true)
+                .build();
+PRDownloader.initialize(getApplicationContext(), config);
+
+// Setting timeout globally for the download network requests:
+PRDownloaderConfig config = PRDownloaderConfig.newBuilder()
+                .setReadTimeout(30_000)
+                .setConnectTimeout(30_000)
+                .build();
+PRDownloader.initialize(getApplicationContext(), config); 
+```
+
+### Make a download request
+```java
+int downloadId = PRDownloader.download(url, dirPath, fileName)
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                               
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                               
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                               
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                               
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                               
+                            }
+                        });            
+```
+
+### Pause a download request
+```java
+PRDownloader.pause(downloadId);
+```
+
+### Resume a download request
+```java
+PRDownloader.resume(downloadId);
+```
+
+### Cancel a download request
+```java
+// Cancel with the download id
+PRDownloader.cancel(downloadId);
+// The tag can be set to any request and then can be used to cancel the request
+PRDownloader.cancel(TAG);
+// Cancel all the requests
+PRDownloader.cancelAll();
+```
+
+### Status of a download request
+```java
+Status status = PRDownloader.getStatus(downloadId);
+```
+
+### Clean up resumed files if database enabled
+```java
+// Method to clean up temporary resumed files which is older than the given day
+PRDownloader.cleanUp(days);
+```
+### TODO
+* Integration with other libraries like OkHttp, RxJava
+* Test Cases
+* And of course many many features and bug fixes
+
+## [Outcome School Blog](https://outcomeschool.com/blog) - High-quality content to learn Android concepts.
+
+## If this library helps you in anyway, show your love :heart: by putting a :star: on this project :v:
+
+### License
+```
+   Copyright (C) 2024 Amit Shekhar
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+```
+
+### Contributing to PRDownloader
+All pull requests are welcome, make sure to follow the [contribution guidelines](CONTRIBUTING.md)
+when you submit pull request.
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/.gitignore b/OnTime_Merchant_live/lib/PRDownloader/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/build.gradle b/OnTime_Merchant_live/lib/PRDownloader/app/build.gradle
new file mode 100755
index 0000000..c33b492
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'com.android.application'
+
+android {
+    namespace 'com.sample'
+    defaultConfig {
+        applicationId "com.sample"
+        minSdkVersion 14
+        targetSdkVersion 35
+        compileSdk 35
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:1.0.7'
+    implementation project(':prdownloader')
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/proguard-rules.pro b/OnTime_Merchant_live/lib/PRDownloader/app/proguard-rules.pro
new file mode 100755
index 0000000..f1b4245
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/androidTest/java/com/sample/ExampleInstrumentedTest.java b/OnTime_Merchant_live/lib/PRDownloader/app/src/androidTest/java/com/sample/ExampleInstrumentedTest.java
new file mode 100755
index 0000000..0391c99
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/androidTest/java/com/sample/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.sample;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.sample", appContext.getPackageName());
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..4863e94
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:name=".SampleApp"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/java/com/sample/MainActivity.java b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/java/com/sample/MainActivity.java
new file mode 100755
index 0000000..6320264
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/java/com/sample/MainActivity.java
@@ -0,0 +1,1461 @@
+package com.sample;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.downloader.Error;
+import com.downloader.OnCancelListener;
+import com.downloader.OnDownloadListener;
+import com.downloader.OnPauseListener;
+import com.downloader.OnProgressListener;
+import com.downloader.OnStartOrResumeListener;
+import com.downloader.PRDownloader;
+import com.downloader.Progress;
+import com.downloader.Status;
+import com.sample.utils.Utils;
+
+public class MainActivity extends AppCompatActivity {
+
+    private static String dirPath;
+
+    final String URL1 = "http://www.appsapk.com/downloading/latest/Facebook-119.0.0.23.70.apk";
+    final String URL2 = "http://www.appsapk.com/downloading/latest/WeChat-6.5.7.apk";
+    final String URL3 = "http://www.appsapk.com/downloading/latest/Instagram.apk";
+    final String URL4 = "http://www.appsapk.com/downloading/latest/Emoji%20Flashlight%20-%20Brightest%20Flashlight%202018-2.0.1.apk";
+    final String URL5 = "http://www.appsapk.com/downloading/latest/Screen%20Recorder-7.7.apk";
+    final String URL6 = "http://www.appsapk.com/downloading/latest/Call%20Recorder%20-%20Automatic%20Call%20Recorder-1.6.0.apk";
+    final String URL7 = "http://www.appsapk.com/downloading/latest/Sound%20Profile%20(+%20volume%20scheduler)-5.25.apk";
+    final String URL8 = "http://www.appsapk.com/downloading/latest/Evernote%20-%20stay%20organized.-7.9.7.apk";
+    final String URL9 = "http://www.appsapk.com/downloading/latest/UC-Browser.apk";
+    final String URL10 = "http://www.appsapk.com/downloading/latest/Barcode%20Scanner-1.2.apk";
+    final String URL11 = "http://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_640x360.m4v";
+    final String URL12 = "http://www2.sdfi.edu.cn/netclass/jiaoan/englit/download/Harry%20Potter%20and%20the%20Sorcerer's%20Stone.pdf";
+    final String URL13 = "https://media.giphy.com/media/Bk0CW5frw4qfS/giphy.gif";
+    final String URL14 = "http://techslides.com/demos/sample-videos/small.mp4";
+    final String URL15 = "http://www.sample-videos.com/video/mp4/720/big_buck_bunny_720p_10mb.mp4";
+
+    Button buttonOne, buttonTwo, buttonThree, buttonFour,
+            buttonFive, buttonSix, buttonSeven, buttonEight,
+            buttonNine, buttonTen, buttonEleven, buttonTwelve,
+            buttonThirteen, buttonFourteen, buttonFifteen,
+            buttonCancelOne, buttonCancelTwo, buttonCancelThree,
+            buttonCancelFour, buttonCancelFive, buttonCancelSix,
+            buttonCancelSeven, buttonCancelEight, buttonCancelNine,
+            buttonCancelTen, buttonCancelEleven, buttonCancelTwelve,
+            buttonCancelThirteen, buttonCancelFourteen, buttonCancelFifteen;
+
+    TextView textViewProgressOne, textViewProgressTwo, textViewProgressThree,
+            textViewProgressFour, textViewProgressFive, textViewProgressSix,
+            textViewProgressSeven, textViewProgressEight, textViewProgressNine,
+            textViewProgressTen, textViewProgressEleven, textViewProgressTwelve,
+            textViewProgressThirteen, textViewProgressFourteen, textViewProgressFifteen;
+
+    ProgressBar progressBarOne, progressBarTwo, progressBarThree,
+            progressBarFour, progressBarFive, progressBarSix,
+            progressBarSeven, progressBarEight, progressBarNine,
+            progressBarTen, progressBarEleven, progressBarTwelve,
+            progressBarThirteen, progressBarFourteen, progressBarFifteen;
+
+    int downloadIdOne, downloadIdTwo, downloadIdThree, downloadIdFour,
+            downloadIdFive, downloadIdSix, downloadIdSeven,
+            downloadIdEight, downloadIdNine, downloadIdTen,
+            downloadIdEleven, downloadIdTwelve, downloadIdThirteen,
+            downloadIdFourteen, downloadIdFifteen;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        dirPath = Utils.getRootDirPath(getApplicationContext());
+
+        init();
+
+        onClickListenerOne();
+        onClickListenerTwo();
+        onClickListenerThree();
+        onClickListenerFour();
+        onClickListenerFive();
+        onClickListenerSix();
+        onClickListenerSeven();
+        onClickListenerEight();
+        onClickListenerNine();
+        onClickListenerTen();
+        onClickListenerEleven();
+        onClickListenerTwelve();
+        onClickListenerThirteen();
+        onClickListenerFourteen();
+        onClickListenerFifteen();
+    }
+
+    private void init() {
+        buttonOne = findViewById(R.id.buttonOne);
+        buttonTwo = findViewById(R.id.buttonTwo);
+        buttonThree = findViewById(R.id.buttonThree);
+        buttonFour = findViewById(R.id.buttonFour);
+        buttonFive = findViewById(R.id.buttonFive);
+        buttonSix = findViewById(R.id.buttonSix);
+        buttonSeven = findViewById(R.id.buttonSeven);
+        buttonEight = findViewById(R.id.buttonEight);
+        buttonNine = findViewById(R.id.buttonNine);
+        buttonTen = findViewById(R.id.buttonTen);
+        buttonEleven = findViewById(R.id.buttonEleven);
+        buttonTwelve = findViewById(R.id.buttonTwelve);
+        buttonThirteen = findViewById(R.id.buttonThirteen);
+        buttonFourteen = findViewById(R.id.buttonFourteen);
+        buttonFifteen = findViewById(R.id.buttonFifteen);
+
+        buttonCancelOne = findViewById(R.id.buttonCancelOne);
+        buttonCancelTwo = findViewById(R.id.buttonCancelTwo);
+        buttonCancelThree = findViewById(R.id.buttonCancelThree);
+        buttonCancelFour = findViewById(R.id.buttonCancelFour);
+        buttonCancelFive = findViewById(R.id.buttonCancelFive);
+        buttonCancelSix = findViewById(R.id.buttonCancelSix);
+        buttonCancelSeven = findViewById(R.id.buttonCancelSeven);
+        buttonCancelEight = findViewById(R.id.buttonCancelEight);
+        buttonCancelNine = findViewById(R.id.buttonCancelNine);
+        buttonCancelTen = findViewById(R.id.buttonCancelTen);
+        buttonCancelEleven = findViewById(R.id.buttonCancelEleven);
+        buttonCancelTwelve = findViewById(R.id.buttonCancelTwelve);
+        buttonCancelThirteen = findViewById(R.id.buttonCancelThirteen);
+        buttonCancelFourteen = findViewById(R.id.buttonCancelFourteen);
+        buttonCancelFifteen = findViewById(R.id.buttonCancelFifteen);
+
+        textViewProgressOne = findViewById(R.id.textViewProgressOne);
+        textViewProgressTwo = findViewById(R.id.textViewProgressTwo);
+        textViewProgressThree = findViewById(R.id.textViewProgressThree);
+        textViewProgressFour = findViewById(R.id.textViewProgressFour);
+        textViewProgressFive = findViewById(R.id.textViewProgressFive);
+        textViewProgressSix = findViewById(R.id.textViewProgressSix);
+        textViewProgressSeven = findViewById(R.id.textViewProgressSeven);
+        textViewProgressEight = findViewById(R.id.textViewProgressEight);
+        textViewProgressNine = findViewById(R.id.textViewProgressNine);
+        textViewProgressTen = findViewById(R.id.textViewProgressTen);
+        textViewProgressEleven = findViewById(R.id.textViewProgressEleven);
+        textViewProgressTwelve = findViewById(R.id.textViewProgressTwelve);
+        textViewProgressThirteen = findViewById(R.id.textViewProgressThirteen);
+        textViewProgressFourteen = findViewById(R.id.textViewProgressFourteen);
+        textViewProgressFifteen = findViewById(R.id.textViewProgressFifteen);
+
+        progressBarOne = findViewById(R.id.progressBarOne);
+        progressBarTwo = findViewById(R.id.progressBarTwo);
+        progressBarThree = findViewById(R.id.progressBarThree);
+        progressBarFour = findViewById(R.id.progressBarFour);
+        progressBarFive = findViewById(R.id.progressBarFive);
+        progressBarSix = findViewById(R.id.progressBarSix);
+        progressBarSeven = findViewById(R.id.progressBarSeven);
+        progressBarEight = findViewById(R.id.progressBarEight);
+        progressBarNine = findViewById(R.id.progressBarNine);
+        progressBarTen = findViewById(R.id.progressBarTen);
+        progressBarEleven = findViewById(R.id.progressBarEleven);
+        progressBarTwelve = findViewById(R.id.progressBarTwelve);
+        progressBarThirteen = findViewById(R.id.progressBarThirteen);
+        progressBarFourteen = findViewById(R.id.progressBarFourteen);
+        progressBarFifteen = findViewById(R.id.progressBarFifteen);
+    }
+
+    public void onClickListenerOne() {
+        buttonOne.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdOne)) {
+                    PRDownloader.pause(downloadIdOne);
+                    return;
+                }
+
+                buttonOne.setEnabled(false);
+                progressBarOne.setIndeterminate(true);
+                progressBarOne.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdOne)) {
+                    PRDownloader.resume(downloadIdOne);
+                    return;
+                }
+
+                downloadIdOne = PRDownloader.download(URL1, dirPath, "facebook.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarOne.setIndeterminate(false);
+                                buttonOne.setEnabled(true);
+                                buttonOne.setText(R.string.pause);
+                                buttonCancelOne.setEnabled(true);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonOne.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                buttonOne.setText(R.string.start);
+                                buttonCancelOne.setEnabled(false);
+                                progressBarOne.setProgress(0);
+                                textViewProgressOne.setText("");
+                                downloadIdOne = 0;
+                                progressBarOne.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarOne.setProgress((int) progressPercent);
+                                textViewProgressOne.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                                progressBarOne.setIndeterminate(false);
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonOne.setEnabled(false);
+                                buttonCancelOne.setEnabled(false);
+                                buttonOne.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonOne.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "1", Toast.LENGTH_SHORT).show();
+                                textViewProgressOne.setText("");
+                                progressBarOne.setProgress(0);
+                                downloadIdOne = 0;
+                                buttonCancelOne.setEnabled(false);
+                                progressBarOne.setIndeterminate(false);
+                                buttonOne.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelOne.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdOne);
+            }
+        });
+    }
+
+    public void onClickListenerTwo() {
+        buttonTwo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdTwo)) {
+                    PRDownloader.pause(downloadIdTwo);
+                    return;
+                }
+
+                buttonTwo.setEnabled(false);
+                progressBarTwo.setIndeterminate(true);
+                progressBarTwo.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdTwo)) {
+                    PRDownloader.resume(downloadIdTwo);
+                    return;
+                }
+                downloadIdTwo = PRDownloader.download(URL2, dirPath, "wechat.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarTwo.setIndeterminate(false);
+                                buttonTwo.setEnabled(true);
+                                buttonTwo.setText(R.string.pause);
+                                buttonCancelTwo.setEnabled(true);
+                                buttonCancelTwo.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonTwo.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdTwo = 0;
+                                buttonTwo.setText(R.string.start);
+                                buttonCancelTwo.setEnabled(false);
+                                progressBarTwo.setProgress(0);
+                                textViewProgressTwo.setText("");
+                                progressBarTwo.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarTwo.setProgress((int) progressPercent);
+                                textViewProgressTwo.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonTwo.setEnabled(false);
+                                buttonCancelTwo.setEnabled(false);
+                                buttonTwo.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonTwo.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "2", Toast.LENGTH_SHORT).show();
+                                textViewProgressTwo.setText("");
+                                progressBarTwo.setProgress(0);
+                                downloadIdTwo = 0;
+                                buttonCancelTwo.setEnabled(false);
+                                progressBarTwo.setIndeterminate(false);
+                                buttonTwo.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelTwo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdTwo);
+            }
+        });
+    }
+
+    public void onClickListenerThree() {
+        buttonThree.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdThree)) {
+                    PRDownloader.pause(downloadIdThree);
+                    return;
+                }
+
+                buttonThree.setEnabled(false);
+                progressBarThree.setIndeterminate(true);
+                progressBarThree.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdThree)) {
+                    PRDownloader.resume(downloadIdThree);
+                    return;
+                }
+                downloadIdThree = PRDownloader.download(URL3, dirPath, "instagram.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarThree.setIndeterminate(false);
+                                buttonThree.setEnabled(true);
+                                buttonThree.setText(R.string.pause);
+                                buttonCancelThree.setEnabled(true);
+                                buttonCancelThree.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonThree.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdThree = 0;
+                                buttonThree.setText(R.string.start);
+                                buttonCancelThree.setEnabled(false);
+                                progressBarThree.setProgress(0);
+                                textViewProgressThree.setText("");
+                                progressBarThree.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarThree.setProgress((int) progressPercent);
+                                textViewProgressThree.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonThree.setEnabled(false);
+                                buttonCancelThree.setEnabled(false);
+                                buttonThree.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonThree.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "3", Toast.LENGTH_SHORT).show();
+                                textViewProgressThree.setText("");
+                                progressBarThree.setProgress(0);
+                                downloadIdThree = 0;
+                                buttonCancelThree.setEnabled(false);
+                                progressBarThree.setIndeterminate(false);
+                                buttonThree.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelThree.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdThree);
+            }
+        });
+    }
+
+    public void onClickListenerFour() {
+        buttonFour.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFour)) {
+                    PRDownloader.pause(downloadIdFour);
+                    return;
+                }
+
+                buttonFour.setEnabled(false);
+                progressBarFour.setIndeterminate(true);
+                progressBarFour.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFour)) {
+                    PRDownloader.resume(downloadIdFour);
+                    return;
+                }
+                downloadIdFour = PRDownloader.download(URL4, dirPath, "flashlight.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFour.setIndeterminate(false);
+                                buttonFour.setEnabled(true);
+                                buttonFour.setText(R.string.pause);
+                                buttonCancelFour.setEnabled(true);
+                                buttonCancelFour.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFour.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFour = 0;
+                                buttonFour.setText(R.string.start);
+                                buttonCancelFour.setEnabled(false);
+                                progressBarFour.setProgress(0);
+                                textViewProgressFour.setText("");
+                                progressBarFour.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFour.setProgress((int) progressPercent);
+                                textViewProgressFour.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFour.setEnabled(false);
+                                buttonCancelFour.setEnabled(false);
+                                buttonFour.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFour.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "4", Toast.LENGTH_SHORT).show();
+                                textViewProgressFour.setText("");
+                                progressBarFour.setProgress(0);
+                                downloadIdFour = 0;
+                                buttonCancelFour.setEnabled(false);
+                                progressBarFour.setIndeterminate(false);
+                                buttonFour.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFour.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFour);
+            }
+        });
+    }
+
+    public void onClickListenerFive() {
+        buttonFive.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFive)) {
+                    PRDownloader.pause(downloadIdFive);
+                    return;
+                }
+
+                buttonFive.setEnabled(false);
+                progressBarFive.setIndeterminate(true);
+                progressBarFive.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFive)) {
+                    PRDownloader.resume(downloadIdFive);
+                    return;
+                }
+                downloadIdFive = PRDownloader.download(URL5, dirPath, "screenrecorder.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFive.setIndeterminate(false);
+                                buttonFive.setEnabled(true);
+                                buttonFive.setText(R.string.pause);
+                                buttonCancelFive.setEnabled(true);
+                                buttonCancelFive.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFive.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFive = 0;
+                                buttonFive.setText(R.string.start);
+                                buttonCancelFive.setEnabled(false);
+                                progressBarFive.setProgress(0);
+                                textViewProgressFive.setText("");
+                                progressBarFive.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFive.setProgress((int) progressPercent);
+                                textViewProgressFive.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFive.setEnabled(false);
+                                buttonCancelFive.setEnabled(false);
+                                buttonFive.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFive.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "5", Toast.LENGTH_SHORT).show();
+                                textViewProgressFive.setText("");
+                                progressBarFive.setProgress(0);
+                                downloadIdFive = 0;
+                                buttonCancelFive.setEnabled(false);
+                                progressBarFive.setIndeterminate(false);
+                                buttonFive.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFive.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFive);
+            }
+        });
+
+    }
+
+    public void onClickListenerSix() {
+        buttonSix.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdSix)) {
+                    PRDownloader.pause(downloadIdSix);
+                    return;
+                }
+
+                buttonSix.setEnabled(false);
+                progressBarSix.setIndeterminate(true);
+                progressBarSix.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdSix)) {
+                    PRDownloader.resume(downloadIdSix);
+                    return;
+                }
+                downloadIdSix = PRDownloader.download(URL6, dirPath, "callrecorder.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarSix.setIndeterminate(false);
+                                buttonSix.setEnabled(true);
+                                buttonSix.setText(R.string.pause);
+                                buttonCancelSix.setEnabled(true);
+                                buttonCancelSix.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonSix.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdSix = 0;
+                                buttonSix.setText(R.string.start);
+                                buttonCancelSix.setEnabled(false);
+                                progressBarSix.setProgress(0);
+                                textViewProgressSix.setText("");
+                                progressBarSix.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarSix.setProgress((int) progressPercent);
+                                textViewProgressSix.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonSix.setEnabled(false);
+                                buttonCancelSix.setEnabled(false);
+                                buttonSix.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonSix.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "6", Toast.LENGTH_SHORT).show();
+                                textViewProgressSix.setText("");
+                                progressBarSix.setProgress(0);
+                                downloadIdSix = 0;
+                                buttonCancelSix.setEnabled(false);
+                                progressBarSix.setIndeterminate(false);
+                                buttonSix.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelSix.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdSix);
+            }
+        });
+
+    }
+
+    public void onClickListenerSeven() {
+        buttonSeven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdSeven)) {
+                    PRDownloader.pause(downloadIdSeven);
+                    return;
+                }
+
+                buttonSeven.setEnabled(false);
+                progressBarSeven.setIndeterminate(true);
+                progressBarSeven.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdSeven)) {
+                    PRDownloader.resume(downloadIdSeven);
+                    return;
+                }
+                downloadIdSeven = PRDownloader.download(URL7, dirPath, "soundprofile.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarSeven.setIndeterminate(false);
+                                buttonSeven.setEnabled(true);
+                                buttonSeven.setText(R.string.pause);
+                                buttonCancelSeven.setEnabled(true);
+                                buttonCancelSeven.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonSeven.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdSeven = 0;
+                                buttonSeven.setText(R.string.start);
+                                buttonCancelSeven.setEnabled(false);
+                                progressBarSeven.setProgress(0);
+                                textViewProgressSeven.setText("");
+                                progressBarSeven.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarSeven.setProgress((int) progressPercent);
+                                textViewProgressSeven.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonSeven.setEnabled(false);
+                                buttonCancelSeven.setEnabled(false);
+                                buttonSeven.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonSeven.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "7", Toast.LENGTH_SHORT).show();
+                                textViewProgressSeven.setText("");
+                                progressBarSeven.setProgress(0);
+                                downloadIdSeven = 0;
+                                buttonCancelSeven.setEnabled(false);
+                                progressBarSeven.setIndeterminate(false);
+                                buttonSeven.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelSeven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdSeven);
+            }
+        });
+
+    }
+
+    public void onClickListenerEight() {
+        buttonEight.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdEight)) {
+                    PRDownloader.pause(downloadIdEight);
+                    return;
+                }
+
+                buttonEight.setEnabled(false);
+                progressBarEight.setIndeterminate(true);
+                progressBarEight.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdEight)) {
+                    PRDownloader.resume(downloadIdEight);
+                    return;
+                }
+                downloadIdEight = PRDownloader.download(URL8, dirPath, "evernote.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarEight.setIndeterminate(false);
+                                buttonEight.setEnabled(true);
+                                buttonEight.setText(R.string.pause);
+                                buttonCancelEight.setEnabled(true);
+                                buttonCancelEight.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonEight.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdEight = 0;
+                                buttonEight.setText(R.string.start);
+                                buttonCancelEight.setEnabled(false);
+                                progressBarEight.setProgress(0);
+                                textViewProgressEight.setText("");
+                                progressBarEight.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarEight.setProgress((int) progressPercent);
+                                textViewProgressEight.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonEight.setEnabled(false);
+                                buttonCancelEight.setEnabled(false);
+                                buttonEight.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonEight.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "8", Toast.LENGTH_SHORT).show();
+                                textViewProgressEight.setText("");
+                                progressBarEight.setProgress(0);
+                                downloadIdEight = 0;
+                                buttonCancelEight.setEnabled(false);
+                                progressBarEight.setIndeterminate(false);
+                                buttonEight.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelEight.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdEight);
+            }
+        });
+    }
+
+    public void onClickListenerNine() {
+        buttonNine.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdNine)) {
+                    PRDownloader.pause(downloadIdNine);
+                    return;
+                }
+
+                buttonNine.setEnabled(false);
+                progressBarNine.setIndeterminate(true);
+                progressBarNine.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdNine)) {
+                    PRDownloader.resume(downloadIdNine);
+                    return;
+                }
+                downloadIdNine = PRDownloader.download(URL9, dirPath, "ucbrowser.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarNine.setIndeterminate(false);
+                                buttonNine.setEnabled(true);
+                                buttonNine.setText(R.string.pause);
+                                buttonCancelNine.setEnabled(true);
+                                buttonCancelNine.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonNine.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdNine = 0;
+                                buttonNine.setText(R.string.start);
+                                buttonCancelNine.setEnabled(false);
+                                progressBarNine.setProgress(0);
+                                textViewProgressNine.setText("");
+                                progressBarNine.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarNine.setProgress((int) progressPercent);
+                                textViewProgressNine.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonNine.setEnabled(false);
+                                buttonCancelNine.setEnabled(false);
+                                buttonNine.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonNine.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "9", Toast.LENGTH_SHORT).show();
+                                textViewProgressNine.setText("");
+                                progressBarNine.setProgress(0);
+                                downloadIdNine = 0;
+                                buttonCancelNine.setEnabled(false);
+                                progressBarNine.setIndeterminate(false);
+                                buttonNine.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelNine.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdNine);
+            }
+        });
+    }
+
+    public void onClickListenerTen() {
+        buttonTen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdTen)) {
+                    PRDownloader.pause(downloadIdTen);
+                    return;
+                }
+
+                buttonTen.setEnabled(false);
+                progressBarTen.setIndeterminate(true);
+                progressBarTen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdTen)) {
+                    PRDownloader.resume(downloadIdTen);
+                    return;
+                }
+                downloadIdTen = PRDownloader.download(URL10, dirPath, "barcodescanner.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarTen.setIndeterminate(false);
+                                buttonTen.setEnabled(true);
+                                buttonTen.setText(R.string.pause);
+                                buttonCancelTen.setEnabled(true);
+                                buttonCancelTen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonTen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdTen = 0;
+                                buttonTen.setText(R.string.start);
+                                buttonCancelTen.setEnabled(false);
+                                progressBarTen.setProgress(0);
+                                textViewProgressTen.setText("");
+                                progressBarTen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarTen.setProgress((int) progressPercent);
+                                textViewProgressTen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonTen.setEnabled(false);
+                                buttonCancelTen.setEnabled(false);
+                                buttonTen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonTen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "10", Toast.LENGTH_SHORT).show();
+                                textViewProgressTen.setText("");
+                                progressBarTen.setProgress(0);
+                                downloadIdTen = 0;
+                                buttonCancelTen.setEnabled(false);
+                                progressBarTen.setIndeterminate(false);
+                                buttonTen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelTen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdTen);
+            }
+        });
+    }
+
+    public void onClickListenerEleven() {
+        buttonEleven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdEleven)) {
+                    PRDownloader.pause(downloadIdEleven);
+                    return;
+                }
+
+                buttonEleven.setEnabled(false);
+                progressBarEleven.setIndeterminate(true);
+                progressBarEleven.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdEleven)) {
+                    PRDownloader.resume(downloadIdEleven);
+                    return;
+                }
+                downloadIdEleven = PRDownloader.download(URL11, dirPath, "BigBuckBunny.m4v")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarEleven.setIndeterminate(false);
+                                buttonEleven.setEnabled(true);
+                                buttonEleven.setText(R.string.pause);
+                                buttonCancelEleven.setEnabled(true);
+                                buttonCancelEleven.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonEleven.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdEleven = 0;
+                                buttonEleven.setText(R.string.start);
+                                buttonCancelEleven.setEnabled(false);
+                                progressBarEleven.setProgress(0);
+                                textViewProgressEleven.setText("");
+                                progressBarEleven.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarEleven.setProgress((int) progressPercent);
+                                textViewProgressEleven.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonEleven.setEnabled(false);
+                                buttonCancelEleven.setEnabled(false);
+                                buttonEleven.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonEleven.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "11", Toast.LENGTH_SHORT).show();
+                                textViewProgressEleven.setText("");
+                                progressBarEleven.setProgress(0);
+                                downloadIdEleven = 0;
+                                buttonCancelEleven.setEnabled(false);
+                                progressBarEleven.setIndeterminate(false);
+                                buttonEleven.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelEleven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdEleven);
+            }
+        });
+    }
+
+    public void onClickListenerTwelve() {
+        buttonTwelve.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdTwelve)) {
+                    PRDownloader.pause(downloadIdTwelve);
+                    return;
+                }
+
+                buttonTwelve.setEnabled(false);
+                progressBarTwelve.setIndeterminate(true);
+                progressBarTwelve.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdTwelve)) {
+                    PRDownloader.resume(downloadIdTwelve);
+                    return;
+                }
+                downloadIdTwelve = PRDownloader.download(URL12, dirPath, "harry-porter.pdf")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarTwelve.setIndeterminate(false);
+                                buttonTwelve.setEnabled(true);
+                                buttonTwelve.setText(R.string.pause);
+                                buttonCancelTwelve.setEnabled(true);
+                                buttonCancelTwelve.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonTwelve.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdTwelve = 0;
+                                buttonTwelve.setText(R.string.start);
+                                buttonCancelTwelve.setEnabled(false);
+                                progressBarTwelve.setProgress(0);
+                                textViewProgressTwelve.setText("");
+                                progressBarTwelve.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarTwelve.setProgress((int) progressPercent);
+                                textViewProgressTwelve.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonTwelve.setEnabled(false);
+                                buttonCancelTwelve.setEnabled(false);
+                                buttonTwelve.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonTwelve.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "12", Toast.LENGTH_SHORT).show();
+                                textViewProgressTwelve.setText("");
+                                progressBarTwelve.setProgress(0);
+                                downloadIdTwelve = 0;
+                                buttonCancelTwelve.setEnabled(false);
+                                progressBarTwelve.setIndeterminate(false);
+                                buttonTwelve.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelTwelve.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdTwelve);
+            }
+        });
+    }
+
+    public void onClickListenerThirteen() {
+        buttonThirteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdThirteen)) {
+                    PRDownloader.pause(downloadIdThirteen);
+                    return;
+                }
+
+                buttonThirteen.setEnabled(false);
+                progressBarThirteen.setIndeterminate(true);
+                progressBarThirteen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdThirteen)) {
+                    PRDownloader.resume(downloadIdThirteen);
+                    return;
+                }
+                downloadIdThirteen = PRDownloader.download(URL13, dirPath, "giphy.gif")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarThirteen.setIndeterminate(false);
+                                buttonThirteen.setEnabled(true);
+                                buttonThirteen.setText(R.string.pause);
+                                buttonCancelThirteen.setEnabled(true);
+                                buttonCancelThirteen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonThirteen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdThirteen = 0;
+                                buttonThirteen.setText(R.string.start);
+                                buttonCancelThirteen.setEnabled(false);
+                                progressBarThirteen.setProgress(0);
+                                textViewProgressThirteen.setText("");
+                                progressBarThirteen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarThirteen.setProgress((int) progressPercent);
+                                textViewProgressThirteen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonThirteen.setEnabled(false);
+                                buttonCancelThirteen.setEnabled(false);
+                                buttonThirteen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonThirteen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "13", Toast.LENGTH_SHORT).show();
+                                textViewProgressThirteen.setText("");
+                                progressBarThirteen.setProgress(0);
+                                downloadIdThirteen = 0;
+                                buttonCancelThirteen.setEnabled(false);
+                                progressBarThirteen.setIndeterminate(false);
+                                buttonThirteen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelThirteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdThirteen);
+            }
+        });
+
+    }
+
+    public void onClickListenerFourteen() {
+        buttonFourteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFourteen)) {
+                    PRDownloader.pause(downloadIdFourteen);
+                    return;
+                }
+
+                buttonFourteen.setEnabled(false);
+                progressBarFourteen.setIndeterminate(true);
+                progressBarFourteen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFourteen)) {
+                    PRDownloader.resume(downloadIdFourteen);
+                    return;
+                }
+                downloadIdFourteen = PRDownloader.download(URL14, dirPath, "small.mp4")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFourteen.setIndeterminate(false);
+                                buttonFourteen.setEnabled(true);
+                                buttonFourteen.setText(R.string.pause);
+                                buttonCancelFourteen.setEnabled(true);
+                                buttonCancelFourteen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFourteen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFourteen = 0;
+                                buttonFourteen.setText(R.string.start);
+                                buttonCancelFourteen.setEnabled(false);
+                                progressBarFourteen.setProgress(0);
+                                textViewProgressFourteen.setText("");
+                                progressBarFourteen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFourteen.setProgress((int) progressPercent);
+                                textViewProgressFourteen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFourteen.setEnabled(false);
+                                buttonCancelFourteen.setEnabled(false);
+                                buttonFourteen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFourteen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "14", Toast.LENGTH_SHORT).show();
+                                textViewProgressFourteen.setText("");
+                                progressBarFourteen.setProgress(0);
+                                downloadIdFourteen = 0;
+                                buttonCancelFourteen.setEnabled(false);
+                                progressBarFourteen.setIndeterminate(false);
+                                buttonFourteen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFourteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFourteen);
+            }
+        });
+
+    }
+
+    public void onClickListenerFifteen() {
+        buttonFifteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFifteen)) {
+                    PRDownloader.pause(downloadIdFifteen);
+                    return;
+                }
+
+                buttonFifteen.setEnabled(false);
+                progressBarFifteen.setIndeterminate(true);
+                progressBarFifteen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFifteen)) {
+                    PRDownloader.resume(downloadIdFifteen);
+                    return;
+                }
+                downloadIdFifteen = PRDownloader.download(URL15, dirPath, "big_buck_bunny_720p_10mb.mp4")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFifteen.setIndeterminate(false);
+                                buttonFifteen.setEnabled(true);
+                                buttonFifteen.setText(R.string.pause);
+                                buttonCancelFifteen.setEnabled(true);
+                                buttonCancelFifteen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFifteen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFifteen = 0;
+                                buttonFifteen.setText(R.string.start);
+                                buttonCancelFifteen.setEnabled(false);
+                                progressBarFifteen.setProgress(0);
+                                textViewProgressFifteen.setText("");
+                                progressBarFifteen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFifteen.setProgress((int) progressPercent);
+                                textViewProgressFifteen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFifteen.setEnabled(false);
+                                buttonCancelFifteen.setEnabled(false);
+                                buttonFifteen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFifteen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "15", Toast.LENGTH_SHORT).show();
+                                textViewProgressFifteen.setText("");
+                                progressBarFifteen.setProgress(0);
+                                downloadIdFifteen = 0;
+                                buttonCancelFifteen.setEnabled(false);
+                                progressBarFifteen.setIndeterminate(false);
+                                buttonFifteen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFifteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFifteen);
+            }
+        });
+    }
+
+}
+
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/java/com/sample/SampleApp.java b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/java/com/sample/SampleApp.java
new file mode 100755
index 0000000..986e34a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/java/com/sample/SampleApp.java
@@ -0,0 +1,23 @@
+package com.sample;
+
+import android.app.Application;
+
+import com.downloader.PRDownloader;
+import com.downloader.PRDownloaderConfig;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class SampleApp extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        PRDownloaderConfig config = PRDownloaderConfig.newBuilder()
+                .setDatabaseEnabled(true)
+                .build();
+        PRDownloader.initialize(this, config);
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/java/com/sample/utils/Utils.java b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/java/com/sample/utils/Utils.java
new file mode 100755
index 0000000..0df9e2d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/java/com/sample/utils/Utils.java
@@ -0,0 +1,38 @@
+package com.sample.utils;
+
+import android.content.Context;
+import android.os.Environment;
+import android.support.v4.content.ContextCompat;
+
+import java.io.File;
+import java.util.Locale;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public final class Utils {
+
+    private Utils() {
+        // no instance
+    }
+
+    public static String getRootDirPath(Context context) {
+        if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+            File file = ContextCompat.getExternalFilesDirs(context.getApplicationContext(),
+                    null)[0];
+            return file.getAbsolutePath();
+        } else {
+            return context.getApplicationContext().getFilesDir().getAbsolutePath();
+        }
+    }
+
+    public static String getProgressDisplayLine(long currentBytes, long totalBytes) {
+        return getBytesToMBString(currentBytes) + "/" + getBytesToMBString(totalBytes);
+    }
+
+    private static String getBytesToMBString(long bytes) {
+        return String.format(Locale.ENGLISH, "%.2fMb", bytes / (1024.00 * 1024.00));
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100755
index 0000000..c7bd21d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/drawable/border_black.xml b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/drawable/border_black.xml
new file mode 100755
index 0000000..45c1dec
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/drawable/border_black.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp" />
+    <stroke android:width="1dp"
+        android:color="@android:color/background_dark"/>
+    <solid android:color="@android:color/transparent" />
+</shape>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/drawable/ic_launcher_background.xml b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100755
index 0000000..5c6729c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/layout/activity_main.xml b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..ee8d470
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,765 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.sample.MainActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarOne"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarOne"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressOne"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelOne"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonOne"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarTwo"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarTwo"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressTwo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelTwo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonTwo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarThree"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarThree"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressThree"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelThree"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonThree"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFour"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFour"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFour"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFour"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFour"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFive"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFive"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFive"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFive"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFive"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarSix"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarSix"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressSix"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelSix"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonSix"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarSeven"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarSeven"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressSeven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelSeven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonSeven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarEight"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarEight"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressEight"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelEight"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonEight"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarNine"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarNine"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressNine"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelNine"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonNine"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarTen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarTen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressTen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelTen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonTen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarEleven"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarEleven"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressEleven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelEleven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonEleven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarTwelve"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarTwelve"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressTwelve"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelTwelve"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonTwelve"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarThirteen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarThirteen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressThirteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelThirteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonThirteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFourteen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFourteen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFourteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFourteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFourteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFifteen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFifteen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFifteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFifteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFifteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100755
index 0000000..eca70cf
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100755
index 0000000..eca70cf
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..a2f5908
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100755
index 0000000..1b52399
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..ff10afd
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100755
index 0000000..115a4c7
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..dcd3cd8
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100755
index 0000000..459ca60
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..8ca12fe
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100755
index 0000000..8e19b41
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..b824ebd
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100755
index 0000000..4c19a13
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/values/colors.xml b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..3ab3e9c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/values/strings.xml b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..3e23c7c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/values/strings.xml
@@ -0,0 +1,10 @@
+<resources>
+    <string name="app_name">PRDownloader</string>
+    <string name="some_error_occurred">Some error occurred</string>
+    <string name="start">start</string>
+    <string name="completed">completed</string>
+    <string name="pause">pause</string>
+    <string name="cancel">cancel</string>
+    <string name="resume">resume</string>
+    <string name="restart">restart</string>
+</resources>
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/values/styles.xml b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..5885930
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/OnTime_Merchant_live/lib/PRDownloader/app/src/test/java/com/sample/ExampleUnitTest.java b/OnTime_Merchant_live/lib/PRDownloader/app/src/test/java/com/sample/ExampleUnitTest.java
new file mode 100755
index 0000000..424a1ed
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/app/src/test/java/com/sample/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.sample;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/assets/prdownloader.png b/OnTime_Merchant_live/lib/PRDownloader/assets/prdownloader.png
new file mode 100755
index 0000000..758a0e3
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/assets/prdownloader.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/assets/sample_download.png b/OnTime_Merchant_live/lib/PRDownloader/assets/sample_download.png
new file mode 100755
index 0000000..23e23e2
Binary files /dev/null and b/OnTime_Merchant_live/lib/PRDownloader/assets/sample_download.png differ
diff --git a/OnTime_Merchant_live/lib/PRDownloader/build.gradle b/OnTime_Merchant_live/lib/PRDownloader/build.gradle
new file mode 100755
index 0000000..0ad3aaf
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/build.gradle
@@ -0,0 +1,28 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+    repositories {
+        google()
+        jcenter()
+        maven { url 'https://jitpack.io' }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.7.3'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        maven { url 'https://jitpack.io' }
+    }
+}
+
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/gradle.properties b/OnTime_Merchant_live/lib/PRDownloader/gradle.properties
new file mode 100755
index 0000000..e78e65c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+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
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+android.useAndroidX=true
diff --git a/OnTime_Merchant_live/lib/PRDownloader/gradle/wrapper/gradle-wrapper.properties b/OnTime_Merchant_live/lib/PRDownloader/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..09523c0
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_Merchant_live/lib/PRDownloader/gradlew b/OnTime_Merchant_live/lib/PRDownloader/gradlew
new file mode 100755
index 0000000..f5feea6
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/gradlew
@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/OnTime_Merchant_live/lib/PRDownloader/gradlew.bat b/OnTime_Merchant_live/lib/PRDownloader/gradlew.bat
new file mode 100755
index 0000000..9b42019
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_Merchant_live/lib/PRDownloader/jitpack.yml b/OnTime_Merchant_live/lib/PRDownloader/jitpack.yml
new file mode 100755
index 0000000..1e41e00
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/.gitignore b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/build.gradle b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/build.gradle
new file mode 100755
index 0000000..fb30ca8
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/build.gradle
@@ -0,0 +1,28 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'com.downloader'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName "1.0.1"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/proguard-rules.pro b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/proguard-rules.pro
new file mode 100755
index 0000000..f1b4245
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/androidTest/java/com/downloader/ExampleInstrumentedTest.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/androidTest/java/com/downloader/ExampleInstrumentedTest.java
new file mode 100755
index 0000000..8afb62c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/androidTest/java/com/downloader/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.downloader;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.downloader.test", appContext.getPackageName());
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Constants.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Constants.java
new file mode 100755
index 0000000..df5a59b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Constants.java
@@ -0,0 +1,26 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public final class Constants {
+
+    private Constants() {
+        // no instance
+    }
+
+    public static final int UPDATE = 0x01;
+    public static final String RANGE = "Range";
+    public static final String ETAG = "ETag";
+    public static final String USER_AGENT = "User-Agent";
+    public static final String DEFAULT_USER_AGENT = "PRDownloader";
+
+    public static final int DEFAULT_READ_TIMEOUT_IN_MILLS = 20_000;
+    public static final int DEFAULT_CONNECT_TIMEOUT_IN_MILLS = 20_000;
+
+    public static final int HTTP_RANGE_NOT_SATISFIABLE = 416;
+    public static final int HTTP_TEMPORARY_REDIRECT = 307;
+    public static final int HTTP_PERMANENT_REDIRECT = 308;
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Error.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Error.java
new file mode 100755
index 0000000..15e20a6
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Error.java
@@ -0,0 +1,66 @@
+package com.downloader;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Error {
+
+    private boolean isServerError;
+    private boolean isConnectionError;
+    private String serverErrorMessage;
+    private Map<String, List<String>> headerFields;
+    private Throwable connectionException;
+    private int responseCode;
+
+    public boolean isServerError() {
+        return isServerError;
+    }
+
+    public void setServerError(boolean serverError) {
+        isServerError = serverError;
+    }
+
+    public boolean isConnectionError() {
+        return isConnectionError;
+    }
+
+    public void setConnectionError(boolean connectionError) {
+        isConnectionError = connectionError;
+    }
+
+    public void setServerErrorMessage(String serverErrorMessage) {
+        this.serverErrorMessage = serverErrorMessage;
+    }
+
+    public String getServerErrorMessage() {
+        return serverErrorMessage;
+    }
+
+    public void setHeaderFields(Map<String, List<String>> headerFields) {
+        this.headerFields = headerFields;
+    }
+
+    public Map<String, List<String>> getHeaderFields() {
+        return headerFields;
+    }
+
+    public void setConnectionException(Throwable connectionException) {
+        this.connectionException = connectionException;
+    }
+
+    public Throwable getConnectionException() {
+        return connectionException;
+    }
+
+    public void setResponseCode(int responseCode) {
+        this.responseCode = responseCode;
+    }
+
+    public int getResponseCode() {
+        return responseCode;
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnCancelListener.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnCancelListener.java
new file mode 100755
index 0000000..e9dd8c4
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnCancelListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 15/11/17.
+ */
+
+public interface OnCancelListener {
+
+    void onCancel();
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnDownloadListener.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnDownloadListener.java
new file mode 100755
index 0000000..c9e61de
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnDownloadListener.java
@@ -0,0 +1,13 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface OnDownloadListener {
+
+    void onDownloadComplete();
+
+    void onError(Error error);
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnPauseListener.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnPauseListener.java
new file mode 100755
index 0000000..72654fa
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnPauseListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface OnPauseListener {
+
+    void onPause();
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnProgressListener.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnProgressListener.java
new file mode 100755
index 0000000..751ceaf
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnProgressListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface OnProgressListener {
+
+    void onProgress(Progress progress);
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnStartOrResumeListener.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnStartOrResumeListener.java
new file mode 100755
index 0000000..6e07a84
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnStartOrResumeListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 15/11/17.
+ */
+
+public interface OnStartOrResumeListener {
+
+    void onStartOrResume();
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloader.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloader.java
new file mode 100755
index 0000000..8c972ad
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloader.java
@@ -0,0 +1,129 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 12/11/17.
+ */
+
+import android.content.Context;
+
+import com.downloader.core.Core;
+import com.downloader.internal.ComponentHolder;
+import com.downloader.internal.DownloadRequestQueue;
+import com.downloader.request.DownloadRequestBuilder;
+import com.downloader.utils.Utils;
+
+/**
+ * PRDownloader entry point.
+ * You must initialize this class before use. The simplest way is to just do
+ * {#code PRDownloader.initialize(context)}.
+ */
+public class PRDownloader {
+
+    /**
+     * private constructor to prevent instantiation of this class
+     */
+    private PRDownloader() {
+    }
+
+    /**
+     * Initializes PRDownloader with the default config.
+     *
+     * @param context The context
+     */
+    public static void initialize(Context context) {
+        initialize(context, PRDownloaderConfig.newBuilder().build());
+    }
+
+    /**
+     * Initializes PRDownloader with the custom config.
+     *
+     * @param context The context
+     * @param config  The PRDownloaderConfig
+     */
+    public static void initialize(Context context, PRDownloaderConfig config) {
+        ComponentHolder.getInstance().init(context, config);
+        DownloadRequestQueue.initialize();
+    }
+
+    /**
+     * Method to make download request
+     *
+     * @param url      The url on which request is to be made
+     * @param dirPath  The directory path on which file is to be saved
+     * @param fileName The file name with which file is to be saved
+     * @return the DownloadRequestBuilder
+     */
+    public static DownloadRequestBuilder download(String url, String dirPath, String fileName) {
+        return new DownloadRequestBuilder(url, dirPath, fileName);
+    }
+
+    /**
+     * Method to pause request with the given downloadId
+     *
+     * @param downloadId The downloadId with which request is to be paused
+     */
+    public static void pause(int downloadId) {
+        DownloadRequestQueue.getInstance().pause(downloadId);
+    }
+
+    /**
+     * Method to resume request with the given downloadId
+     *
+     * @param downloadId The downloadId with which request is to be resumed
+     */
+    public static void resume(int downloadId) {
+        DownloadRequestQueue.getInstance().resume(downloadId);
+    }
+
+    /**
+     * Method to cancel request with the given downloadId
+     *
+     * @param downloadId The downloadId with which request is to be cancelled
+     */
+    public static void cancel(int downloadId) {
+        DownloadRequestQueue.getInstance().cancel(downloadId);
+    }
+
+    /**
+     * Method to cancel requests with the given tag
+     *
+     * @param tag The tag with which requests are to be cancelled
+     */
+    public static void cancel(Object tag) {
+        DownloadRequestQueue.getInstance().cancel(tag);
+    }
+
+    /**
+     * Method to cancel all requests
+     */
+    public static void cancelAll() {
+        DownloadRequestQueue.getInstance().cancelAll();
+    }
+
+    /**
+     * Method to check the request with the given downloadId is running or not
+     *
+     * @param downloadId The downloadId with which request status is to be checked
+     * @return the running status
+     */
+    public static Status getStatus(int downloadId) {
+        return DownloadRequestQueue.getInstance().getStatus(downloadId);
+    }
+
+    /**
+     * Method to clean up temporary resumed files which is older than the given day
+     *
+     * @param days the days
+     */
+    public static void cleanUp(int days) {
+        Utils.deleteUnwantedModelsAndTempFiles(days);
+    }
+
+    /**
+     * Shuts PRDownloader down
+     */
+    public static void shutDown() {
+        Core.shutDown();
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloaderConfig.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloaderConfig.java
new file mode 100755
index 0000000..4a49c83
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloaderConfig.java
@@ -0,0 +1,107 @@
+package com.downloader;
+
+import com.downloader.httpclient.DefaultHttpClient;
+import com.downloader.httpclient.HttpClient;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class PRDownloaderConfig {
+
+    private int readTimeout;
+    private int connectTimeout;
+    private String userAgent;
+    private HttpClient httpClient;
+    private boolean databaseEnabled;
+
+    private PRDownloaderConfig(Builder builder) {
+        this.readTimeout = builder.readTimeout;
+        this.connectTimeout = builder.connectTimeout;
+        this.userAgent = builder.userAgent;
+        this.httpClient = builder.httpClient;
+        this.databaseEnabled = builder.databaseEnabled;
+    }
+
+    public int getReadTimeout() {
+        return readTimeout;
+    }
+
+    public void setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+    }
+
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    public void setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+    }
+
+    public String getUserAgent() {
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public HttpClient getHttpClient() {
+        return httpClient;
+    }
+
+    public void setHttpClient(HttpClient httpClient) {
+        this.httpClient = httpClient;
+    }
+
+    public boolean isDatabaseEnabled() {
+        return databaseEnabled;
+    }
+
+    public void setDatabaseEnabled(boolean databaseEnabled) {
+        this.databaseEnabled = databaseEnabled;
+    }
+
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+
+        int readTimeout = Constants.DEFAULT_READ_TIMEOUT_IN_MILLS;
+        int connectTimeout = Constants.DEFAULT_CONNECT_TIMEOUT_IN_MILLS;
+        String userAgent = Constants.DEFAULT_USER_AGENT;
+        HttpClient httpClient = new DefaultHttpClient();
+        boolean databaseEnabled = false;
+
+        public Builder setReadTimeout(int readTimeout) {
+            this.readTimeout = readTimeout;
+            return this;
+        }
+
+        public Builder setConnectTimeout(int connectTimeout) {
+            this.connectTimeout = connectTimeout;
+            return this;
+        }
+
+        public Builder setUserAgent(String userAgent) {
+            this.userAgent = userAgent;
+            return this;
+        }
+
+        public Builder setHttpClient(HttpClient httpClient) {
+            this.httpClient = httpClient;
+            return this;
+        }
+
+        public Builder setDatabaseEnabled(boolean databaseEnabled) {
+            this.databaseEnabled = databaseEnabled;
+            return this;
+        }
+
+        public PRDownloaderConfig build() {
+            return new PRDownloaderConfig(this);
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Priority.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Priority.java
new file mode 100755
index 0000000..f9f46e2
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Priority.java
@@ -0,0 +1,32 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+/**
+ * Priority levels recognized by the request server.
+ */
+public enum Priority {
+
+    /**
+     * Lowest priority level. Used for prefetches of data.
+     */
+    LOW,
+
+    /**
+     * Medium priority level. Used for warming of data that might soon get visible.
+     */
+    MEDIUM,
+
+    /**
+     * Highest priority level. Used for data that are currently visible on screen.
+     */
+    HIGH,
+
+    /**
+     * Highest priority level. Used for data that are required instantly(mainly for emergency).
+     */
+    IMMEDIATE
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Progress.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Progress.java
new file mode 100755
index 0000000..b06db5a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Progress.java
@@ -0,0 +1,26 @@
+package com.downloader;
+
+import java.io.Serializable;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Progress implements Serializable {
+
+    public long currentBytes;
+    public long totalBytes;
+
+    public Progress(long currentBytes, long totalBytes) {
+        this.currentBytes = currentBytes;
+        this.totalBytes = totalBytes;
+    }
+
+    @Override
+    public String toString() {
+        return "Progress{" +
+                "currentBytes=" + currentBytes +
+                ", totalBytes=" + totalBytes +
+                '}';
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Response.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Response.java
new file mode 100755
index 0000000..fd0f076
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Response.java
@@ -0,0 +1,46 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Response {
+
+    private Error error;
+    private boolean isSuccessful;
+    private boolean isPaused;
+    private boolean isCancelled;
+
+    public Error getError() {
+        return error;
+    }
+
+    public void setError(Error error) {
+        this.error = error;
+    }
+
+    public boolean isSuccessful() {
+        return isSuccessful;
+    }
+
+    public void setSuccessful(boolean successful) {
+        isSuccessful = successful;
+    }
+
+    public boolean isPaused() {
+        return isPaused;
+    }
+
+    public void setPaused(boolean paused) {
+        isPaused = paused;
+    }
+
+    public boolean isCancelled() {
+        return isCancelled;
+    }
+
+    public void setCancelled(boolean cancelled) {
+        isCancelled = cancelled;
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Status.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Status.java
new file mode 100755
index 0000000..cc6575c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Status.java
@@ -0,0 +1,23 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 15/11/17.
+ */
+
+public enum Status {
+
+    QUEUED,
+
+    RUNNING,
+
+    PAUSED,
+
+    COMPLETED,
+
+    CANCELLED,
+
+    FAILED,
+
+    UNKNOWN
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/Core.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/Core.java
new file mode 100755
index 0000000..1d6e049
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/Core.java
@@ -0,0 +1,36 @@
+package com.downloader.core;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Core {
+
+    private static Core instance = null;
+    private final ExecutorSupplier executorSupplier;
+
+    private Core() {
+        this.executorSupplier = new DefaultExecutorSupplier();
+    }
+
+    public static Core getInstance() {
+        if (instance == null) {
+            synchronized (Core.class) {
+                if (instance == null) {
+                    instance = new Core();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public ExecutorSupplier getExecutorSupplier() {
+        return executorSupplier;
+    }
+
+    public static void shutDown() {
+        if (instance != null) {
+            instance = null;
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DefaultExecutorSupplier.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DefaultExecutorSupplier.java
new file mode 100755
index 0000000..4a8a26e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DefaultExecutorSupplier.java
@@ -0,0 +1,41 @@
+package com.downloader.core;
+
+import android.os.Process;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DefaultExecutorSupplier implements ExecutorSupplier {
+
+    private static final int DEFAULT_MAX_NUM_THREADS = 2 * Runtime.getRuntime().availableProcessors() + 1;
+    private final DownloadExecutor networkExecutor;
+    private final Executor backgroundExecutor;
+    private final Executor mainThreadExecutor;
+
+    DefaultExecutorSupplier() {
+        ThreadFactory backgroundPriorityThreadFactory = new PriorityThreadFactory(Process.THREAD_PRIORITY_BACKGROUND);
+        networkExecutor = new DownloadExecutor(DEFAULT_MAX_NUM_THREADS, backgroundPriorityThreadFactory);
+        backgroundExecutor = Executors.newSingleThreadExecutor();
+        mainThreadExecutor = new MainThreadExecutor();
+    }
+
+    @Override
+    public DownloadExecutor forDownloadTasks() {
+        return networkExecutor;
+    }
+
+    @Override
+    public Executor forBackgroundTasks() {
+        return backgroundExecutor;
+    }
+
+    @Override
+    public Executor forMainThreadTasks() {
+        return mainThreadExecutor;
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadExecutor.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadExecutor.java
new file mode 100755
index 0000000..fa659b8
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadExecutor.java
@@ -0,0 +1,27 @@
+package com.downloader.core;
+
+import com.downloader.internal.DownloadRunnable;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadExecutor extends ThreadPoolExecutor {
+
+    DownloadExecutor(int maxNumThreads, ThreadFactory threadFactory) {
+        super(maxNumThreads, maxNumThreads, 0, TimeUnit.MILLISECONDS, new PriorityBlockingQueue<Runnable>(), threadFactory);
+    }
+
+    @Override
+    public Future<?> submit(Runnable task) {
+        DownloadFutureTask futureTask = new DownloadFutureTask((DownloadRunnable) task);
+        execute(futureTask);
+        return futureTask;
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadFutureTask.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadFutureTask.java
new file mode 100755
index 0000000..d2f4b06
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadFutureTask.java
@@ -0,0 +1,27 @@
+package com.downloader.core;
+
+import com.downloader.Priority;
+import com.downloader.internal.DownloadRunnable;
+
+import java.util.concurrent.FutureTask;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadFutureTask extends FutureTask<DownloadRunnable> implements Comparable<DownloadFutureTask> {
+
+    private final DownloadRunnable runnable;
+
+    DownloadFutureTask(DownloadRunnable downloadRunnable) {
+        super(downloadRunnable, null);
+        this.runnable = downloadRunnable;
+    }
+
+    @Override
+    public int compareTo(DownloadFutureTask other) {
+        Priority p1 = runnable.priority;
+        Priority p2 = other.runnable.priority;
+        return (p1 == p2 ? runnable.sequence - other.runnable.sequence : p2.ordinal() - p1.ordinal());
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/ExecutorSupplier.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/ExecutorSupplier.java
new file mode 100755
index 0000000..34f75ac
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/ExecutorSupplier.java
@@ -0,0 +1,17 @@
+package com.downloader.core;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface ExecutorSupplier {
+
+    DownloadExecutor forDownloadTasks();
+
+    Executor forBackgroundTasks();
+
+    Executor forMainThreadTasks();
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/MainThreadExecutor.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/MainThreadExecutor.java
new file mode 100755
index 0000000..af6df63
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/MainThreadExecutor.java
@@ -0,0 +1,20 @@
+package com.downloader.core;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class MainThreadExecutor implements Executor {
+
+    private final Handler handler = new Handler(Looper.getMainLooper());
+
+    @Override
+    public void execute(Runnable runnable) {
+        handler.post(runnable);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/PriorityThreadFactory.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/PriorityThreadFactory.java
new file mode 100755
index 0000000..a305ebc
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/PriorityThreadFactory.java
@@ -0,0 +1,34 @@
+package com.downloader.core;
+
+import android.os.Process;
+
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class PriorityThreadFactory implements ThreadFactory {
+
+    private final int mThreadPriority;
+
+    PriorityThreadFactory(int threadPriority) {
+        mThreadPriority = threadPriority;
+    }
+
+    @Override
+    public Thread newThread(final Runnable runnable) {
+        Runnable wrapperRunnable = new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Process.setThreadPriority(mThreadPriority);
+                } catch (Throwable ignored) {
+
+                }
+                runnable.run();
+            }
+        };
+        return new Thread(wrapperRunnable);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/AppDbHelper.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/AppDbHelper.java
new file mode 100755
index 0000000..9955e70
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/AppDbHelper.java
@@ -0,0 +1,154 @@
+package com.downloader.database;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class AppDbHelper implements DbHelper {
+
+    public static final String TABLE_NAME = "prdownloader";
+    private final SQLiteDatabase db;
+
+    public AppDbHelper(Context context) {
+        DatabaseOpenHelper databaseOpenHelper = new DatabaseOpenHelper(context);
+        db = databaseOpenHelper.getWritableDatabase();
+    }
+
+    @Override
+    public DownloadModel find(int id) {
+        Cursor cursor = null;
+        DownloadModel model = null;
+        try {
+            cursor = db.rawQuery("SELECT * FROM " + TABLE_NAME + " WHERE " +
+                    DownloadModel.ID + " = " + id, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                model = new DownloadModel();
+                model.setId(id);
+                model.setUrl(cursor.getString(cursor.getColumnIndex(DownloadModel.URL)));
+                model.setETag(cursor.getString(cursor.getColumnIndex(DownloadModel.ETAG)));
+                model.setDirPath(cursor.getString(cursor.getColumnIndex(DownloadModel.DIR_PATH)));
+                model.setFileName(cursor.getString(cursor.getColumnIndex(DownloadModel.FILE_NAME)));
+                model.setTotalBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.TOTAL_BYTES)));
+                model.setDownloadedBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.DOWNLOADED_BYTES)));
+                model.setLastModifiedAt(cursor.getLong(cursor.getColumnIndex(DownloadModel.LAST_MODIFIED_AT)));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        return model;
+    }
+
+    @Override
+    public void insert(DownloadModel model) {
+        try {
+            ContentValues values = new ContentValues();
+            values.put(DownloadModel.ID, model.getId());
+            values.put(DownloadModel.URL, model.getUrl());
+            values.put(DownloadModel.ETAG, model.getETag());
+            values.put(DownloadModel.DIR_PATH, model.getDirPath());
+            values.put(DownloadModel.FILE_NAME, model.getFileName());
+            values.put(DownloadModel.TOTAL_BYTES, model.getTotalBytes());
+            values.put(DownloadModel.DOWNLOADED_BYTES, model.getDownloadedBytes());
+            values.put(DownloadModel.LAST_MODIFIED_AT, model.getLastModifiedAt());
+            db.insert(TABLE_NAME, null, values);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void update(DownloadModel model) {
+        try {
+            ContentValues values = new ContentValues();
+            values.put(DownloadModel.URL, model.getUrl());
+            values.put(DownloadModel.ETAG, model.getETag());
+            values.put(DownloadModel.DIR_PATH, model.getDirPath());
+            values.put(DownloadModel.FILE_NAME, model.getFileName());
+            values.put(DownloadModel.TOTAL_BYTES, model.getTotalBytes());
+            values.put(DownloadModel.DOWNLOADED_BYTES, model.getDownloadedBytes());
+            values.put(DownloadModel.LAST_MODIFIED_AT, model.getLastModifiedAt());
+            db.update(TABLE_NAME, values, DownloadModel.ID + " = ? ",
+                    new String[]{String.valueOf(model.getId())});
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void updateProgress(int id, long downloadedBytes, long lastModifiedAt) {
+        try {
+            ContentValues values = new ContentValues();
+            values.put(DownloadModel.DOWNLOADED_BYTES, downloadedBytes);
+            values.put(DownloadModel.LAST_MODIFIED_AT, lastModifiedAt);
+            db.update(TABLE_NAME, values, DownloadModel.ID + " = ? ",
+                    new String[]{String.valueOf(id)});
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void remove(int id) {
+        try {
+            db.execSQL("DELETE FROM " + TABLE_NAME + " WHERE " +
+                    DownloadModel.ID + " = " + id);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public List<DownloadModel> getUnwantedModels(int days) {
+        List<DownloadModel> models = new ArrayList<>();
+        Cursor cursor = null;
+        try {
+            final long daysInMillis = days * 24 * 60 * 60 * 1000L;
+            final long beforeTimeInMillis = System.currentTimeMillis() - daysInMillis;
+            cursor = db.rawQuery("SELECT * FROM " + TABLE_NAME + " WHERE " +
+                    DownloadModel.LAST_MODIFIED_AT + " <= " + beforeTimeInMillis, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                do {
+                    DownloadModel model = new DownloadModel();
+                    model.setId(cursor.getInt(cursor.getColumnIndex(DownloadModel.ID)));
+                    model.setUrl(cursor.getString(cursor.getColumnIndex(DownloadModel.URL)));
+                    model.setETag(cursor.getString(cursor.getColumnIndex(DownloadModel.ETAG)));
+                    model.setDirPath(cursor.getString(cursor.getColumnIndex(DownloadModel.DIR_PATH)));
+                    model.setFileName(cursor.getString(cursor.getColumnIndex(DownloadModel.FILE_NAME)));
+                    model.setTotalBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.TOTAL_BYTES)));
+                    model.setDownloadedBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.DOWNLOADED_BYTES)));
+                    model.setLastModifiedAt(cursor.getLong(cursor.getColumnIndex(DownloadModel.LAST_MODIFIED_AT)));
+
+                    models.add(model);
+                } while (cursor.moveToNext());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        return models;
+    }
+
+    @Override
+    public void clear() {
+        try {
+            db.delete(TABLE_NAME, null, null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DatabaseOpenHelper.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DatabaseOpenHelper.java
new file mode 100755
index 0000000..5d44943
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DatabaseOpenHelper.java
@@ -0,0 +1,40 @@
+package com.downloader.database;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class DatabaseOpenHelper extends SQLiteOpenHelper {
+
+    private static final String DATABASE_NAME = "prdownloader.db";
+    private static final int DATABASE_VERSION = 1;
+
+    DatabaseOpenHelper(Context context) {
+        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL("CREATE TABLE IF NOT EXISTS " +
+                AppDbHelper.TABLE_NAME + "( " +
+                DownloadModel.ID + " INTEGER PRIMARY KEY, " +
+                DownloadModel.URL + " VARCHAR, " +
+                DownloadModel.ETAG + " VARCHAR, " +
+                DownloadModel.DIR_PATH + " VARCHAR, " +
+                DownloadModel.FILE_NAME + " VARCHAR, " +
+                DownloadModel.TOTAL_BYTES + " INTEGER, " +
+                DownloadModel.DOWNLOADED_BYTES + " INTEGER, " +
+                DownloadModel.LAST_MODIFIED_AT + " INTEGER " +
+                ")");
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int i, int i1) {
+
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DbHelper.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DbHelper.java
new file mode 100755
index 0000000..2b69d26
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DbHelper.java
@@ -0,0 +1,25 @@
+package com.downloader.database;
+
+import java.util.List;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public interface DbHelper {
+
+    DownloadModel find(int id);
+
+    void insert(DownloadModel model);
+
+    void update(DownloadModel model);
+
+    void updateProgress(int id, long downloadedBytes, long lastModifiedAt);
+
+    void remove(int id);
+
+    List<DownloadModel> getUnwantedModels(int days);
+
+    void clear();
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DownloadModel.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DownloadModel.java
new file mode 100755
index 0000000..ccffab0
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DownloadModel.java
@@ -0,0 +1,91 @@
+package com.downloader.database;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class DownloadModel {
+
+    static final String ID = "id";
+    static final String URL = "url";
+    static final String ETAG = "etag";
+    static final String DIR_PATH = "dir_path";
+    static final String FILE_NAME = "file_name";
+    static final String TOTAL_BYTES = "total_bytes";
+    static final String DOWNLOADED_BYTES = "downloaded_bytes";
+    static final String LAST_MODIFIED_AT = "last_modified_at";
+
+    private int id;
+    private String url;
+    private String eTag;
+    private String dirPath;
+    private String fileName;
+    private long totalBytes;
+    private long downloadedBytes;
+    private long lastModifiedAt;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getETag() {
+        return eTag;
+    }
+
+    public void setETag(String eTag) {
+        this.eTag = eTag;
+    }
+
+    public String getDirPath() {
+        return dirPath;
+    }
+
+    public void setDirPath(String dirPath) {
+        this.dirPath = dirPath;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public long getTotalBytes() {
+        return totalBytes;
+    }
+
+    public void setTotalBytes(long totalBytes) {
+        this.totalBytes = totalBytes;
+    }
+
+    public long getDownloadedBytes() {
+        return downloadedBytes;
+    }
+
+    public void setDownloadedBytes(long downloadedBytes) {
+        this.downloadedBytes = downloadedBytes;
+    }
+
+    public long getLastModifiedAt() {
+        return lastModifiedAt;
+    }
+
+    public void setLastModifiedAt(long lastModifiedAt) {
+        this.lastModifiedAt = lastModifiedAt;
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/NoOpsDbHelper.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/NoOpsDbHelper.java
new file mode 100755
index 0000000..23150a8
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/NoOpsDbHelper.java
@@ -0,0 +1,49 @@
+package com.downloader.database;
+
+import java.util.List;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class NoOpsDbHelper implements DbHelper {
+
+    public NoOpsDbHelper() {
+
+    }
+
+    @Override
+    public DownloadModel find(int id) {
+        return null;
+    }
+
+    @Override
+    public void insert(DownloadModel model) {
+
+    }
+
+    @Override
+    public void update(DownloadModel model) {
+
+    }
+
+    @Override
+    public void updateProgress(int id, long downloadedBytes, long lastModifiedAt) {
+
+    }
+
+    @Override
+    public void remove(int id) {
+
+    }
+
+    @Override
+    public List<DownloadModel> getUnwantedModels(int days) {
+        return null;
+    }
+
+    @Override
+    public void clear() {
+
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/handler/ProgressHandler.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/handler/ProgressHandler.java
new file mode 100755
index 0000000..dceab0f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/handler/ProgressHandler.java
@@ -0,0 +1,38 @@
+package com.downloader.handler;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+import com.downloader.Constants;
+import com.downloader.Progress;
+import com.downloader.OnProgressListener;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class ProgressHandler extends Handler {
+
+    private final OnProgressListener listener;
+
+    public ProgressHandler(OnProgressListener listener) {
+        super(Looper.getMainLooper());
+        this.listener = listener;
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+        switch (msg.what) {
+            case Constants.UPDATE:
+                if (listener != null) {
+                    final Progress progress = (Progress) msg.obj;
+                    listener.onProgress(progress);
+                }
+                break;
+            default:
+                super.handleMessage(msg);
+                break;
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/DefaultHttpClient.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/DefaultHttpClient.java
new file mode 100755
index 0000000..22bbd9a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/DefaultHttpClient.java
@@ -0,0 +1,111 @@
+package com.downloader.httpclient;
+
+import com.downloader.Constants;
+import com.downloader.request.DownloadRequest;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DefaultHttpClient implements HttpClient {
+
+    private URLConnection connection;
+
+    public DefaultHttpClient() {
+
+    }
+
+    @SuppressWarnings("CloneDoesntCallSuperClone")
+    @Override
+    public HttpClient clone() {
+        return new DefaultHttpClient();
+    }
+
+    @Override
+    public void connect(DownloadRequest request) throws IOException {
+        connection = new URL(request.getUrl()).openConnection();
+        connection.setReadTimeout(request.getReadTimeout());
+        connection.setConnectTimeout(request.getConnectTimeout());
+        final String range = String.format(Locale.ENGLISH,
+                "bytes=%d-", request.getDownloadedBytes());
+        connection.addRequestProperty(Constants.RANGE, range);
+        connection.addRequestProperty(Constants.USER_AGENT, request.getUserAgent());
+        addHeaders(request);
+        connection.connect();
+    }
+
+    @Override
+    public int getResponseCode() throws IOException {
+        int responseCode = 0;
+        if (connection instanceof HttpURLConnection) {
+            responseCode = ((HttpURLConnection) connection).getResponseCode();
+        }
+        return responseCode;
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return connection.getInputStream();
+    }
+
+    @Override
+    public long getContentLength() {
+        String length = connection.getHeaderField("Content-Length");
+        try {
+            return Long.parseLong(length);
+        } catch (NumberFormatException e) {
+            return -1;
+        }
+    }
+
+    @Override
+    public String getResponseHeader(String name) {
+        return connection.getHeaderField(name);
+    }
+
+    @Override
+    public void close() {
+        // no operation
+    }
+
+    @Override
+    public Map<String, List<String>> getHeaderFields() {
+        return connection.getHeaderFields();
+    }
+
+    @Override
+    public InputStream getErrorStream() {
+        if (connection instanceof HttpURLConnection) {
+            return ((HttpURLConnection) connection).getErrorStream();
+        }
+        return null;
+    }
+
+    private void addHeaders(DownloadRequest request) {
+        final HashMap<String, List<String>> headers = request.getHeaders();
+        if (headers != null) {
+            Set<Map.Entry<String, List<String>>> entries = headers.entrySet();
+            for (Map.Entry<String, List<String>> entry : entries) {
+                String name = entry.getKey();
+                List<String> list = entry.getValue();
+                if (list != null) {
+                    for (String value : list) {
+                        connection.addRequestProperty(name, value);
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/HttpClient.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/HttpClient.java
new file mode 100755
index 0000000..ca9d790
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/HttpClient.java
@@ -0,0 +1,34 @@
+package com.downloader.httpclient;
+
+import com.downloader.request.DownloadRequest;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface HttpClient extends Cloneable {
+
+    HttpClient clone();
+
+    void connect(DownloadRequest request) throws IOException;
+
+    int getResponseCode() throws IOException;
+
+    InputStream getInputStream() throws IOException;
+
+    long getContentLength();
+
+    String getResponseHeader(String name);
+
+    void close();
+
+    Map<String, List<String>> getHeaderFields();
+
+    InputStream getErrorStream() throws IOException;
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/ComponentHolder.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/ComponentHolder.java
new file mode 100755
index 0000000..88ede5c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/ComponentHolder.java
@@ -0,0 +1,97 @@
+package com.downloader.internal;
+
+import android.content.Context;
+
+import com.downloader.Constants;
+import com.downloader.PRDownloader;
+import com.downloader.PRDownloaderConfig;
+import com.downloader.database.AppDbHelper;
+import com.downloader.database.DbHelper;
+import com.downloader.database.NoOpsDbHelper;
+import com.downloader.httpclient.DefaultHttpClient;
+import com.downloader.httpclient.HttpClient;
+
+/**
+ * Created by amitshekhar on 14/11/17.
+ */
+
+public class ComponentHolder {
+
+    private final static ComponentHolder INSTANCE = new ComponentHolder();
+    private int readTimeout;
+    private int connectTimeout;
+    private String userAgent;
+    private HttpClient httpClient;
+    private DbHelper dbHelper;
+
+    public static ComponentHolder getInstance() {
+        return INSTANCE;
+    }
+
+    public void init(Context context, PRDownloaderConfig config) {
+        this.readTimeout = config.getReadTimeout();
+        this.connectTimeout = config.getConnectTimeout();
+        this.userAgent = config.getUserAgent();
+        this.httpClient = config.getHttpClient();
+        this.dbHelper = config.isDatabaseEnabled() ? new AppDbHelper(context) : new NoOpsDbHelper();
+        if (config.isDatabaseEnabled()) {
+            PRDownloader.cleanUp(30);
+        }
+    }
+
+    public int getReadTimeout() {
+        if (readTimeout == 0) {
+            synchronized (ComponentHolder.class) {
+                if (readTimeout == 0) {
+                    readTimeout = Constants.DEFAULT_READ_TIMEOUT_IN_MILLS;
+                }
+            }
+        }
+        return readTimeout;
+    }
+
+    public int getConnectTimeout() {
+        if (connectTimeout == 0) {
+            synchronized (ComponentHolder.class) {
+                if (connectTimeout == 0) {
+                    connectTimeout = Constants.DEFAULT_CONNECT_TIMEOUT_IN_MILLS;
+                }
+            }
+        }
+        return connectTimeout;
+    }
+
+    public String getUserAgent() {
+        if (userAgent == null) {
+            synchronized (ComponentHolder.class) {
+                if (userAgent == null) {
+                    userAgent = Constants.DEFAULT_USER_AGENT;
+                }
+            }
+        }
+        return userAgent;
+    }
+
+    public DbHelper getDbHelper() {
+        if (dbHelper == null) {
+            synchronized (ComponentHolder.class) {
+                if (dbHelper == null) {
+                    dbHelper = new NoOpsDbHelper();
+                }
+            }
+        }
+        return dbHelper;
+    }
+
+    public HttpClient getHttpClient() {
+        if (httpClient == null) {
+            synchronized (ComponentHolder.class) {
+                if (httpClient == null) {
+                    httpClient = new DefaultHttpClient();
+                }
+            }
+        }
+        return httpClient.clone();
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRequestQueue.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRequestQueue.java
new file mode 100755
index 0000000..513f71a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRequestQueue.java
@@ -0,0 +1,118 @@
+package com.downloader.internal;
+
+import com.downloader.Status;
+import com.downloader.core.Core;
+import com.downloader.request.DownloadRequest;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRequestQueue {
+
+    private static DownloadRequestQueue instance;
+    private final Map<Integer, DownloadRequest> currentRequestMap;
+    private final AtomicInteger sequenceGenerator;
+
+    private DownloadRequestQueue() {
+        currentRequestMap = new ConcurrentHashMap<>();
+        sequenceGenerator = new AtomicInteger();
+    }
+
+    public static void initialize() {
+        getInstance();
+    }
+
+    public static DownloadRequestQueue getInstance() {
+        if (instance == null) {
+            synchronized (DownloadRequestQueue.class) {
+                if (instance == null) {
+                    instance = new DownloadRequestQueue();
+                }
+            }
+        }
+        return instance;
+    }
+
+    private int getSequenceNumber() {
+        return sequenceGenerator.incrementAndGet();
+    }
+
+    public void pause(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        if (request != null) {
+            request.setStatus(Status.PAUSED);
+        }
+    }
+
+    public void resume(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        if (request != null) {
+            request.setStatus(Status.QUEUED);
+            request.setFuture(Core.getInstance()
+                    .getExecutorSupplier()
+                    .forDownloadTasks()
+                    .submit(new DownloadRunnable(request)));
+        }
+    }
+
+    private void cancelAndRemoveFromMap(DownloadRequest request) {
+        if (request != null) {
+            request.cancel();
+            currentRequestMap.remove(request.getDownloadId());
+        }
+    }
+
+    public void cancel(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        cancelAndRemoveFromMap(request);
+    }
+
+    public void cancel(Object tag) {
+        for (Map.Entry<Integer, DownloadRequest> currentRequestMapEntry : currentRequestMap.entrySet()) {
+            DownloadRequest request = currentRequestMapEntry.getValue();
+            if (request.getTag() instanceof String && tag instanceof String) {
+                final String tempRequestTag = (String) request.getTag();
+                final String tempTag = (String) tag;
+                if (tempRequestTag.equals(tempTag)) {
+                    cancelAndRemoveFromMap(request);
+                }
+            } else if (request.getTag().equals(tag)) {
+                cancelAndRemoveFromMap(request);
+            }
+        }
+    }
+
+    public void cancelAll() {
+        for (Map.Entry<Integer, DownloadRequest> currentRequestMapEntry : currentRequestMap.entrySet()) {
+            DownloadRequest request = currentRequestMapEntry.getValue();
+            cancelAndRemoveFromMap(request);
+        }
+    }
+
+    public Status getStatus(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        if (request != null) {
+            return request.getStatus();
+        }
+        return Status.UNKNOWN;
+    }
+
+    public void addRequest(DownloadRequest request) {
+        currentRequestMap.put(request.getDownloadId(), request);
+        request.setStatus(Status.QUEUED);
+        request.setSequenceNumber(getSequenceNumber());
+        request.setFuture(Core.getInstance()
+                .getExecutorSupplier()
+                .forDownloadTasks()
+                .submit(new DownloadRunnable(request)));
+    }
+
+    public void finish(DownloadRequest request) {
+        currentRequestMap.remove(request.getDownloadId());
+    }
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRunnable.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRunnable.java
new file mode 100755
index 0000000..26d11d7
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRunnable.java
@@ -0,0 +1,41 @@
+package com.downloader.internal;
+
+import com.downloader.Error;
+import com.downloader.Priority;
+import com.downloader.Response;
+import com.downloader.Status;
+import com.downloader.request.DownloadRequest;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRunnable implements Runnable {
+
+    public final Priority priority;
+    public final int sequence;
+    public final DownloadRequest request;
+
+    DownloadRunnable(DownloadRequest request) {
+        this.request = request;
+        this.priority = request.getPriority();
+        this.sequence = request.getSequenceNumber();
+    }
+
+    @Override
+    public void run() {
+        request.setStatus(Status.RUNNING);
+        DownloadTask downloadTask = DownloadTask.create(request);
+        Response response = downloadTask.run();
+        if (response.isSuccessful()) {
+            request.deliverSuccess();
+        } else if (response.isPaused()) {
+            request.deliverPauseEvent();
+        } else if (response.getError() != null) {
+            request.deliverError(response.getError());
+        } else if (!response.isCancelled()) {
+            request.deliverError(new Error());
+        }
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadTask.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadTask.java
new file mode 100755
index 0000000..3702ba8
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadTask.java
@@ -0,0 +1,390 @@
+package com.downloader.internal;
+
+import com.downloader.Constants;
+import com.downloader.Error;
+import com.downloader.Progress;
+import com.downloader.Response;
+import com.downloader.Status;
+import com.downloader.database.DownloadModel;
+import com.downloader.handler.ProgressHandler;
+import com.downloader.httpclient.HttpClient;
+import com.downloader.internal.stream.FileDownloadOutputStream;
+import com.downloader.internal.stream.FileDownloadRandomAccessFile;
+import com.downloader.request.DownloadRequest;
+import com.downloader.utils.Utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadTask {
+
+    private static final int BUFFER_SIZE = 1024 * 4;
+    private static final long TIME_GAP_FOR_SYNC = 2000;
+    private static final long MIN_BYTES_FOR_SYNC = 65536;
+    private final DownloadRequest request;
+    private ProgressHandler progressHandler;
+    private long lastSyncTime;
+    private long lastSyncBytes;
+    private InputStream inputStream;
+    private FileDownloadOutputStream outputStream;
+    private HttpClient httpClient;
+    private long totalBytes;
+    private int responseCode;
+    private String eTag;
+    private boolean isResumeSupported;
+    private String tempPath;
+
+    private DownloadTask(DownloadRequest request) {
+        this.request = request;
+    }
+
+    static DownloadTask create(DownloadRequest request) {
+        return new DownloadTask(request);
+    }
+
+    Response run() {
+
+        Response response = new Response();
+
+        if (request.getStatus() == Status.CANCELLED) {
+            response.setCancelled(true);
+            return response;
+        } else if (request.getStatus() == Status.PAUSED) {
+            response.setPaused(true);
+            return response;
+        }
+
+        try {
+
+            if (request.getOnProgressListener() != null) {
+                progressHandler = new ProgressHandler(request.getOnProgressListener());
+            }
+
+            tempPath = Utils.getTempPath(request.getDirPath(), request.getFileName());
+
+            File file = new File(tempPath);
+
+            DownloadModel model = getDownloadModelIfAlreadyPresentInDatabase();
+
+            if (model != null) {
+                if (file.exists()) {
+                    request.setTotalBytes(model.getTotalBytes());
+                    request.setDownloadedBytes(model.getDownloadedBytes());
+                } else {
+                    removeNoMoreNeededModelFromDatabase();
+                    request.setDownloadedBytes(0);
+                    request.setTotalBytes(0);
+                    model = null;
+                }
+            }
+
+            httpClient = ComponentHolder.getInstance().getHttpClient();
+
+            httpClient.connect(request);
+
+            if (request.getStatus() == Status.CANCELLED) {
+                response.setCancelled(true);
+                return response;
+            } else if (request.getStatus() == Status.PAUSED) {
+                response.setPaused(true);
+                return response;
+            }
+
+            httpClient = Utils.getRedirectedConnectionIfAny(httpClient, request);
+
+            responseCode = httpClient.getResponseCode();
+
+            eTag = httpClient.getResponseHeader(Constants.ETAG);
+
+            if (checkIfFreshStartRequiredAndStart(model)) {
+                model = null;
+            }
+
+            if (!isSuccessful()) {
+                Error error = new Error();
+                error.setServerError(true);
+                error.setServerErrorMessage(convertStreamToString(httpClient.getErrorStream()));
+                error.setHeaderFields(httpClient.getHeaderFields());
+                error.setResponseCode(responseCode);
+                response.setError(error);
+                return response;
+            }
+
+            setResumeSupportedOrNot();
+
+            totalBytes = request.getTotalBytes();
+
+            if (!isResumeSupported) {
+                deleteTempFile();
+            }
+
+            if (totalBytes == 0) {
+                totalBytes = httpClient.getContentLength();
+                request.setTotalBytes(totalBytes);
+            }
+
+            if (isResumeSupported && model == null) {
+                createAndInsertNewModel();
+            }
+
+            if (request.getStatus() == Status.CANCELLED) {
+                response.setCancelled(true);
+                return response;
+            } else if (request.getStatus() == Status.PAUSED) {
+                response.setPaused(true);
+                return response;
+            }
+
+            request.deliverStartEvent();
+
+            inputStream = httpClient.getInputStream();
+
+            byte[] buff = new byte[BUFFER_SIZE];
+
+            if (!file.exists()) {
+                if (file.getParentFile() != null && !file.getParentFile().exists()) {
+                    if (file.getParentFile().mkdirs()) {
+                        //noinspection ResultOfMethodCallIgnored
+                        file.createNewFile();
+                    }
+                } else {
+                    //noinspection ResultOfMethodCallIgnored
+                    file.createNewFile();
+                }
+            }
+
+            this.outputStream = FileDownloadRandomAccessFile.create(file);
+
+            if (isResumeSupported && request.getDownloadedBytes() != 0) {
+                outputStream.seek(request.getDownloadedBytes());
+            }
+
+            if (request.getStatus() == Status.CANCELLED) {
+                response.setCancelled(true);
+                return response;
+            } else if (request.getStatus() == Status.PAUSED) {
+                response.setPaused(true);
+                return response;
+            }
+
+            do {
+
+                final int byteCount = inputStream.read(buff, 0, BUFFER_SIZE);
+
+                if (byteCount == -1) {
+                    break;
+                }
+
+                outputStream.write(buff, 0, byteCount);
+
+                request.setDownloadedBytes(request.getDownloadedBytes() + byteCount);
+
+                sendProgress();
+
+                syncIfRequired(outputStream);
+
+                if (request.getStatus() == Status.CANCELLED) {
+                    response.setCancelled(true);
+                    return response;
+                } else if (request.getStatus() == Status.PAUSED) {
+                    sync(outputStream);
+                    response.setPaused(true);
+                    return response;
+                }
+
+            } while (true);
+
+            final String path = Utils.getPath(request.getDirPath(), request.getFileName());
+
+            Utils.renameFileName(tempPath, path);
+
+            response.setSuccessful(true);
+
+            if (isResumeSupported) {
+                removeNoMoreNeededModelFromDatabase();
+            }
+
+        } catch (IOException | IllegalAccessException e) {
+            if (!isResumeSupported) {
+                deleteTempFile();
+            }
+            Error error = new Error();
+            error.setConnectionError(true);
+            error.setConnectionException(e);
+            response.setError(error);
+        } finally {
+            closeAllSafely(outputStream);
+        }
+
+        return response;
+    }
+
+    private void deleteTempFile() {
+        File file = new File(tempPath);
+        if (file.exists()) {
+            //noinspection ResultOfMethodCallIgnored
+            file.delete();
+        }
+    }
+
+    private boolean isSuccessful() {
+        return responseCode >= HttpURLConnection.HTTP_OK
+                && responseCode < HttpURLConnection.HTTP_MULT_CHOICE;
+    }
+
+    private void setResumeSupportedOrNot() {
+        isResumeSupported = (responseCode == HttpURLConnection.HTTP_PARTIAL);
+    }
+
+    private boolean checkIfFreshStartRequiredAndStart(DownloadModel model) throws IOException,
+            IllegalAccessException {
+        if (responseCode == Constants.HTTP_RANGE_NOT_SATISFIABLE || isETagChanged(model)) {
+            if (model != null) {
+                removeNoMoreNeededModelFromDatabase();
+            }
+            deleteTempFile();
+            request.setDownloadedBytes(0);
+            request.setTotalBytes(0);
+            httpClient = ComponentHolder.getInstance().getHttpClient();
+            httpClient.connect(request);
+            httpClient = Utils.getRedirectedConnectionIfAny(httpClient, request);
+            responseCode = httpClient.getResponseCode();
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isETagChanged(DownloadModel model) {
+        return !(eTag == null || model == null || model.getETag() == null)
+                && !model.getETag().equals(eTag);
+    }
+
+    private DownloadModel getDownloadModelIfAlreadyPresentInDatabase() {
+        return ComponentHolder.getInstance().getDbHelper().find(request.getDownloadId());
+    }
+
+    private void createAndInsertNewModel() {
+        DownloadModel model = new DownloadModel();
+        model.setId(request.getDownloadId());
+        model.setUrl(request.getUrl());
+        model.setETag(eTag);
+        model.setDirPath(request.getDirPath());
+        model.setFileName(request.getFileName());
+        model.setDownloadedBytes(request.getDownloadedBytes());
+        model.setTotalBytes(totalBytes);
+        model.setLastModifiedAt(System.currentTimeMillis());
+        ComponentHolder.getInstance().getDbHelper().insert(model);
+    }
+
+    private void removeNoMoreNeededModelFromDatabase() {
+        ComponentHolder.getInstance().getDbHelper().remove(request.getDownloadId());
+    }
+
+    private void sendProgress() {
+        if (request.getStatus() != Status.CANCELLED) {
+            if (progressHandler != null) {
+                progressHandler
+                        .obtainMessage(Constants.UPDATE,
+                                new Progress(request.getDownloadedBytes(),
+                                        totalBytes)).sendToTarget();
+            }
+        }
+    }
+
+    private void syncIfRequired(FileDownloadOutputStream outputStream) {
+        final long currentBytes = request.getDownloadedBytes();
+        final long currentTime = System.currentTimeMillis();
+        final long bytesDelta = currentBytes - lastSyncBytes;
+        final long timeDelta = currentTime - lastSyncTime;
+        if (bytesDelta > MIN_BYTES_FOR_SYNC && timeDelta > TIME_GAP_FOR_SYNC) {
+            sync(outputStream);
+            lastSyncBytes = currentBytes;
+            lastSyncTime = currentTime;
+        }
+    }
+
+    private void sync(FileDownloadOutputStream outputStream) {
+        boolean success;
+        try {
+            outputStream.flushAndSync();
+            success = true;
+        } catch (IOException e) {
+            success = false;
+            e.printStackTrace();
+        }
+        if (success && isResumeSupported) {
+            ComponentHolder.getInstance().getDbHelper()
+                    .updateProgress(request.getDownloadId(),
+                            request.getDownloadedBytes(),
+                            System.currentTimeMillis());
+        }
+
+    }
+
+    private void closeAllSafely(FileDownloadOutputStream outputStream) {
+        if (httpClient != null) {
+            try {
+                httpClient.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        if (inputStream != null) {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        try {
+            if (outputStream != null) {
+                try {
+                    sync(outputStream);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } finally {
+            if (outputStream != null)
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+        }
+    }
+
+    private String convertStreamToString(InputStream stream) {
+        StringBuilder stringBuilder = new StringBuilder();
+        if (stream != null) {
+            String line;
+            BufferedReader bufferedReader = null;
+            try {
+                bufferedReader = new BufferedReader(new InputStreamReader(stream));
+                while ((line = bufferedReader.readLine()) != null) {
+                    stringBuilder.append(line);
+                }
+            } catch (IOException ignored) {
+
+            } finally {
+                try {
+                    if (bufferedReader != null) {
+                        bufferedReader.close();
+                    }
+                } catch (NullPointerException | IOException ignored) {
+
+                }
+            }
+        }
+        return stringBuilder.toString();
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/SynchronousCall.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/SynchronousCall.java
new file mode 100755
index 0000000..008e4ec
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/SynchronousCall.java
@@ -0,0 +1,19 @@
+package com.downloader.internal;
+
+import com.downloader.Response;
+import com.downloader.request.DownloadRequest;
+
+public class SynchronousCall {
+
+    public final DownloadRequest request;
+
+    public SynchronousCall(DownloadRequest request) {
+        this.request = request;
+    }
+
+    public Response execute() {
+        DownloadTask downloadTask = DownloadTask.create(request);
+        return downloadTask.run();
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadOutputStream.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadOutputStream.java
new file mode 100755
index 0000000..1d080dd
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadOutputStream.java
@@ -0,0 +1,38 @@
+package com.downloader.internal.stream;
+
+
+import java.io.IOException;
+
+public interface FileDownloadOutputStream {
+
+    /**
+     * Writes <code>len</code> bytes from the specified byte array
+     * starting at offset <code>off</code> to this file.
+     */
+    void write(byte b[], int off, int len) throws IOException;
+
+    /**
+     * Flush all buffer to system and force all system buffers to synchronize with the underlying
+     * device.
+     */
+    void flushAndSync() throws IOException;
+
+    /**
+     * Closes this output stream and releases any system resources associated with this stream. The
+     * general contract of <code>close</code> is that it closes the output stream. A closed stream
+     * cannot perform output operations and cannot be reopened.
+     */
+    void close() throws IOException;
+
+    /**
+     * Sets the file-pointer offset, measured from the beginning of this file, at which the next
+     * read or write occurs.  The offset may be set beyond the end of the file.
+     */
+    void seek(long offset) throws IOException, IllegalAccessException;
+
+    /**
+     * Sets the length of this file.
+     */
+    void setLength(final long newLength) throws IOException, IllegalAccessException;
+
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadRandomAccessFile.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadRandomAccessFile.java
new file mode 100755
index 0000000..b0ebf7a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadRandomAccessFile.java
@@ -0,0 +1,53 @@
+package com.downloader.internal.stream;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+public class FileDownloadRandomAccessFile implements FileDownloadOutputStream {
+
+    private final BufferedOutputStream out;
+    private final FileDescriptor fd;
+    private final RandomAccessFile randomAccess;
+
+    private FileDownloadRandomAccessFile(File file) throws IOException {
+        randomAccess = new RandomAccessFile(file, "rw");
+        fd = randomAccess.getFD();
+        out = new BufferedOutputStream(new FileOutputStream(randomAccess.getFD()));
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        out.write(b, off, len);
+    }
+
+    @Override
+    public void flushAndSync() throws IOException {
+        out.flush();
+        fd.sync();
+    }
+
+    @Override
+    public void close() throws IOException {
+        out.close();
+        randomAccess.close();
+    }
+
+    @Override
+    public void seek(long offset) throws IOException {
+        randomAccess.seek(offset);
+    }
+
+    @Override
+    public void setLength(long totalBytes) throws IOException {
+        randomAccess.setLength(totalBytes);
+    }
+
+    public static FileDownloadOutputStream create(File file) throws IOException {
+        return new FileDownloadRandomAccessFile(file);
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequest.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequest.java
new file mode 100755
index 0000000..04abfcf
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequest.java
@@ -0,0 +1,319 @@
+package com.downloader.request;
+
+import com.downloader.Error;
+import com.downloader.OnCancelListener;
+import com.downloader.OnDownloadListener;
+import com.downloader.OnPauseListener;
+import com.downloader.OnProgressListener;
+import com.downloader.OnStartOrResumeListener;
+import com.downloader.Priority;
+import com.downloader.Response;
+import com.downloader.Status;
+import com.downloader.core.Core;
+import com.downloader.internal.ComponentHolder;
+import com.downloader.internal.DownloadRequestQueue;
+import com.downloader.internal.SynchronousCall;
+import com.downloader.utils.Utils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.Future;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRequest {
+
+    private Priority priority;
+    private Object tag;
+    private String url;
+    private String dirPath;
+    private String fileName;
+    private int sequenceNumber;
+    private Future future;
+    private long downloadedBytes;
+    private long totalBytes;
+    private int readTimeout;
+    private int connectTimeout;
+    private String userAgent;
+    private OnProgressListener onProgressListener;
+    private OnDownloadListener onDownloadListener;
+    private OnStartOrResumeListener onStartOrResumeListener;
+    private OnPauseListener onPauseListener;
+    private OnCancelListener onCancelListener;
+    private int downloadId;
+    private HashMap<String, List<String>> headerMap;
+    private Status status;
+
+    DownloadRequest(DownloadRequestBuilder builder) {
+        this.url = builder.url;
+        this.dirPath = builder.dirPath;
+        this.fileName = builder.fileName;
+        this.headerMap = builder.headerMap;
+        this.priority = builder.priority;
+        this.tag = builder.tag;
+        this.readTimeout =
+                builder.readTimeout != 0 ?
+                        builder.readTimeout :
+                        getReadTimeoutFromConfig();
+        this.connectTimeout =
+                builder.connectTimeout != 0 ?
+                        builder.connectTimeout :
+                        getConnectTimeoutFromConfig();
+        this.userAgent = builder.userAgent;
+    }
+
+    public Priority getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Priority priority) {
+        this.priority = priority;
+    }
+
+    public Object getTag() {
+        return tag;
+    }
+
+    public void setTag(Object tag) {
+        this.tag = tag;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getDirPath() {
+        return dirPath;
+    }
+
+    public void setDirPath(String dirPath) {
+        this.dirPath = dirPath;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public int getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+    public void setSequenceNumber(int sequenceNumber) {
+        this.sequenceNumber = sequenceNumber;
+    }
+
+    public HashMap<String, List<String>> getHeaders() {
+        return headerMap;
+    }
+
+    public Future getFuture() {
+        return future;
+    }
+
+    public void setFuture(Future future) {
+        this.future = future;
+    }
+
+    public long getDownloadedBytes() {
+        return downloadedBytes;
+    }
+
+    public void setDownloadedBytes(long downloadedBytes) {
+        this.downloadedBytes = downloadedBytes;
+    }
+
+    public long getTotalBytes() {
+        return totalBytes;
+    }
+
+    public void setTotalBytes(long totalBytes) {
+        this.totalBytes = totalBytes;
+    }
+
+    public int getReadTimeout() {
+        return readTimeout;
+    }
+
+    public void setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+    }
+
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    public void setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+    }
+
+    public String getUserAgent() {
+        if (userAgent == null) {
+            userAgent = ComponentHolder.getInstance().getUserAgent();
+        }
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public int getDownloadId() {
+        return downloadId;
+    }
+
+    public void setDownloadId(int downloadId) {
+        this.downloadId = downloadId;
+    }
+
+    public Status getStatus() {
+        return status;
+    }
+
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+    public OnProgressListener getOnProgressListener() {
+        return onProgressListener;
+    }
+
+    public DownloadRequest setOnStartOrResumeListener(OnStartOrResumeListener onStartOrResumeListener) {
+        this.onStartOrResumeListener = onStartOrResumeListener;
+        return this;
+    }
+
+    public DownloadRequest setOnProgressListener(OnProgressListener onProgressListener) {
+        this.onProgressListener = onProgressListener;
+        return this;
+    }
+
+    public DownloadRequest setOnPauseListener(OnPauseListener onPauseListener) {
+        this.onPauseListener = onPauseListener;
+        return this;
+    }
+
+    public DownloadRequest setOnCancelListener(OnCancelListener onCancelListener) {
+        this.onCancelListener = onCancelListener;
+        return this;
+    }
+
+    public int start(OnDownloadListener onDownloadListener) {
+        this.onDownloadListener = onDownloadListener;
+        downloadId = Utils.getUniqueId(url, dirPath, fileName);
+        DownloadRequestQueue.getInstance().addRequest(this);
+        return downloadId;
+    }
+
+    public Response executeSync() {
+        downloadId = Utils.getUniqueId(url, dirPath, fileName);
+        return new SynchronousCall(this).execute();
+    }
+
+    public void deliverError(final Error error) {
+        if (status != Status.CANCELLED) {
+            setStatus(Status.FAILED);
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onDownloadListener != null) {
+                                onDownloadListener.onError(error);
+                            }
+                            finish();
+                        }
+                    });
+        }
+    }
+
+    public void deliverSuccess() {
+        if (status != Status.CANCELLED) {
+            setStatus(Status.COMPLETED);
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onDownloadListener != null) {
+                                onDownloadListener.onDownloadComplete();
+                            }
+                            finish();
+                        }
+                    });
+        }
+    }
+
+    public void deliverStartEvent() {
+        if (status != Status.CANCELLED) {
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onStartOrResumeListener != null) {
+                                onStartOrResumeListener.onStartOrResume();
+                            }
+                        }
+                    });
+        }
+    }
+
+    public void deliverPauseEvent() {
+        if (status != Status.CANCELLED) {
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onPauseListener != null) {
+                                onPauseListener.onPause();
+                            }
+                        }
+                    });
+        }
+    }
+
+    private void deliverCancelEvent() {
+        Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                .execute(new Runnable() {
+                    public void run() {
+                        if (onCancelListener != null) {
+                            onCancelListener.onCancel();
+                        }
+                    }
+                });
+    }
+
+    public void cancel() {
+        status = Status.CANCELLED;
+        if (future != null) {
+            future.cancel(true);
+        }
+        deliverCancelEvent();
+        Utils.deleteTempFileAndDatabaseEntryInBackground(Utils.getTempPath(dirPath, fileName), downloadId);
+    }
+
+    private void finish() {
+        destroy();
+        DownloadRequestQueue.getInstance().finish(this);
+    }
+
+    private void destroy() {
+        this.onProgressListener = null;
+        this.onDownloadListener = null;
+        this.onStartOrResumeListener = null;
+        this.onPauseListener = null;
+        this.onCancelListener = null;
+    }
+
+    private int getReadTimeoutFromConfig() {
+        return ComponentHolder.getInstance().getReadTimeout();
+    }
+
+    private int getConnectTimeoutFromConfig() {
+        return ComponentHolder.getInstance().getConnectTimeout();
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequestBuilder.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequestBuilder.java
new file mode 100755
index 0000000..67d5dff
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequestBuilder.java
@@ -0,0 +1,81 @@
+package com.downloader.request;
+
+import com.downloader.Priority;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRequestBuilder implements RequestBuilder {
+
+    String url;
+    String dirPath;
+    String fileName;
+    Priority priority = Priority.MEDIUM;
+    Object tag;
+    int readTimeout;
+    int connectTimeout;
+    String userAgent;
+    HashMap<String, List<String>> headerMap;
+
+    public DownloadRequestBuilder(String url, String dirPath, String fileName) {
+        this.url = url;
+        this.dirPath = dirPath;
+        this.fileName = fileName;
+    }
+
+    @Override
+    public DownloadRequestBuilder setHeader(String name, String value) {
+        if (headerMap == null) {
+            headerMap = new HashMap<>();
+        }
+        List<String> list = headerMap.get(name);
+        if (list == null) {
+            list = new ArrayList<>();
+            headerMap.put(name, list);
+        }
+        if (!list.contains(value)) {
+            list.add(value);
+        }
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setPriority(Priority priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setTag(Object tag) {
+        this.tag = tag;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+        return this;
+    }
+
+    public DownloadRequest build() {
+        return new DownloadRequest(this);
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/RequestBuilder.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/RequestBuilder.java
new file mode 100755
index 0000000..f1919d5
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/RequestBuilder.java
@@ -0,0 +1,23 @@
+package com.downloader.request;
+
+import com.downloader.Priority;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface RequestBuilder {
+
+    RequestBuilder setHeader(String name, String value);
+
+    RequestBuilder setPriority(Priority priority);
+
+    RequestBuilder setTag(Object tag);
+
+    RequestBuilder setReadTimeout(int readTimeout);
+
+    RequestBuilder setConnectTimeout(int connectTimeout);
+
+    RequestBuilder setUserAgent(String userAgent);
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/utils/Utils.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/utils/Utils.java
new file mode 100755
index 0000000..6c0633f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/utils/Utils.java
@@ -0,0 +1,157 @@
+package com.downloader.utils;
+
+import com.downloader.Constants;
+import com.downloader.core.Core;
+import com.downloader.database.DownloadModel;
+import com.downloader.httpclient.HttpClient;
+import com.downloader.internal.ComponentHolder;
+import com.downloader.request.DownloadRequest;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public final class Utils {
+
+    private final static int MAX_REDIRECTION = 10;
+
+    private Utils() {
+        // no instance
+    }
+
+    public static String getPath(String dirPath, String fileName) {
+        return dirPath + File.separator + fileName;
+    }
+
+    public static String getTempPath(String dirPath, String fileName) {
+        return getPath(dirPath, fileName) + ".temp";
+    }
+
+    public static void renameFileName(String oldPath, String newPath) throws IOException {
+        final File oldFile = new File(oldPath);
+        try {
+            final File newFile = new File(newPath);
+            if (newFile.exists()) {
+                if (!newFile.delete()) {
+                    throw new IOException("Deletion Failed");
+                }
+            }
+            if (!oldFile.renameTo(newFile)) {
+                throw new IOException("Rename Failed");
+            }
+        } finally {
+            if (oldFile.exists()) {
+                //noinspection ResultOfMethodCallIgnored
+                oldFile.delete();
+            }
+        }
+    }
+
+    public static void deleteTempFileAndDatabaseEntryInBackground(final String path, final int downloadId) {
+        Core.getInstance().getExecutorSupplier().forBackgroundTasks()
+                .execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        ComponentHolder.getInstance().getDbHelper().remove(downloadId);
+                        File file = new File(path);
+                        if (file.exists()) {
+                            //noinspection ResultOfMethodCallIgnored
+                            file.delete();
+                        }
+                    }
+                });
+    }
+
+    public static void deleteUnwantedModelsAndTempFiles(final int days) {
+        Core.getInstance().getExecutorSupplier().forBackgroundTasks()
+                .execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        List<DownloadModel> models = ComponentHolder.getInstance()
+                                .getDbHelper()
+                                .getUnwantedModels(days);
+                        if (models != null) {
+                            for (DownloadModel model : models) {
+                                final String tempPath = getTempPath(model.getDirPath(), model.getFileName());
+                                ComponentHolder.getInstance().getDbHelper().remove(model.getId());
+                                File file = new File(tempPath);
+                                if (file.exists()) {
+                                    //noinspection ResultOfMethodCallIgnored
+                                    file.delete();
+                                }
+                            }
+                        }
+                    }
+                });
+    }
+
+    public static int getUniqueId(String url, String dirPath, String fileName) {
+
+        String string = url + File.separator + dirPath + File.separator + fileName;
+
+        byte[] hash;
+
+        try {
+            hash = MessageDigest.getInstance("MD5").digest(string.getBytes("UTF-8"));
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("NoSuchAlgorithmException", e);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("UnsupportedEncodingException", e);
+        }
+
+        StringBuilder hex = new StringBuilder(hash.length * 2);
+
+        for (byte b : hash) {
+            if ((b & 0xFF) < 0x10) hex.append("0");
+            hex.append(Integer.toHexString(b & 0xFF));
+        }
+
+        return hex.toString().hashCode();
+
+    }
+
+    public static HttpClient getRedirectedConnectionIfAny(HttpClient httpClient,
+                                                          DownloadRequest request)
+            throws IOException, IllegalAccessException {
+        int redirectTimes = 0;
+        int code = httpClient.getResponseCode();
+        String location = httpClient.getResponseHeader("Location");
+
+        while (isRedirection(code)) {
+            if (location == null) {
+                throw new IllegalAccessException("Location is null");
+            }
+            httpClient.close();
+
+            request.setUrl(location);
+            httpClient = ComponentHolder.getInstance().getHttpClient();
+            httpClient.connect(request);
+            code = httpClient.getResponseCode();
+            location = httpClient.getResponseHeader("Location");
+            redirectTimes++;
+            if (redirectTimes >= MAX_REDIRECTION) {
+                throw new IllegalAccessException("Max redirection done");
+            }
+        }
+
+        return httpClient;
+    }
+
+    private static boolean isRedirection(int code) {
+        return code == HttpURLConnection.HTTP_MOVED_PERM
+                || code == HttpURLConnection.HTTP_MOVED_TEMP
+                || code == HttpURLConnection.HTTP_SEE_OTHER
+                || code == HttpURLConnection.HTTP_MULT_CHOICE
+                || code == Constants.HTTP_TEMPORARY_REDIRECT
+                || code == Constants.HTTP_PERMANENT_REDIRECT;
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/res/values/strings.xml b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/res/values/strings.xml
new file mode 100755
index 0000000..e672d7b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">downloader</string>
+</resources>
diff --git a/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/test/java/com/downloader/ExampleUnitTest.java b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/test/java/com/downloader/ExampleUnitTest.java
new file mode 100755
index 0000000..49f38ab
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/prdownloader/src/test/java/com/downloader/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.downloader;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/PRDownloader/settings.gradle b/OnTime_Merchant_live/lib/PRDownloader/settings.gradle
new file mode 100755
index 0000000..85308ca
--- /dev/null
+++ b/OnTime_Merchant_live/lib/PRDownloader/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':prdownloader'
diff --git a/OnTime_Merchant_live/lib/README.md b/OnTime_Merchant_live/lib/README.md
new file mode 100755
index 0000000..752321a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/README.md
@@ -0,0 +1,15 @@
+# Local libraries (not shared)
+
+These modules are **included only in this app**. They are not shared with other OnTime apps (User, Driver). Each app has its own copy under its own `lib/` folder.
+
+## Modules (Merchant uses all five)
+
+| Module | Path | Description |
+|--------|------|-------------|
+| rating-view | `RatingView/rating-view` | Rating bar widget |
+| textdrawable | `TextDrawable/library` | Text-based drawables |
+| prdownloader | `PRDownloader/prdownloader` | File downloader |
+| liboverscroll | `overscroll-decor/liboverscroll` | Overscroll effects |
+| fragmentanimations | `FragmentAnimations/fragmentanimations` | Fragment transition animations |
+
+All libs use **compileSdk 33**, **targetSdk 33**, **minSdk 21**, and AndroidX.
diff --git a/OnTime_Merchant_live/lib/RatingView/.gitignore b/OnTime_Merchant_live/lib/RatingView/.gitignore
new file mode 100755
index 0000000..c6cbe56
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
diff --git a/OnTime_Merchant_live/lib/RatingView/LICENSE b/OnTime_Merchant_live/lib/RatingView/LICENSE
new file mode 100755
index 0000000..2bb9ad2
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/LICENSE
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/RatingView/README.md b/OnTime_Merchant_live/lib/RatingView/README.md
new file mode 100755
index 0000000..166e28d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/README.md
@@ -0,0 +1,29 @@
+# RatingView
+[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-RatingView-green.svg?style=true)](https://android-arsenal.com/details/1/3770)
+
+Simple android widget that can replace standard inconvenient RatingBar in your app.
+
+![Screenshot](https://googledrive.com/host/0Bwz1_b9mA7XYbC1EQ28xaHVwcGc/ratingview2.jpg)
+##Description
+The default Android `RatingBar` widget hardly can satisfy developers' needs. It's a pain to customize it at all. This simple view can take a huge advantage of setting and scaling drawables for rating view easily.
+##Usage
+You can download this library with the following line in your `app` module `build.gradle`:
+```gradle
+compile 'com.github.ornolfr:rating-view:0.1.2@aar'
+```    
+##Example
+Declare `RatingView` in your XML with `app` attributes:
+```xml
+<com.github.ornolfr.ratingview.RatingView
+	android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:drawable_empty="@drawable/ic_star_empty"
+    app:drawable_filled="@drawable/ic_star_filled"
+    app:drawable_half="@drawable/ic_star_half"
+    app:drawable_margin="4dp"
+    app:drawable_size="24dp"
+    app:is_indicator="false"
+    app:max_count="5"
+    app:rating="3.5" />
+```
+And use it through `RatingView` instance in your code. Goog luck!
diff --git a/OnTime_Merchant_live/lib/RatingView/app/.gitignore b/OnTime_Merchant_live/lib/RatingView/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Merchant_live/lib/RatingView/app/build.gradle b/OnTime_Merchant_live/lib/RatingView/app/build.gradle
new file mode 100755
index 0000000..2b321d4
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/app/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
+
+    defaultConfig {
+        applicationId "com.github.ornolfr.ratingview"
+        minSdkVersion 15
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile project(':rating-view')
+}
diff --git a/OnTime_Merchant_live/lib/RatingView/app/proguard-rules.pro b/OnTime_Merchant_live/lib/RatingView/app/proguard-rules.pro
new file mode 100755
index 0000000..4ed9620
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\Roman\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/RatingView/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..41609b2
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/app/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.github.ornolfr.ratingview_sample">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name="com.github.ornolfr.ratingview_sample.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/java/com/github/ornolfr/ratingview_sample/MainActivity.java b/OnTime_Merchant_live/lib/RatingView/app/src/main/java/com/github/ornolfr/ratingview_sample/MainActivity.java
new file mode 100755
index 0000000..fd3a122
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/app/src/main/java/com/github/ornolfr/ratingview_sample/MainActivity.java
@@ -0,0 +1,55 @@
+package com.github.ornolfr.ratingview_sample;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.github.ornolfr.ratingview.RatingView;
+
+import java.util.Random;
+
+public class MainActivity extends AppCompatActivity implements View.OnClickListener {
+
+    private RatingView ratingView;
+
+    private Button buttonRating, buttonIndicator;
+
+    private Random random = new Random();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        ratingView = (RatingView) findViewById(R.id.ratingView);
+
+        buttonIndicator = (Button) findViewById(R.id.buttonIndicator);
+        buttonRating = (Button) findViewById(R.id.buttonRating);
+
+        buttonIndicator.setOnClickListener(this);
+        buttonRating.setOnClickListener(this);
+
+        ratingView.setOnRatingChangedListener(new RatingView.OnRatingChangedListener() {
+            @Override
+            public void onRatingChange(float oldRating, float newRating) {
+                Toast.makeText(MainActivity.this, "Old rating = " + oldRating + "; New rating = " + newRating, Toast.LENGTH_SHORT).show();
+            }
+        });
+
+    }
+
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.buttonIndicator:
+                ratingView.setIsIndicator(!ratingView.isIndicator());
+                break;
+            case R.id.buttonRating:
+                ratingView.setRating(random.nextFloat() * ratingView.getMaxCount());
+                break;
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/res/layout/activity_main.xml b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..837ed43
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.github.ornolfr.ratingview_sample.MainActivity">
+
+    <com.github.ornolfr.ratingview.RatingView
+        android:id="@+id/ratingView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:max_count="5"
+        android:foregroundGravity="bottom"
+        android:layout_marginBottom="16dp" />
+
+    <Button
+        android:id="@+id/buttonRating"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:text="Change rating!" />
+
+    <Button
+        android:id="@+id/buttonIndicator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:text="Make indicator!" />
+
+    <View
+        android:layout_width="24dp"
+        android:padding="8dp"
+        android:layout_height="24dp" />
+
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..cde69bc
Binary files /dev/null and b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..c133a0c
Binary files /dev/null and b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..bfa42f0
Binary files /dev/null and b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..324e72c
Binary files /dev/null and b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..aee44e1
Binary files /dev/null and b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values-w820dp/dimens.xml b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/colors.xml b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..3ab3e9c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/dimens.xml b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..47c8224
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/strings.xml b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..608d04b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">RatingView-Sample</string>
+</resources>
diff --git a/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/styles.xml b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..5885930
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/OnTime_Merchant_live/lib/RatingView/build.gradle b/OnTime_Merchant_live/lib/RatingView/build.gradle
new file mode 100755
index 0000000..66c8924
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/build.gradle
@@ -0,0 +1,24 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/OnTime_Merchant_live/lib/RatingView/gradle.properties b/OnTime_Merchant_live/lib/RatingView/gradle.properties
new file mode 100755
index 0000000..1d3591c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/RatingView/gradle/wrapper/gradle-wrapper.properties b/OnTime_Merchant_live/lib/RatingView/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..122a0dc
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/OnTime_Merchant_live/lib/RatingView/gradlew b/OnTime_Merchant_live/lib/RatingView/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_Merchant_live/lib/RatingView/gradlew.bat b/OnTime_Merchant_live/lib/RatingView/gradlew.bat
new file mode 100755
index 0000000..8a0b282
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_Merchant_live/lib/RatingView/rating-view/.gitignore b/OnTime_Merchant_live/lib/RatingView/rating-view/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/rating-view/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Merchant_live/lib/RatingView/rating-view/build.gradle b/OnTime_Merchant_live/lib/RatingView/rating-view/build.gradle
new file mode 100755
index 0000000..60f3141
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/rating-view/build.gradle
@@ -0,0 +1,49 @@
+apply plugin: 'com.android.library'
+ext {
+    bintrayRepo = 'maven'
+    bintrayName = 'rating-view'
+
+    publishedGroupId = 'com.github.ornolfr'
+    libraryName = 'RatingView'
+    artifact = 'rating-view'
+
+    libraryDescription = 'Simple android widget that can replace standard inconvenient RatingBar in your app.'
+
+    siteUrl = 'https://github.com/Ornolfr/RatingView'
+    gitUrl = 'https://github.com/Ornolfr/RatingView.git'
+
+    libraryVersion = '0.1.2'
+
+    developerId = 'ornolfr'
+    developerName = 'Roman Samoylenko'
+    developerEmail = 'ornolfr1@gmail.com'
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
+android {
+    compileSdk 33
+    namespace 'com.github.ornolfr.ratingview'
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+}
+
+// Publishing scripts removed; library used as local project dependency
diff --git a/OnTime_Merchant_live/lib/RatingView/rating-view/proguard-rules.pro b/OnTime_Merchant_live/lib/RatingView/rating-view/proguard-rules.pro
new file mode 100755
index 0000000..4ed9620
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/rating-view/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\Roman\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..652866d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true">
+
+    </application>
+
+</manifest>
diff --git a/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/java/com/github/ornolfr/ratingview/RatingView.java b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/java/com/github/ornolfr/ratingview/RatingView.java
new file mode 100755
index 0000000..5f8a095
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/java/com/github/ornolfr/ratingview/RatingView.java
@@ -0,0 +1,334 @@
+package com.github.ornolfr.ratingview;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.MotionEvent;
+import android.view.View;
+
+
+/**
+ * Created by Ornolfr on 10.06.2016.
+ */
+public class RatingView extends View implements View.OnTouchListener {
+
+    //Default values
+    private static final boolean DEFAULT_IS_INDICATOR = false;
+
+    private static final float DEFAULT_RATING = 3.5f;
+
+    private static final int DEFAULT_MAX_COUNT = 5;
+
+    private static final int DEFAULT_DRAWABLE_SIZE_IN_DP = 32;
+
+    private static final int DEFAULT_DRAWABLE_MARGIN_IN_DP = 4;
+
+    private OnRatingChangedListener mListener;
+
+    //Bitmaps for your rating drawables
+    private Bitmap mDrawableEmpty, mDrawableHalf, mDrawableFilled;
+
+    //For drawing view
+    private Rect mRect = new Rect();
+
+    //Boolean field: if true - user cannot affect the view
+    private boolean mIsIndicator;
+
+    //Float field: displayed rating, 0 <= mRating <= mMaxCount
+    private float mRating;
+
+    //Integer field: max drawables count and rating as well
+    private int mMaxCount;
+
+    //Integer field: drawable size
+    private int mDrawableSize;
+
+    //Integer field: inner margin between drawables
+    private int mDrawableMargin;
+
+    /**
+     * This interface will return rating value before changing it and after
+     */
+    public interface OnRatingChangedListener {
+        void onRatingChange(float oldRating, float newRating);
+    }
+
+
+    public RatingView(Context context) {
+        super(context);
+        init(null, 0, 0);
+    }
+
+    public RatingView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs, 0, 0);
+    }
+
+    public RatingView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(attrs, defStyleAttr, 0);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public RatingView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(attrs, defStyleAttr, defStyleRes);
+    }
+
+    private void init(AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        TypedArray a = getContext().obtainStyledAttributes
+                (attrs, R.styleable.RatingView, defStyleAttr, defStyleRes);
+
+        mDrawableMargin = (int) a.getDimension(R.styleable.RatingView_drawable_margin,
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_DRAWABLE_MARGIN_IN_DP, getResources().getDisplayMetrics()));
+
+        mDrawableSize = (int) a.getDimension(R.styleable.RatingView_drawable_size,
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_DRAWABLE_SIZE_IN_DP, getResources().getDisplayMetrics()));
+
+        if (mDrawableSize < 0)
+            throw new IllegalArgumentException("Drawable size < 0");
+
+        mMaxCount = a.getInteger(R.styleable.RatingView_max_count, DEFAULT_MAX_COUNT);
+
+        if (mMaxCount < 1)
+            throw new IllegalArgumentException("Max count < 1");
+
+        mRating = a.getFloat(R.styleable.RatingView_rating, DEFAULT_RATING);
+
+        mIsIndicator = a.getBoolean(R.styleable.RatingView_is_indicator, DEFAULT_IS_INDICATOR);
+
+        mDrawableEmpty = BitmapFactory.decodeResource(getContext().getResources(),
+                a.getResourceId(R.styleable.RatingView_drawable_empty, R.drawable.ic_star_empty));
+
+        mDrawableHalf = BitmapFactory.decodeResource(getContext().getResources(),
+                a.getResourceId(R.styleable.RatingView_drawable_half, R.drawable.ic_star_half));
+
+        mDrawableFilled = BitmapFactory.decodeResource(getContext().getResources(),
+                a.getResourceId(R.styleable.RatingView_drawable_filled, R.drawable.ic_star_filled));
+
+        a.recycle();
+
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(resolveSize((mDrawableSize * mMaxCount) + (mDrawableMargin * (mMaxCount - 1))/* + getPaddingLeft() + getPaddingRight()*/, widthMeasureSpec),
+                resolveSize(mDrawableSize, heightMeasureSpec)/* + getPaddingBottom() + getPaddingTop()*/);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (!mIsIndicator)
+            setOnTouchListener(this);
+//        canvas.translate(getPaddingLeft(), getPaddingTop());
+        if (mDrawableFilled != null && mDrawableHalf != null && mDrawableEmpty != null) {
+            //set view size
+            mRect.set(0, 0, mDrawableSize, mDrawableSize);
+
+            int fullDrawablesCount = (int) mRating;
+            int emptyDrawablesCount = mMaxCount - Math.round(mRating);
+
+            if (mRating - fullDrawablesCount >= 0.75f)
+                fullDrawablesCount++;
+
+            //drawing full drawables
+            for (int i = 0; i < fullDrawablesCount; i++) {
+                canvas.drawBitmap(mDrawableFilled, null, mRect, null);
+                mRect.offset(mDrawableSize + mDrawableMargin, 0);
+            }
+
+            //drawing half drawable if needed
+            if (mRating - fullDrawablesCount >= 0.25f && mRating - fullDrawablesCount < 0.75f) {
+                canvas.drawBitmap(mDrawableHalf, null, mRect, null);
+                mRect.offset(mDrawableSize + mDrawableMargin, 0);
+            }
+
+            //drawing empty drawables
+            for (int i = 0; i < emptyDrawablesCount; i++) {
+                canvas.drawBitmap(mDrawableEmpty, null, mRect, null);
+                mRect.offset(mDrawableSize + mDrawableMargin, 0);
+            }
+
+        }
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        switch (event.getActionMasked()) {
+            case MotionEvent.ACTION_DOWN:
+                return true;
+            case MotionEvent.ACTION_UP:
+                setRating(Math.round(event.getX() / getWidth() * mMaxCount + 0.5));
+                return false;
+            default: //do nothing
+                break;
+        }
+        return super.onTouchEvent(event);
+    }
+
+    /**
+     * Sets OnRatingChangedListener on this view, which will give you old and new rating.
+     *
+     * @param listener your listener
+     */
+    public void setOnRatingChangedListener(OnRatingChangedListener listener) {
+        mListener = listener;
+    }
+
+    /**
+     * Sets whether rating view is isIndicator or not
+     *
+     * @param isIndicator boolean, true - user can't interact the view
+     */
+    public void setIsIndicator(boolean isIndicator) {
+        mIsIndicator = isIndicator;
+        setOnTouchListener(mIsIndicator ? null : this);
+    }
+
+    /**
+     * Sets the rating of this view
+     *
+     * @param rating custom rating
+     */
+    public void setRating(float rating) {
+        float newRating = rating;
+        if (newRating < 0) {
+            newRating = 0;
+        } else if (newRating > mMaxCount) {
+            newRating = mMaxCount;
+        }
+        if (mListener != null)
+            mListener.onRatingChange(mRating, newRating);
+        mRating = newRating;
+        invalidate();
+    }
+
+    /**
+     * Sets empty drawable
+     *
+     * @param drawableEmpty bitmap of your drawable
+     */
+    public void setDrawableEmpty(Bitmap drawableEmpty) {
+        this.mDrawableEmpty = drawableEmpty;
+        invalidate();
+    }
+
+    /**
+     * Sets half drawable
+     *
+     * @param drawableHalf bitmap of your drawable
+     */
+    public void setDrawableHalf(Bitmap drawableHalf) {
+        this.mDrawableHalf = drawableHalf;
+        invalidate();
+    }
+
+    /**
+     * Sets filled drawable
+     *
+     * @param drawableFilled bitmap of your drawable
+     */
+    public void setDrawableFilled(Bitmap drawableFilled) {
+        this.mDrawableFilled = drawableFilled;
+        invalidate();
+    }
+
+    /**
+     * @return is it indicator or not
+     */
+    public boolean isIndicator() {
+        return mIsIndicator;
+    }
+
+    /**
+     * @return current rating
+     */
+    public float getRating() {
+        return mRating;
+    }
+
+    /**
+     * @return current max count
+     */
+    public int getMaxCount() {
+        return mMaxCount;
+    }
+
+    /**
+     * @return drawable size in px
+     */
+    public int getDrawableSize() {
+        return mDrawableSize;
+    }
+
+    /**
+     * @return drawable margin in px
+     */
+    public int getDrawableMargin() {
+        return mDrawableMargin;
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        SavedState savedState = new SavedState(superState);
+        savedState.mRating = mRating;
+        savedState.mIndicator = mIsIndicator;
+        return savedState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state instanceof SavedState) {
+            SavedState savedState = (SavedState) state;
+            super.onRestoreInstanceState(savedState.getSuperState());
+            mRating = savedState.mRating;
+            mIsIndicator = savedState.mIndicator;
+        } else {
+            super.onRestoreInstanceState(state);
+        }
+    }
+
+    static class SavedState extends BaseSavedState {
+
+        float mRating;
+        boolean mIndicator;
+
+        SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        private SavedState(Parcel in) {
+            super(in);
+            this.mRating = in.readFloat();
+            this.mIndicator = in.readInt() == 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel out, int flags) {
+            super.writeToParcel(out, flags);
+            out.writeFloat(this.mRating);
+            out.writeInt(this.mIndicator ? 1 : 0);
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_empty.png b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_empty.png
new file mode 100755
index 0000000..5caaccf
Binary files /dev/null and b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_empty.png differ
diff --git a/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_filled.png b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_filled.png
new file mode 100755
index 0000000..382f673
Binary files /dev/null and b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_filled.png differ
diff --git a/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_half.png b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_half.png
new file mode 100755
index 0000000..d95aaac
Binary files /dev/null and b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_half.png differ
diff --git a/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/values/attrs_rating_view.xml b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/values/attrs_rating_view.xml
new file mode 100755
index 0000000..aabfcd9
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/values/attrs_rating_view.xml
@@ -0,0 +1,12 @@
+<resources>
+    <declare-styleable name="RatingView">
+        <attr name="drawable_margin" format="dimension" />
+        <attr name="drawable_size" format="dimension"/>
+        <attr name="max_count" format="integer" />
+        <attr name="rating" format="float" />
+        <attr name="is_indicator" format="boolean" />
+        <attr name="drawable_empty" format="reference" />
+        <attr name="drawable_filled" format="reference" />
+        <attr name="drawable_half" format="reference" />
+    </declare-styleable>
+</resources>
diff --git a/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/values/strings.xml b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/values/strings.xml
new file mode 100755
index 0000000..eb16c6d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/rating-view/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">RatingView</string>
+</resources>
diff --git a/OnTime_Merchant_live/lib/RatingView/settings.gradle b/OnTime_Merchant_live/lib/RatingView/settings.gradle
new file mode 100755
index 0000000..36f3078
--- /dev/null
+++ b/OnTime_Merchant_live/lib/RatingView/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':rating-view'
diff --git a/OnTime_Merchant_live/lib/TextDrawable/.gitignore b/OnTime_Merchant_live/lib/TextDrawable/.gitignore
new file mode 100755
index 0000000..bba431a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/.gitignore
@@ -0,0 +1,32 @@
+#built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
+
+# Eclipse project files
+.classpath
+.project
+
+# Android Studio
+.idea
+#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
+.gradle
+build/
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/TextDrawable/LICENSE b/OnTime_Merchant_live/lib/TextDrawable/LICENSE
new file mode 100755
index 0000000..f864661
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Amulya Khare
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/OnTime_Merchant_live/lib/TextDrawable/README.md b/OnTime_Merchant_live/lib/TextDrawable/README.md
new file mode 100755
index 0000000..631c708
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/README.md
@@ -0,0 +1,133 @@
+###TextDrawable 
+This light-weight library provides images with letter/text like the Gmail app. It extends the `Drawable` class thus can be used with existing/custom/network `ImageView` classes. Also included is a [fluent interface](http://en.wikipedia.org/wiki/Fluent_interface) for creating drawables and a customizable `ColorGenerator`.
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen1-material.png" width="350"/>
+<img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen2-material.png" width="350"/>
+</p>
+
+###How to use
+
+#### Import with Gradle:
+
+```groovy
+repositories{
+    maven {
+        url 'http://dl.bintray.com/amulyakhare/maven'
+    }
+}
+
+dependencies {
+    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+}
+```
+
+####1. Create simple tile:
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen3.png"/>
+</p>
+
+```xml
+<ImageView android:layout_width="60dp"
+	       android:layout_height="60dp"
+	       android:id="@+id/image_view"/>
+```
+**Note:** Specify width/height for the `ImageView` and the `drawable` will auto-scale to fit the size.
+```java
+TextDrawable drawable = TextDrawable.builder()
+                .buildRect("A", Color.RED);
+
+ImageView image = (ImageView) findViewById(R.id.image_view);
+image.setImageDrawable(drawable);
+```
+
+####2. Create rounded corner or circular tiles:
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen6.png"/>
+</p>
+
+```java
+TextDrawable drawable1 = TextDrawable.builder()
+                .buildRoundRect("A", Color.RED, 10); // radius in px
+
+TextDrawable drawable2 = TextDrawable.builder()
+                .buildRound("A", Color.RED);
+```
+
+####3. Add border:
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen5.png"/>
+</p>
+
+```java
+TextDrawable drawable = TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(4) /* thickness in px */
+                .endConfig()
+                .buildRoundRect("A", Color.RED, 10);
+```
+
+####4. Modify font style:
+
+```java
+TextDrawable drawable = TextDrawable.builder()
+                .beginConfig()
+	                .textColor(Color.BLACK)
+                    .useFont(Typeface.DEFAULT)
+                    .fontSize(30) /* size in px */
+                    .bold()
+                    .toUpperCase()
+                .endConfig()
+                .buildRect("a", Color.RED)
+```
+
+####5. Built-in color generator:
+
+```java
+ColorGenerator generator = ColorGenerator.MATERIAL; // or use DEFAULT
+// generate random color
+int color1 = generator.getRandomColor();
+// generate color based on a key (same key returns the same color), useful for list/grid views
+int color2 = generator.getColor("user@gmail.com")
+
+// declare the builder object once.
+TextDrawable.IBuilder builder = TextDrawable.builder()
+				.beginConfig()
+					.withBorder(4)
+				.endConfig()
+				.rect();
+
+// reuse the builder specs to create multiple drawables
+TextDrawable ic1 = builder.build("A", color1);
+TextDrawable ic2 = builder.build("B", color2);
+``` 
+
+####6. Specify the width / height:
+
+```xml
+<ImageView android:layout_width="wrap_content"
+	       android:layout_height="wrap_content"
+	       android:id="@+id/image_view"/>
+```
+**Note:**  The `ImageView` could use `wrap_content` width/height. You could set the width/height of the `drawable` using code.
+
+```java
+TextDrawable drawable = TextDrawable.builder()
+				.beginConfig()
+					.width(60)  // width in px
+					.height(60) // height in px
+				.endConfig()
+                .buildRect("A", Color.RED);
+
+ImageView image = (ImageView) findViewById(R.id.image_view);
+image.setImageDrawable(drawable);
+```
+
+####7. Other features:
+
+1. Mix-match with other drawables. Use it in conjunction with `LayerDrawable`, `InsetDrawable`, `AnimationDrawable`, `TransitionDrawable` etc.
+
+2. Compatible with other views (not just `ImageView`). Use it as background drawable, compound drawable for `TextView`, `Button` etc.
+
+3. Use multiple letters or `unicode` characters to create interesting tiles. 
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen7.png" width="350"/></p>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/build.gradle b/OnTime_Merchant_live/lib/TextDrawable/build.gradle
new file mode 100755
index 0000000..3a8a17e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/build.gradle
@@ -0,0 +1,18 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.0'
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/OnTime_Merchant_live/lib/TextDrawable/gradle.properties b/OnTime_Merchant_live/lib/TextDrawable/gradle.properties
new file mode 100755
index 0000000..5d08ba7
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Settings specified in this file will override any Gradle settings
+# configured through the IDE.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/TextDrawable/gradle/wrapper/gradle-wrapper.properties b/OnTime_Merchant_live/lib/TextDrawable/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..ffc5028
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Mar 02 14:59:31 WIB 2026
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_Merchant_live/lib/TextDrawable/gradlew b/OnTime_Merchant_live/lib/TextDrawable/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_Merchant_live/lib/TextDrawable/gradlew.bat b/OnTime_Merchant_live/lib/TextDrawable/gradlew.bat
new file mode 100755
index 0000000..aec9973
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_Merchant_live/lib/TextDrawable/library/.gitignore b/OnTime_Merchant_live/lib/TextDrawable/library/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/library/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Merchant_live/lib/TextDrawable/library/build.gradle b/OnTime_Merchant_live/lib/TextDrawable/library/build.gradle
new file mode 100755
index 0000000..c3d6237
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/library/build.gradle
@@ -0,0 +1,39 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'com.amulyakhare.textdrawable'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 2
+        versionName "1.1"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/main/java'
+        }
+        resources {
+            srcDir 'src/main/res'
+        }
+    }
+}
+
+task sourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from sourceSets.main.java, sourceSets.main.resources
+}
diff --git a/OnTime_Merchant_live/lib/TextDrawable/library/proguard-rules.pro b/OnTime_Merchant_live/lib/TextDrawable/library/proguard-rules.pro
new file mode 100755
index 0000000..38b532c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/library/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/gardev/android/adt-bundle-linux/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Merchant_live/lib/TextDrawable/library/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/TextDrawable/library/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..19147dc
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/library/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest>
+    <application/>
+</manifest>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java b/OnTime_Merchant_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java
new file mode 100755
index 0000000..db42f8b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java
@@ -0,0 +1,316 @@
+package com.amulyakhare.textdrawable;
+
+import android.graphics.*;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.OvalShape;
+import android.graphics.drawable.shapes.RectShape;
+import android.graphics.drawable.shapes.RoundRectShape;
+
+/**
+ * @author amulya
+ * @datetime 14 Oct 2014, 3:53 PM
+ */
+public class TextDrawable extends ShapeDrawable {
+
+    private final Paint textPaint;
+    private final Paint borderPaint;
+    private static final float SHADE_FACTOR = 0.9f;
+    private final String text;
+    private final int color;
+    private final RectShape shape;
+    private final int height;
+    private final int width;
+    private final int fontSize;
+    private final float radius;
+    private final int borderThickness;
+
+    private TextDrawable(Builder builder) {
+        super(builder.shape);
+
+        // shape properties
+        shape = builder.shape;
+        height = builder.height;
+        width = builder.width;
+        radius = builder.radius;
+
+        // text and color
+        text = builder.toUpperCase ? builder.text.toUpperCase() : builder.text;
+        color = builder.color;
+
+        // text paint settings
+        fontSize = builder.fontSize;
+        textPaint = new Paint();
+        textPaint.setColor(builder.textColor);
+        textPaint.setAntiAlias(true);
+        textPaint.setFakeBoldText(builder.isBold);
+        textPaint.setStyle(Paint.Style.FILL);
+        textPaint.setTypeface(builder.font);
+        textPaint.setTextAlign(Paint.Align.CENTER);
+        textPaint.setStrokeWidth(builder.borderThickness);
+
+        // border paint settings
+        borderThickness = builder.borderThickness;
+        borderPaint = new Paint();
+        borderPaint.setColor(getDarkerShade(color));
+        borderPaint.setStyle(Paint.Style.STROKE);
+        borderPaint.setStrokeWidth(borderThickness);
+
+        // drawable paint color
+        Paint paint = getPaint();
+        paint.setColor(color);
+
+    }
+
+    private int getDarkerShade(int color) {
+        return Color.rgb((int)(SHADE_FACTOR * Color.red(color)),
+                (int)(SHADE_FACTOR * Color.green(color)),
+                (int)(SHADE_FACTOR * Color.blue(color)));
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
+        Rect r = getBounds();
+
+
+        // draw border
+        if (borderThickness > 0) {
+            drawBorder(canvas);
+        }
+
+        int count = canvas.save();
+        canvas.translate(r.left, r.top);
+
+        // draw text
+        int width = this.width < 0 ? r.width() : this.width;
+        int height = this.height < 0 ? r.height() : this.height;
+        int fontSize = this.fontSize < 0 ? (Math.min(width, height) / 2) : this.fontSize;
+        textPaint.setTextSize(fontSize);
+        canvas.drawText(text, width / 2, height / 2 - ((textPaint.descent() + textPaint.ascent()) / 2), textPaint);
+
+        canvas.restoreToCount(count);
+
+    }
+
+    private void drawBorder(Canvas canvas) {
+        RectF rect = new RectF(getBounds());
+        rect.inset(borderThickness/2, borderThickness/2);
+
+        if (shape instanceof OvalShape) {
+            canvas.drawOval(rect, borderPaint);
+        }
+        else if (shape instanceof RoundRectShape) {
+            canvas.drawRoundRect(rect, radius, radius, borderPaint);
+        }
+        else {
+            canvas.drawRect(rect, borderPaint);
+        }
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        textPaint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter cf) {
+        textPaint.setColorFilter(cf);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return width;
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return height;
+    }
+
+    public static IShapeBuilder builder() {
+        return new Builder();
+    }
+
+    public static class Builder implements IConfigBuilder, IShapeBuilder, IBuilder {
+
+        private String text;
+
+        private int color;
+
+        private int borderThickness;
+
+        private int width;
+
+        private int height;
+
+        private Typeface font;
+
+        private RectShape shape;
+
+        public int textColor;
+
+        private int fontSize;
+
+        private boolean isBold;
+
+        private boolean toUpperCase;
+
+        public float radius;
+
+        private Builder() {
+            text = "";
+            color = Color.GRAY;
+            textColor = Color.WHITE;
+            borderThickness = 0;
+            width = -1;
+            height = -1;
+            shape = new RectShape();
+            font = Typeface.create("sans-serif-light", Typeface.NORMAL);
+            fontSize = -1;
+            isBold = false;
+            toUpperCase = false;
+        }
+
+        public IConfigBuilder width(int width) {
+            this.width = width;
+            return this;
+        }
+
+        public IConfigBuilder height(int height) {
+            this.height = height;
+            return this;
+        }
+
+        public IConfigBuilder textColor(int color) {
+            this.textColor = color;
+            return this;
+        }
+
+        public IConfigBuilder withBorder(int thickness) {
+            this.borderThickness = thickness;
+            return this;
+        }
+
+        public IConfigBuilder useFont(Typeface font) {
+            this.font = font;
+            return this;
+        }
+
+        public IConfigBuilder fontSize(int size) {
+            this.fontSize = size;
+            return this;
+        }
+
+        public IConfigBuilder bold() {
+            this.isBold = true;
+            return this;
+        }
+
+        public IConfigBuilder toUpperCase() {
+            this.toUpperCase = true;
+            return this;
+        }
+
+        @Override
+        public IConfigBuilder beginConfig() {
+            return this;
+        }
+
+        @Override
+        public IShapeBuilder endConfig() {
+            return this;
+        }
+
+        @Override
+        public IBuilder rect() {
+            this.shape = new RectShape();
+            return this;
+        }
+
+        @Override
+        public IBuilder round() {
+            this.shape = new OvalShape();
+            return this;
+        }
+
+        @Override
+        public IBuilder roundRect(int radius) {
+            this.radius = radius;
+            float[] radii = {radius, radius, radius, radius, radius, radius, radius, radius};
+            this.shape = new RoundRectShape(radii, null, null);
+            return this;
+        }
+
+        @Override
+        public TextDrawable buildRect(String text, int color) {
+            rect();
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable buildRoundRect(String text, int color, int radius) {
+            roundRect(radius);
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable buildRound(String text, int color) {
+            round();
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable build(String text, int color) {
+            this.color = color;
+            this.text = text;
+            return new TextDrawable(this);
+        }
+    }
+
+    public interface IConfigBuilder {
+        public IConfigBuilder width(int width);
+
+        public IConfigBuilder height(int height);
+
+        public IConfigBuilder textColor(int color);
+
+        public IConfigBuilder withBorder(int thickness);
+
+        public IConfigBuilder useFont(Typeface font);
+
+        public IConfigBuilder fontSize(int size);
+
+        public IConfigBuilder bold();
+
+        public IConfigBuilder toUpperCase();
+
+        public IShapeBuilder endConfig();
+    }
+
+    public static interface IBuilder {
+
+        public TextDrawable build(String text, int color);
+    }
+
+    public static interface IShapeBuilder {
+
+        public IConfigBuilder beginConfig();
+
+        public IBuilder rect();
+
+        public IBuilder round();
+
+        public IBuilder roundRect(int radius);
+
+        public TextDrawable buildRect(String text, int color);
+
+        public TextDrawable buildRoundRect(String text, int color, int radius);
+
+        public TextDrawable buildRound(String text, int color);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java b/OnTime_Merchant_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java
new file mode 100755
index 0000000..198c18f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java
@@ -0,0 +1,69 @@
+package com.amulyakhare.textdrawable.util;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * @author amulya
+ * @datetime 14 Oct 2014, 5:20 PM
+ */
+public class ColorGenerator {
+
+    public static ColorGenerator DEFAULT;
+
+    public static ColorGenerator MATERIAL;
+
+    static {
+        DEFAULT = create(Arrays.asList(
+                0xfff16364,
+                0xfff58559,
+                0xfff9a43e,
+                0xffe4c62e,
+                0xff67bf74,
+                0xff59a2be,
+                0xff2093cd,
+                0xffad62a7,
+                0xff805781
+        ));
+        MATERIAL = create(Arrays.asList(
+                0xffe57373,
+                0xfff06292,
+                0xffba68c8,
+                0xff9575cd,
+                0xff7986cb,
+                0xff64b5f6,
+                0xff4fc3f7,
+                0xff4dd0e1,
+                0xff4db6ac,
+                0xff81c784,
+                0xffaed581,
+                0xffff8a65,
+                0xffd4e157,
+                0xffffd54f,
+                0xffffb74d,
+                0xffa1887f,
+                0xff90a4ae
+        ));
+    }
+
+    private final List<Integer> mColors;
+    private final Random mRandom;
+
+    public static ColorGenerator create(List<Integer> colorList) {
+        return new ColorGenerator(colorList);
+    }
+
+    private ColorGenerator(List<Integer> colorList) {
+        mColors = colorList;
+        mRandom = new Random(System.currentTimeMillis());
+    }
+
+    public int getRandomColor() {
+        return mColors.get(mRandom.nextInt(mColors.size()));
+    }
+
+    public int getColor(Object key) {
+        return mColors.get(Math.abs(key.hashCode()) % mColors.size());
+    }
+}
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/.gitignore b/OnTime_Merchant_live/lib/TextDrawable/sample/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/build.gradle b/OnTime_Merchant_live/lib/TextDrawable/sample/build.gradle
new file mode 100755
index 0000000..85e0728
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.1"
+
+    defaultConfig {
+        applicationId "com.amulyakhare.td"
+        minSdkVersion 10
+        targetSdkVersion 21
+        versionCode 2
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(':library')
+    compile 'com.android.support:appcompat-v7:21.0.3'
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/proguard-rules.pro b/OnTime_Merchant_live/lib/TextDrawable/sample/proguard-rules.pro
new file mode 100755
index 0000000..38b532c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/gardev/android/adt-bundle-linux/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..3f1ab69
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.amulyakhare.td" >
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.amulyakhare.td.sample.MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.amulyakhare.td.sample.ListActivity"
+            android:label="@string/title_activity_check_box" >
+        </activity>
+    </application>
+
+</manifest>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/ListActivity.java b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/ListActivity.java
new file mode 100755
index 0000000..f9832d7
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/ListActivity.java
@@ -0,0 +1,193 @@
+package com.amulyakhare.td.sample;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.amulyakhare.td.R;
+import com.amulyakhare.td.sample.sample.DrawableProvider;
+import com.amulyakhare.textdrawable.TextDrawable;
+import com.amulyakhare.textdrawable.util.ColorGenerator;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ListActivity extends ActionBarActivity {
+
+    private static final int HIGHLIGHT_COLOR = 0x999be6ff;
+
+    // list of data items
+    private List<ListData> mDataList = Arrays.asList(
+            new ListData("Iron Man"),
+            new ListData("Captain America"),
+            new ListData("James Bond"),
+            new ListData("Harry Potter"),
+            new ListData("Sherlock Holmes"),
+            new ListData("Black Widow"),
+            new ListData("Hawk Eye"),
+            new ListData("Iron Man"),
+            new ListData("Guava"),
+            new ListData("Tomato"),
+            new ListData("Pineapple"),
+            new ListData("Strawberry"),
+            new ListData("Watermelon"),
+            new ListData("Pears"),
+            new ListData("Kiwi"),
+            new ListData("Plums")
+    );
+
+    // declare the color generator and drawable builder
+    private ColorGenerator mColorGenerator = ColorGenerator.MATERIAL;
+    private TextDrawable.IBuilder mDrawableBuilder;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_list);
+
+        Intent intent = getIntent();
+        int type = intent.getIntExtra(MainActivity.TYPE, DrawableProvider.SAMPLE_RECT);
+
+        // initialize the builder based on the "TYPE"
+        switch (type) {
+            case DrawableProvider.SAMPLE_RECT:
+                mDrawableBuilder = TextDrawable.builder()
+                        .rect();
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT:
+                mDrawableBuilder = TextDrawable.builder()
+                        .roundRect(10);
+                break;
+            case DrawableProvider.SAMPLE_ROUND:
+                mDrawableBuilder = TextDrawable.builder()
+                        .round();
+                break;
+            case DrawableProvider.SAMPLE_RECT_BORDER:
+                mDrawableBuilder = TextDrawable.builder()
+                        .beginConfig()
+                            .withBorder(4)
+                        .endConfig()
+                        .rect();
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT_BORDER:
+                mDrawableBuilder = TextDrawable.builder()
+                        .beginConfig()
+                            .withBorder(4)
+                        .endConfig()
+                        .roundRect(10);
+                break;
+            case DrawableProvider.SAMPLE_ROUND_BORDER:
+                mDrawableBuilder = TextDrawable.builder()
+                        .beginConfig()
+                            .withBorder(4)
+                        .endConfig()
+                        .round();
+                break;
+        }
+
+        // init the list view and its adapter
+        ListView listView = (ListView) findViewById(R.id.listView);
+        listView.setAdapter(new SampleAdapter());
+    }
+
+    private class SampleAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return mDataList.size();
+        }
+
+        @Override
+        public ListData getItem(int position) {
+            return mDataList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(final int position, View convertView, ViewGroup parent) {
+            final ViewHolder holder;
+            if (convertView == null) {
+                convertView = View.inflate(ListActivity.this, R.layout.list_item_layout, null);
+                holder = new ViewHolder(convertView);
+                convertView.setTag(holder);
+            } else {
+                holder = (ViewHolder) convertView.getTag();
+            }
+
+            ListData item = getItem(position);
+
+            // provide support for selected state
+            updateCheckedState(holder, item);
+            holder.imageView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    // when the image is clicked, update the selected state
+                    ListData data = getItem(position);
+                    data.setChecked(!data.isChecked);
+                    updateCheckedState(holder, data);
+                }
+            });
+            holder.textView.setText(item.data);
+
+            return convertView;
+        }
+
+        private void updateCheckedState(ViewHolder holder, ListData item) {
+            if (item.isChecked) {
+                holder.imageView.setImageDrawable(mDrawableBuilder.build(" ", 0xff616161));
+                holder.view.setBackgroundColor(HIGHLIGHT_COLOR);
+                holder.checkIcon.setVisibility(View.VISIBLE);
+            }
+            else {
+                TextDrawable drawable = mDrawableBuilder.build(String.valueOf(item.data.charAt(0)), mColorGenerator.getColor(item.data));
+                holder.imageView.setImageDrawable(drawable);
+                holder.view.setBackgroundColor(Color.TRANSPARENT);
+                holder.checkIcon.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    private static class ViewHolder {
+
+        private View view;
+
+        private ImageView imageView;
+
+        private TextView textView;
+
+        private ImageView checkIcon;
+
+        private ViewHolder(View view) {
+            this.view = view;
+            imageView = (ImageView) view.findViewById(R.id.imageView);
+            textView = (TextView) view.findViewById(R.id.textView);
+            checkIcon = (ImageView) view.findViewById(R.id.check_icon);
+        }
+    }
+
+    private static class ListData {
+
+        private String data;
+
+        private boolean isChecked;
+
+        public ListData(String data) {
+            this.data = data;
+        }
+
+        public void setChecked(boolean isChecked) {
+            this.isChecked = isChecked;
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/MainActivity.java b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/MainActivity.java
new file mode 100755
index 0000000..fd2ca43
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/MainActivity.java
@@ -0,0 +1,119 @@
+package com.amulyakhare.td.sample;
+
+import android.content.Intent;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.*;
+
+import com.amulyakhare.td.R;
+import com.amulyakhare.td.sample.sample.DataItem;
+import com.amulyakhare.td.sample.sample.DataSource;
+
+public class MainActivity extends ActionBarActivity implements AdapterView.OnItemClickListener {
+
+    public static final String TYPE = "TYPE";
+    private DataSource mDataSource;
+    private ListView mListView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        mListView = (ListView) findViewById(R.id.listView);
+        mDataSource = new DataSource(this);
+        mListView.setAdapter(new SampleAdapter());
+        mListView.setOnItemClickListener(this);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        DataItem item = (DataItem) mListView.getItemAtPosition(position);
+
+        // if navigation is supported, open the next activity
+        if (item.getNavigationInfo() != DataSource.NO_NAVIGATION) {
+            Intent intent = new Intent(this, ListActivity.class);
+            intent.putExtra(TYPE, item.getNavigationInfo());
+            startActivity(intent);
+        }
+    }
+
+    private class SampleAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return mDataSource.getCount();
+        }
+
+        @Override
+        public DataItem getItem(int position) {
+            return mDataSource.getItem(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder holder;
+            if (convertView == null) {
+                convertView = View.inflate(MainActivity.this, R.layout.list_item_layout, null);
+                holder = new ViewHolder(convertView);
+                convertView.setTag(holder);
+            } else {
+                holder = (ViewHolder) convertView.getTag();
+            }
+
+            DataItem item = getItem(position);
+
+            final Drawable drawable = item.getDrawable();
+            holder.imageView.setImageDrawable(drawable);
+            holder.textView.setText(item.getLabel());
+
+            // if navigation is supported, show the ">" navigation icon
+            if (item.getNavigationInfo() != DataSource.NO_NAVIGATION) {
+                holder.textView.setCompoundDrawablesWithIntrinsicBounds(null,
+                        null,
+                        getResources().getDrawable(R.drawable.ic_action_next_item),
+                        null);
+            }
+            else {
+                holder.textView.setCompoundDrawablesWithIntrinsicBounds(null,
+                        null,
+                        null,
+                        null);
+            }
+
+            // fix for animation not playing for some below 4.4 devices
+            if (drawable instanceof AnimationDrawable) {
+                holder.imageView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        ((AnimationDrawable) drawable).stop();
+                        ((AnimationDrawable) drawable).start();
+                    }
+                });
+            }
+
+            return convertView;
+        }
+    }
+
+    private static class ViewHolder {
+
+        private ImageView imageView;
+
+        private TextView textView;
+
+        private ViewHolder(View view) {
+            imageView = (ImageView) view.findViewById(R.id.imageView);
+            textView = (TextView) view.findViewById(R.id.textView);
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataItem.java b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataItem.java
new file mode 100755
index 0000000..30b247d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataItem.java
@@ -0,0 +1,34 @@
+package com.amulyakhare.td.sample.sample;
+
+import android.graphics.drawable.Drawable;
+
+/**
+ * @author amulya
+ * @datetime 17 Oct 2014, 3:50 PM
+ */
+public class DataItem {
+
+    private String label;
+
+    private Drawable drawable;
+
+    private int navigationInfo;
+
+    public DataItem(String label, Drawable drawable, int navigationInfo) {
+        this.label = label;
+        this.drawable = drawable;
+        this.navigationInfo = navigationInfo;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public Drawable getDrawable() {
+        return drawable;
+    }
+
+    public int getNavigationInfo() {
+        return navigationInfo;
+    }
+}
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataSource.java b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataSource.java
new file mode 100755
index 0000000..8180a84
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataSource.java
@@ -0,0 +1,99 @@
+package com.amulyakhare.td.sample.sample;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import java.util.ArrayList;
+
+/**
+ * @author amulya
+ * @datetime 17 Oct 2014, 3:49 PM
+ */
+public class DataSource {
+
+    public static final int NO_NAVIGATION = -1;
+
+    private ArrayList<DataItem> mDataSource;
+    private DrawableProvider mProvider;
+
+    public DataSource(Context context) {
+        mProvider = new DrawableProvider(context);
+        mDataSource = new ArrayList<DataItem>();
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_RECT));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND_RECT));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_RECT_BORDER));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND_RECT_BORDER));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND_BORDER));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_MULTIPLE_LETTERS));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_FONT));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_SIZE));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ANIMATION));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_MISC));
+    }
+
+    public int getCount() {
+        return mDataSource.size();
+    }
+
+    public DataItem getItem(int position) {
+        return mDataSource.get(position);
+    }
+
+    private DataItem itemFromType(int type) {
+        String label = null;
+        Drawable drawable = null;
+        switch (type) {
+            case DrawableProvider.SAMPLE_RECT:
+                label = "Rectangle with Text";
+                drawable = mProvider.getRect("A");
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT:
+                label = "Round Corner with Text";
+                drawable = mProvider.getRoundRect("B");
+                break;
+            case DrawableProvider.SAMPLE_ROUND:
+                label = "Round with Text";
+                drawable = mProvider.getRound("C");
+                break;
+            case DrawableProvider.SAMPLE_RECT_BORDER:
+                label = "Rectangle with Border";
+                drawable = mProvider.getRectWithBorder("D");
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT_BORDER:
+                label = "Round Corner with Border";
+                drawable = mProvider.getRoundRectWithBorder("E");
+                break;
+            case DrawableProvider.SAMPLE_ROUND_BORDER:
+                label = "Round with Border";
+                drawable = mProvider.getRoundWithBorder("F");
+                break;
+            case DrawableProvider.SAMPLE_MULTIPLE_LETTERS:
+                label = "Support multiple letters";
+                drawable = mProvider.getRectWithMultiLetter();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_FONT:
+                label = "Support variable font styles";
+                drawable = mProvider.getRoundWithCustomFont();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_SIZE:
+                label = "Support for custom size";
+                drawable = mProvider.getRectWithCustomSize();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_ANIMATION:
+                label = "Support for animations";
+                drawable = mProvider.getRectWithAnimation();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_MISC:
+                label = "Miscellaneous";
+                drawable =  mProvider.getRect("\u03c0");
+                type = NO_NAVIGATION;
+                break;
+        }
+        return new DataItem(label, drawable, type);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DrawableProvider.java b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DrawableProvider.java
new file mode 100755
index 0000000..e183b11
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DrawableProvider.java
@@ -0,0 +1,146 @@
+package com.amulyakhare.td.sample.sample;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.InsetDrawable;
+import android.graphics.drawable.LayerDrawable;
+import android.util.TypedValue;
+
+import com.amulyakhare.textdrawable.TextDrawable;
+import com.amulyakhare.textdrawable.util.ColorGenerator;
+
+/**
+ * @author amulya
+ * @datetime 17 Oct 2014, 4:02 PM
+ */
+public class DrawableProvider {
+
+    public static final int SAMPLE_RECT = 1;
+    public static final int SAMPLE_ROUND_RECT = 2;
+    public static final int SAMPLE_ROUND = 3;
+    public static final int SAMPLE_RECT_BORDER = 4;
+    public static final int SAMPLE_ROUND_RECT_BORDER = 5;
+    public static final int SAMPLE_ROUND_BORDER = 6;
+    public static final int SAMPLE_MULTIPLE_LETTERS = 7;
+    public static final int SAMPLE_FONT = 8;
+    public static final int SAMPLE_SIZE = 9;
+    public static final int SAMPLE_ANIMATION = 10;
+    public static final int SAMPLE_MISC = 11;
+
+    private final ColorGenerator mGenerator;
+    private final Context mContext;
+
+    public DrawableProvider(Context context) {
+        mGenerator = ColorGenerator.DEFAULT;
+        mContext = context;
+    }
+
+    public TextDrawable getRect(String text) {
+        return TextDrawable.builder()
+                .buildRect(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRound(String text) {
+        return TextDrawable.builder()
+                .buildRound(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundRect(String text) {
+        return TextDrawable.builder()
+                .buildRoundRect(text, mGenerator.getColor(text), toPx(10));
+    }
+
+    public TextDrawable getRectWithBorder(String text) {
+        return TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(toPx(2))
+                .endConfig()
+                .buildRect(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundWithBorder(String text) {
+        return TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(toPx(2))
+                .endConfig()
+                .buildRound(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundRectWithBorder(String text) {
+        return TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(toPx(2))
+                .endConfig()
+                .buildRoundRect(text, mGenerator.getColor(text), toPx(10));
+    }
+
+    public TextDrawable getRectWithMultiLetter() {
+        String text = "AK";
+        return TextDrawable.builder()
+                .beginConfig()
+                    .fontSize(toPx(20))
+                    .toUpperCase()
+                .endConfig()
+                .buildRect(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundWithCustomFont() {
+        String text = "Bold";
+        return TextDrawable.builder()
+                .beginConfig()
+                    .useFont(Typeface.DEFAULT)
+                    .fontSize(toPx(15))
+                    .textColor(0xfff58559)
+                    .bold()
+                .endConfig()
+                .buildRect(text, Color.DKGRAY /*toPx(5)*/);
+    }
+
+    public Drawable getRectWithCustomSize() {
+        String leftText = "I";
+        String rightText = "J";
+
+        TextDrawable.IBuilder builder = TextDrawable.builder()
+                .beginConfig()
+                    .width(toPx(29))
+                    .withBorder(toPx(2))
+                .endConfig()
+                .rect();
+
+        TextDrawable left = builder
+                .build(leftText, mGenerator.getColor(leftText));
+
+        TextDrawable right = builder
+                .build(rightText, mGenerator.getColor(rightText));
+
+        Drawable[] layerList = {
+                new InsetDrawable(left, 0, 0, toPx(31), 0),
+                new InsetDrawable(right, toPx(31), 0, 0, 0)
+        };
+        return new LayerDrawable(layerList);
+    }
+
+    public Drawable getRectWithAnimation() {
+        TextDrawable.IBuilder builder = TextDrawable.builder()
+                .rect();
+
+        AnimationDrawable animationDrawable = new AnimationDrawable();
+        for (int i = 10; i > 0; i--) {
+            TextDrawable frame = builder.build(String.valueOf(i), mGenerator.getRandomColor());
+            animationDrawable.addFrame(frame, 1200);
+        }
+        animationDrawable.setOneShot(false);
+        animationDrawable.start();
+
+        return animationDrawable;
+    }
+
+    public int toPx(int dp) {
+        Resources resources = mContext.getResources();
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, resources.getDisplayMetrics());
+    }
+}
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_alpha.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_alpha.png
new file mode 100755
index 0000000..8fc3239
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_alpha.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm.9.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm.9.png
new file mode 100755
index 0000000..7cf7352
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm.9.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm1.9.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm1.9.png
new file mode 100755
index 0000000..7d2fcc0
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm1.9.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_action_next_item.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_action_next_item.png
new file mode 100755
index 0000000..67f1482
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_action_next_item.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_launcher.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100755
index 0000000..96a442e
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-ldpi/check_sm.9.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-ldpi/check_sm.9.png
new file mode 100755
index 0000000..1dbf4f7
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-ldpi/check_sm.9.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/check_sm.9.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/check_sm.9.png
new file mode 100755
index 0000000..d44d02c
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/check_sm.9.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_action_next_item.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_action_next_item.png
new file mode 100755
index 0000000..47365a3
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_action_next_item.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_launcher.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100755
index 0000000..359047d
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/check_sm.9.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/check_sm.9.png
new file mode 100755
index 0000000..9981a75
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/check_sm.9.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_action_next_item.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_action_next_item.png
new file mode 100755
index 0000000..5f30474
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_action_next_item.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..71c6d76
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/check_sm.9.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/check_sm.9.png
new file mode 100755
index 0000000..8766797
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/check_sm.9.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_action_next_item.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_action_next_item.png
new file mode 100755
index 0000000..51479d8
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_action_next_item.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..4df1894
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/activity_check_box.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/activity_check_box.xml
new file mode 100755
index 0000000..cd5a02c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/activity_check_box.xml
@@ -0,0 +1,16 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.amulyakhare.td.sample.ListActivity">
+
+    <ImageButton
+        android:id="@+id/imageButton"
+        android:layout_width="100dp"
+        android:layout_height="100dp" />
+
+</RelativeLayout>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/activity_list.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/activity_list.xml
new file mode 100755
index 0000000..b87aee7
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/activity_list.xml
@@ -0,0 +1,8 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/listView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.amulyakhare.td.sample.MiscActivity">
+
+</ListView>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/activity_main.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..c3942ff
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/activity_main.xml
@@ -0,0 +1,8 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          android:id="@+id/listView"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          tools:context="com.amulyakhare.td.sample.MiscActivity">
+
+</ListView>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/list_item_layout.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/list_item_layout.xml
new file mode 100755
index 0000000..bd69f42
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/layout/list_item_layout.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:padding="16dp"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <FrameLayout
+        android:layout_marginRight="16dp"
+        android:layout_width="60dp"
+        android:layout_height="60dp">
+
+        <ImageView
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:id="@+id/imageView"/>
+
+        <ImageView
+            android:visibility="gone"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:src="@drawable/check_sm"
+            android:id="@+id/check_icon"/>
+    </FrameLayout>
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:id="@+id/textView"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/menu/check_box.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/menu/check_box.xml
new file mode 100755
index 0000000..734bf82
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/menu/check_box.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.amulyakhare.td.sample.ListActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/menu/list.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/menu/list.xml
new file mode 100755
index 0000000..77fb30e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/menu/list.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.amulyakhare.td.sample.MiscActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/menu/main.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/menu/main.xml
new file mode 100755
index 0000000..7fe7424
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/menu/main.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".MainActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values-w820dp/dimens.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values/dimens.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..47c8224
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values/strings.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values/strings.xml
new file mode 100755
index 0000000..6e1ab46
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">TextDrawable Sample</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
+    <string name="title_activity_list">TextDrawable Sample</string>
+    <string name="title_activity_check_box">TextDrawable Sample</string>
+
+</resources>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values/styles.xml b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values/styles.xml
new file mode 100755
index 0000000..766ab99
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/sample/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+    </style>
+
+</resources>
diff --git a/OnTime_Merchant_live/lib/TextDrawable/screens/screen1-material.png b/OnTime_Merchant_live/lib/TextDrawable/screens/screen1-material.png
new file mode 100755
index 0000000..b8bfdbb
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/screens/screen1-material.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/screens/screen1.png b/OnTime_Merchant_live/lib/TextDrawable/screens/screen1.png
new file mode 100755
index 0000000..8fc9e8f
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/screens/screen1.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/screens/screen2-material.png b/OnTime_Merchant_live/lib/TextDrawable/screens/screen2-material.png
new file mode 100755
index 0000000..77c9b6b
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/screens/screen2-material.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/screens/screen2.png b/OnTime_Merchant_live/lib/TextDrawable/screens/screen2.png
new file mode 100755
index 0000000..dc0afad
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/screens/screen2.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/screens/screen3.png b/OnTime_Merchant_live/lib/TextDrawable/screens/screen3.png
new file mode 100755
index 0000000..7d3e5f3
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/screens/screen3.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/screens/screen4.png b/OnTime_Merchant_live/lib/TextDrawable/screens/screen4.png
new file mode 100755
index 0000000..0099dab
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/screens/screen4.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/screens/screen5.png b/OnTime_Merchant_live/lib/TextDrawable/screens/screen5.png
new file mode 100755
index 0000000..686c636
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/screens/screen5.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/screens/screen6.png b/OnTime_Merchant_live/lib/TextDrawable/screens/screen6.png
new file mode 100755
index 0000000..140e120
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/screens/screen6.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/screens/screen7.png b/OnTime_Merchant_live/lib/TextDrawable/screens/screen7.png
new file mode 100755
index 0000000..c3d2b69
Binary files /dev/null and b/OnTime_Merchant_live/lib/TextDrawable/screens/screen7.png differ
diff --git a/OnTime_Merchant_live/lib/TextDrawable/settings.gradle b/OnTime_Merchant_live/lib/TextDrawable/settings.gradle
new file mode 100755
index 0000000..2b99c92
--- /dev/null
+++ b/OnTime_Merchant_live/lib/TextDrawable/settings.gradle
@@ -0,0 +1,4 @@
+include ':sample'
+
+include 'library'
+project(':library').projectDir = new File('library')
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/.circleci/config.yml b/OnTime_Merchant_live/lib/flexbox-layout/.circleci/config.yml
new file mode 100755
index 0000000..7666cf3
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/.circleci/config.yml
@@ -0,0 +1,51 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/code
+    docker:
+      - image: circleci/android:api-29
+    environment:
+      JVM_OPTS: -Xmx3200m
+      MAX_RETRY: 4
+    steps:
+      - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "flexbox/build.gradle" }}
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies
+      - run:
+          name: Set up gcloud service key
+          command: |
+            if [ -n "$GCLOUD_SERVICE_KEY" ]; then echo ${GCLOUD_SERVICE_KEY} | base64 --decode > ${HOME}/client-secret.json ;
+                gcloud config set project ${GCLOUD_PROJECT} ;
+                gcloud auth activate-service-account ${GCLOUD_SERVICE_ACCOUNT} --key-file ${HOME}/client-secret.json ;
+            fi
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "flexbox/build.gradle" }}
+      - run:
+          name: Build apks
+          command: ./gradlew build assembleAndroidTest
+      - run:
+          name: Run Firebase Test Lab
+          command: |
+            if [ -n "$GCLOUD_SERVICE_KEY" ]; then set +e ;
+              counter=0 ;
+              result=1 ;
+              while [ $result != 0 -a $counter -lt $MAX_RETRY ]; do
+                gcloud firebase test android run \
+                  --type instrumentation \
+                  --app demo-playground/build/outputs/apk/debug/demo-playground-debug.apk \
+                  --test flexbox/build/outputs/apk/androidTest/debug/flexbox-debug-androidTest.apk \
+                  --device-ids hammerhead,sailfish \
+                  --os-version-ids 19,21,23,24,25,26 \
+                  --locales en --orientations portrait,landscape \
+                  --results-bucket android-devrel-ci-flexbox \
+                  --timeout 180s ;
+                result=$? ;
+                let counter=counter+1 ;
+              done
+              exit $result ;
+            fi
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/.github/issue_template.md b/OnTime_Merchant_live/lib/flexbox-layout/.github/issue_template.md
new file mode 100755
index 0000000..cc9edf0
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/.github/issue_template.md
@@ -0,0 +1,15 @@
+- [ ] I have searched [existing issues](https://github.com/google/flexbox-layout/issues) and confirmed this is not a duplicate
+
+## Issues and steps to reproduce
+*Please replace this with steps to reproduce your issue.*
+
+## Expected behavior
+*Please describe what you expected would happen.*
+
+## Version of the flexbox library
+*e.g. 0.2.6, 0.3.0-alpha3*
+
+## Link to code
+*Please link to the code we can use to reproduce this issue.*
+*A complete project we can build/run is preferred, if you can't provide one, please show*
+*us relevant code*
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/.github/workflows/gradle-wrapper-validation.yml b/OnTime_Merchant_live/lib/flexbox-layout/.github/workflows/gradle-wrapper-validation.yml
new file mode 100755
index 0000000..405a2b3
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/.gitignore b/OnTime_Merchant_live/lib/flexbox-layout/.gitignore
new file mode 100755
index 0000000..113ffcc
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/.gitignore
@@ -0,0 +1,50 @@
+*.iml
+.gradle
+.idea/
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+!.idea/codeStyleSettings.xml
+.DS_Store
+/build
+/captures
+.vscode/
+
+# Taken from Android.gitignore https://github.com/github/gitignore/blob/master/Android.gitignore
+#
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/CONTRIBUTING.md b/OnTime_Merchant_live/lib/flexbox-layout/CONTRIBUTING.md
new file mode 100755
index 0000000..050f92a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/CONTRIBUTING.md
@@ -0,0 +1,45 @@
+# How to become a contributor and submit your own code
+
+## Contributor License Agreements
+
+We'd love to accept your sample apps and patches! Before we can take them, we
+have to jump a couple of legal hurdles.
+
+Please fill out either the individual or corporate Contributor License Agreement (CLA).
+
+  * If you are an individual writing original source code and you're sure you
+    own the intellectual property, then you'll need to sign an [individual CLA]
+    (https://cla.developers.google.com).
+  * If you work for a company that wants to allow you to contribute your work,
+    then you'll need to sign a [corporate CLA]
+    (https://cla.developers.google.com).
+
+Follow either of the two links above to access the appropriate CLA and
+instructions for how to sign and return it. Once we receive it, we'll be able to
+accept your pull requests.
+
+## Contributing A Patch
+
+1. Submit an issue describing your proposed change to the repo in question.
+1. The repo owner will respond to your issue promptly.
+1. If your proposed change is accepted, and you haven't already done so, sign a
+   Contributor License Agreement (see details above).
+1. Fork the desired repo, develop and test your code changes.
+1. Ensure that your code adheres to the existing style in the sample to which
+   you are contributing. Refer to the
+   [Android Code Style Guide]
+   (https://source.android.com/source/code-style.html) for the
+   recommended coding standards for this organization.
+1. Ensure that your code has an appropriate set of unit tests which all pass.
+1. Submit a pull request.
+
+## Code Style
+
+This repository follows the official Android code style.
+When you send a patch, please try to follow that.
+Here are the example steps to follow:
+
+1. From Android Studio or IntelliJ IDEA, navigate to "Preferences" -> "Editor" -> "Code Style"
+1. Select "Import Scheme" by clicking the gear icon next to the Scheme pull down
+1. Choose <root directory of flexbox-layout>/tool/codeStyleSettings.xml
+1. Create a new scheme by typing a scheme name in the "To" edit box or apply to the current scheme.
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/LICENSE b/OnTime_Merchant_live/lib/flexbox-layout/LICENSE
new file mode 100755
index 0000000..b397cbe
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018 Google LLC
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/README.md b/OnTime_Merchant_live/lib/flexbox-layout/README.md
new file mode 100755
index 0000000..85c9057
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/README.md
@@ -0,0 +1,407 @@
+# FlexboxLayout
+[ ![Circle CI](https://circleci.com/gh/google/flexbox-layout.svg?style=shield&circle-token=2a42716dfffab73d73c5ce7ed7b3ee620cfa137b) ](https://circleci.com/gh/google/flexbox-layout/tree/main)
+
+FlexboxLayout is a library project which brings the similar capabilities of
+[CSS Flexible Box Layout Module](https://www.w3.org/TR/css-flexbox-1) to Android.
+
+# Installation
+Add the following dependency to your `build.gradle` file:
+
+```
+dependencies {
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
+}
+```
+
+**Starting from 3.0.0, the groupId is changed to `com.google.android.flexbox` in preparation to uploading the artifacts to google maven.
+You can still download the artifacts from jcenter for the past versions with the prior groupId (`com.google.android`), but migrating the library 3.0.0 is recommended.**
+
+Note that the default values for `alignItems` and `alignContent` for `FlexboxLayout` have been changed from `stretch` to `flex_start` starting from 2.0.0, it may break the existing apps.
+Please make sure to set `stretch` explicitly if you want to apply the behavior of `stretch`.
+
+
+Note that starting from 1.1.0, the library is expeced to use with AndroidX. Please migrate to [AndroidX](https://developer.android.com/jetpack/androidx/migrate) if you use 1.1.0 or above.
+
+Please use 1.0.0 if you haven't migrated to AndroidX.
+
+
+# Usage
+There are two ways of using Flexbox in your layout.
+
+## FlexboxLayout
+The first one is `FlexboxLayout` that extends the `ViewGroup` like `LinearLayout` and `RelativeLayout`.
+You can specify the attributes from a layout XML like:
+```xml
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/textview1"
+        android:layout_width="120dp"
+        android:layout_height="80dp"
+        app:layout_flexBasisPercent="50%"
+        />
+
+    <TextView
+        android:id="@+id/textview2"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        app:layout_alignSelf="center"
+        />
+
+    <TextView
+        android:id="@+id/textview3"
+        android:layout_width="160dp"
+        android:layout_height="80dp"
+        app:layout_alignSelf="flex_end"
+        />
+</com.google.android.flexbox.FlexboxLayout>
+```
+
+Or from code like:
+```java
+FlexboxLayout flexboxLayout = (FlexboxLayout) findViewById(R.id.flexbox_layout);
+flexboxLayout.setFlexDirection(FlexDirection.ROW);
+
+View view = flexboxLayout.getChildAt(0);
+FlexboxLayout.LayoutParams lp = (FlexboxLayout.LayoutParams) view.getLayoutParams();
+lp.setOrder(-1);
+lp.setFlexGrow(2);
+view.setLayoutParams(lp);
+```
+
+## FlexboxLayoutManager (within RecyclerView)
+The second one is `FlexboxLayoutManager` that can be used within `RecyclerView`.
+
+```java
+RecyclerView recyclerView = (RecyclerView) context.findViewById(R.id.recyclerview);
+FlexboxLayoutManager layoutManager = new FlexboxLayoutManager(context);
+layoutManager.setFlexDirection(FlexDirection.COLUMN);
+layoutManager.setJustifyContent(JustifyContent.FLEX_END);
+recyclerView.setLayoutManager(layoutManager);
+```
+
+or for the attributes for the children of the `FlexboxLayoutManager` you can do like:
+
+```java
+mImageView.setImageDrawable(drawable);
+ViewGroup.LayoutParams lp = mImageView.getLayoutParams();
+if (lp instanceof FlexboxLayoutManager.LayoutParams) {
+    FlexboxLayoutManager.LayoutParams flexboxLp = (FlexboxLayoutManager.LayoutParams) lp;
+    flexboxLp.setFlexGrow(1.0f);
+    flexboxLp.setAlignSelf(AlignSelf.FLEX_END);
+}
+```
+
+The advantage of using `FlexboxLayoutManager` is that it recycles the views that go off the screen
+for reuse for the views that are appearing as the user scrolls instead of inflating every individual view,
+which consumes much less memory especially when the number of items contained in the Flexbox container is large.
+
+![FlexboxLayoutManager in action](/assets/flexbox-layoutmanager.gif)
+
+
+## Supported attributes/features comparison
+Due to some characteristics of `RecyclerView`, some Flexbox attributes are not available/not implemented
+to the `FlexboxLayoutManager`.
+Here is a quick overview of the attributes/features comparison between the two implementations.
+
+|Attribute / Feature|FlexboxLayout| FlexboxLayoutManager (RecyclerView)|
+| ------- |:-----------:|:----------------------------------:|
+|flexDirection|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|flexWrap|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png) (except `wrap_reverse`)|
+|justifyContent|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|alignItems|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|alignContent|![Check](/assets/pngs/check_green_small.png)| - |
+|layout_order|![Check](/assets/pngs/check_green_small.png)| - |
+|layout_flexGrow|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_flexShrink|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_alignSelf|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_flexBasisPercent|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_(min/max)Width|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_(min/max)Height|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_wrapBefore|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|Divider|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|View recycling| - |![Check](/assets/pngs/check_green_small.png)|
+|Scrolling| *1 |![Check](/assets/pngs/check_green_small.png)|
+
+*1 Partially possible by wrapping it with `ScrollView`. But it isn't likely to work with a large set
+   of views inside the layout. Because it doesn't consider view recycling.
+
+# Supported attributes
+
+## Attributes for the FlexboxLayout:
+
+* __flexDirection__
+  * This attribute determines the direction of the main axis (and the cross axis, perpendicular to the main axis). The direction children items are placed inside the Flexbox layout.
+  Possible values are:
+    * row (default)
+    * row_reverse
+    * column
+    * column_reverse
+
+    ![Flex Direction explanation](/assets/flex-direction.gif)
+
+* __flexWrap__
+  * This attribute controls whether the flex container is single-line or multi-line, and the
+  direction of the cross axis. Possible values are:
+    * nowrap (default for FlexboxLayout)
+    * wrap (default for FlexboxLayoutManager)
+    * wrap_reverse (not supported by FlexboxLayoutManager)
+
+    ![Flex Wrap explanation](/assets/flex-wrap.gif)
+
+* __justifyContent__
+  * This attribute controls the alignment along the main axis. Possible values are:
+    * flex_start (default)
+    * flex_end
+    * center
+    * space_between
+    * space_around
+    * space_evenly
+
+    ![Justify Content explanation](/assets/justify-content.gif)
+
+* __alignItems__
+  * This attribute controls the alignment along the cross axis. Possible values are:
+    * flex_start (default for FlexboxLayout)
+    * flex_end
+    * center
+    * baseline
+    * stretch (default for FlexboxLayoutManager)
+
+    ![Align Items explanation](/assets/align-items.gif)
+
+* __alignContent__
+  * This attribute controls the alignment of the flex lines in the flex container. Possible values
+  are:
+    * flex_start (default)
+    * flex_end
+    * center
+    * space_between
+    * space_around
+    * stretch
+
+    ![Align Content explanation](/assets/align-content.gif)
+
+* __showDividerHorizontal__ (one or more of `none | beginning | middle | end`)
+* __dividerDrawableHorizontal__ (reference to a drawable)
+  * Puts horizontal dividers between flex lines (or flex items when flexDirection
+  is set to `column` or `column_rebase`).
+  
+* __showDividerVertical__ (one or more of `none | beginning | middle | end`)
+* __dividerDrawableVertical__ (reference to a drawable)
+  * Puts vertical dividers between flex items (or flex lines when flexDirection
+  is set to `column` or `column_rebase`).
+
+* __showDivider__ (one or more of `none | beginning | middle | end`)
+* __dividerDrawable__ (reference to a drawable)
+  * Shorthand for setting both horizontal and vertical dividers. Note that if used with other attributes
+  (such as `justifyContent="space_around"` or `alignContent="space_between"` ... etc) for putting 
+  spaces between flex lines or flex items, you may see unexpected spaces. Please avoid using these
+  at the same time.
+  
+  Example of putting both vertical and horizontal dividers.
+  
+  `res/drawable/divider.xml`
+  ```xml
+  <shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size
+        android:width="8dp"
+        android:height="12dp" />
+    <solid android:color="#44A444" />
+  </shape> 
+  ```
+  
+  `res/layout/content_main.xml`
+  ```xml
+  <com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:flexWrap="wrap"
+    app:showDivider="beginning|middle"
+    app:dividerDrawable="@drawable/divider" >
+
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="220dp"
+        android:layout_height="80dp"
+        android:text="1" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="120dp"
+        android:layout_height="80dp"
+        android:text="2" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="160dp"
+        android:layout_height="80dp"
+        android:text="3" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:text="4" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="5" />
+  ```
+  
+  ![Dividers beginning and middle](/assets/divider-beginning-middle.png)
+
+
+## Attributes for the children of a FlexboxLayout
+
+* __layout_order__ (integer)
+  * This attribute can change how the ordering of the children views are laid out.
+  By default, children are displayed and laid out in the same order as they appear in the
+  layout XML. If not specified, `1` is set as a default value.
+
+    ![Order explanation](/assets/layout_order.gif)
+
+* __layout_flexGrow__ (float)
+  * This attribute determines how much this child will grow if positive free space is
+  distributed relative to the rest of other flex items included in the same flex line.
+  If a flex item has a positive `layout_flexGrow` value, the item will take up the remaining
+  space in the flex line. If multiple flex items in the same flex line have positive `layout_flexGrow`
+  values, the remaining free space is distributed depending on the proportion of their declared
+  `layout_flexGrow` value. (Similar to the `layout_weight` attribute in the `LinearLayout`)
+  If not specified, `0` is set as a default value.
+
+    ![Flex Grow explanation](/assets/layout_flexGrow.gif)
+
+* __layout_flexShrink__ (float)
+  * This attribute determines how much this child will shrink if negative free space is
+  distributed relative to the rest of other flex items included in the same flex line.
+  If not specified, `1` is set as a default value.
+
+    ![Flex Shrink explanation](/assets/layout_flexShrink.gif)
+
+* __layout_alignSelf__
+  * This attribute determines the alignment along the cross axis (perpendicular to the
+  main axis). The alignment in the same direction can be determined by the
+  `alignItems` in the parent, but if this is set to other than
+  `auto`, the cross axis alignment is overridden for this child. Possible values are:
+    * auto (default)
+    * flex_start
+    * flex_end
+    * center
+    * baseline
+    * stretch
+
+    ![Align Self explanation](/assets/layout_alignSelf.gif)
+
+* __layout_flexBasisPercent__ (fraction)
+  * The initial flex item length in a fraction format relative to its parent.
+  The initial main size of this child view is trying to be expanded as the specified
+  fraction against the parent main size.
+  If this value is set, the length specified from `layout_width`
+  (or `layout_height`) is overridden by the calculated value from this attribute.
+  This attribute is only effective when the parent's length is definite (MeasureSpec mode is
+  `MeasureSpec.EXACTLY`). The default value is `-1`, which means not set.
+
+    ![Flex basis percent explanation](/assets/layout_flexBasisPercent.gif)
+
+* __layout_minWidth__ / __layout_minHeight__ (dimension)
+  * These attributes impose minimum size constraints for the children of FlexboxLayout.
+  A child view won't shrink less than the value of these attributes (varies based on the
+  `flexDirection` attribute as to which attribute imposes the size constraint along the
+  main axis) regardless of the `layout_flexShrink` attribute.
+
+    ![Min width explanation](/assets/layout_minWidth.gif)
+
+* __layout_maxWidth__ / __layout_maxHeight__ (dimension)
+  * These attributes impose maximum size constraints for the children of FlexboxLayout.
+  A child view won't be expanded more than the value of these attributes (varies based on the
+  `flexDirection` attribute as to which attribute imposes the size constraint along the
+  main axis) regardless of the `layout_flexGrow` attribute.
+
+    ![Max width explanation](/assets/layout_maxWidth.gif)
+
+* __layout_wrapBefore__ (boolean)
+  * This attribute forces a flex line wrapping, the default value is `false`.
+  i.e. if this is set to `true` for a
+  flex item, the item will become the first item of a flex line. (A wrapping happens
+  regardless of the flex items being processed in the previous flex line)
+  This attribute is ignored if the `flex_wrap` attribute is set to `nowrap`.
+  The equivalent attribute isn't defined in the original CSS Flexible Box Module
+  specification, but having this attribute is useful for Android developers. For example, to flatten
+  the layouts when building a grid-like layout or for a situation where developers want
+  to put a new flex line to make a semantic difference from the previous one, etc.
+
+    ![Wrap before explanation](/assets/layout_wrapBefore.gif)
+
+# Others
+
+## Known differences from the original CSS specification
+This library tries to achieve the same capabilities of the original
+[Flexible Box specification](https://www.w3.org/TR/css-flexbox-1) as much as possible,
+but due to some reasons such as the way specifying attributes can't be the same between
+CSS and Android XML, there are some known differences from the original specification.
+
+(1) There is no [flex-flow](https://www.w3.org/TR/css-flexbox-1/#flex-flow-property)
+equivalent attribute
+  * Because `flex-flow` is a shorthand for setting the `flex-direction` and `flex-wrap` properties,
+  specifying two attributes from a single attribute is not practical in Android.
+
+(2) There is no [flex](https://www.w3.org/TR/css-flexbox-1/#flex-property) equivalent attribute
+  * Likewise `flex` is a shorthand for setting the `flex-grow`, `flex-shrink` and `flex-basis`,
+  specifying those attributes from a single attribute is not practical.
+
+(3) `layout_flexBasisPercent` is introduced instead of
+  [flexBasis](https://www.w3.org/TR/css-flexbox-1/#flex-basis-property)
+  * Both `layout_flexBasisPercent` in this library and `flex-basis` property in the CSS are used to
+  determine the initial length of an individual flex item. The `flex-basis` property accepts width
+  values such as `1em`, `10px`, and `content` as strings as well as percentage values such as
+  `10%` and `30%`. `layout_flexBasisPercent` only accepts percentage values.
+  However, specifying initial fixed width values can be done by specifying width (or height) values in
+  layout_width (or layout_height, varies depending on the `flexDirection`). Also, the same
+  effect can be done by specifying "wrap_content" in layout_width (or layout_height) if
+  developers want to achieve the same effect as 'content'. Thus, `layout_flexBasisPercent` only
+  accepts percentage values, which can't be done through layout_width (or layout_height) for
+  simplicity.
+
+(4) `layout_wrapBefore` is introduced.
+  * The equivalent attribute doesn't exist in the CSS Flexible Box Module specification,
+  but as explained above, Android developers will benefit by having this attribute for having
+  more control over when a wrapping happens.
+
+(5) Default values for `alignItems` and `alignContent` are set to `flex_start` instead of `stretch`.
+  * Setting `stretch` for the `alignItems` is expensive because the children of `FlexboxLayout` are measured more than twice. The difference is more obvious when the layout hierarchy is deeply nested.
+
+## Xamarin Binding
+Xamarin binding is now available on [NuGet](https://www.nuget.org/packages/FlexboxLayoutXamarinBindingAndroid/) thanks to [@btripp](https://github.com/btripp)
+
+## Demo apps
+### Flexbox Playground demo app
+The `demo-playground` module works as a playground demo app for trying various values for the supported attributes.
+You can install it by
+```
+./gradlew demo-playground:installDebug
+```
+
+### Cat gallery demo app
+The `demo-cat-gallery` module showcases the usage of the FlexboxLayoutManager inside the RecyclerView
+that handles various sizes of views aligned nicely regardless of the device width like the
+Google Photo app without loading all the images on the memory.
+Thus compared to using the {@link FlexboxLayout}, it's much less likely to abuse the memory,
+which sometimes leads to the OutOfMemoryError.
+```
+./gradlew demo-cat-gallery:installDebug
+```
+
+## How to make contributions
+Please read and follow the steps in [CONTRIBUTING.md](/CONTRIBUTING.md)
+
+## License
+Please see [LICENSE](/LICENSE)
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/align-content.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/align-content.gif
new file mode 100755
index 0000000..235cb5b
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/align-content.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/align-items.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/align-items.gif
new file mode 100755
index 0000000..2fca514
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/align-items.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/divider-beginning-middle.png b/OnTime_Merchant_live/lib/flexbox-layout/assets/divider-beginning-middle.png
new file mode 100755
index 0000000..f67560d
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/divider-beginning-middle.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/flex-direction.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/flex-direction.gif
new file mode 100755
index 0000000..0d556bf
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/flex-direction.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/flex-wrap.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/flex-wrap.gif
new file mode 100755
index 0000000..352f505
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/flex-wrap.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/flexbox-layoutmanager.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/flexbox-layoutmanager.gif
new file mode 100755
index 0000000..1df2908
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/flexbox-layoutmanager.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/flexbox-visual.png b/OnTime_Merchant_live/lib/flexbox-layout/assets/flexbox-visual.png
new file mode 100755
index 0000000..40a91e2
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/flexbox-visual.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-full-width.png b/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-full-width.png
new file mode 100755
index 0000000..f30a62e
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-full-width.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-half.png b/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-half.png
new file mode 100755
index 0000000..5cd6dc9
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-half.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-one-fourth.png b/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-one-fourth.png
new file mode 100755
index 0000000..56e83b3
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-one-fourth.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-three-fourth.png b/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-three-fourth.png
new file mode 100755
index 0000000..ae97ac9
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/fluid-grid/nexus9-three-fourth.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/justify-content.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/justify-content.gif
new file mode 100755
index 0000000..18d3af5
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/justify-content.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_alignSelf.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_alignSelf.gif
new file mode 100755
index 0000000..c5af6a3
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_alignSelf.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_flexBasisPercent.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_flexBasisPercent.gif
new file mode 100755
index 0000000..3c92e91
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_flexBasisPercent.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_flexGrow.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_flexGrow.gif
new file mode 100755
index 0000000..ab730d7
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_flexGrow.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_flexShrink.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_flexShrink.gif
new file mode 100755
index 0000000..612a96f
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_flexShrink.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_maxWidth.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_maxWidth.gif
new file mode 100755
index 0000000..c742093
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_maxWidth.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_minWidth.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_minWidth.gif
new file mode 100755
index 0000000..2c639d5
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_minWidth.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_order.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_order.gif
new file mode 100755
index 0000000..d37e07d
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_order.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_wrapBefore.gif b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_wrapBefore.gif
new file mode 100755
index 0000000..9d9af91
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/layout_wrapBefore.gif differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/assets/pngs/check_green_small.png b/OnTime_Merchant_live/lib/flexbox-layout/assets/pngs/check_green_small.png
new file mode 100755
index 0000000..f5fbfa9
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/assets/pngs/check_green_small.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/build.gradle b/OnTime_Merchant_live/lib/flexbox-layout/build.gradle
new file mode 100755
index 0000000..9d17521
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/build.gradle
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext {
+        minSdkVersion = 14
+        targetSdkVersion = 30
+        compileSdkVersion = 30
+
+        androidGradlePluginVersion = "4.2.0"
+        androidxAnnotationVersion = "1.2.0"
+        androidxAppCompatVersion = "1.2.0"
+        androidxCoreVersion = "1.3.2"
+        androidxPreferenceVersion = "1.1.1"
+        androidxRecyclerViewVersion = "1.2.0"
+        androidxEspressoVersion = "3.3.0"
+        androidxTestExtVersion = "1.1.2"
+        androidxTestVersion = "1.3.0"
+        junitVersion = "4.13.2"
+        kotlinVersion = "1.4.32"
+        materialVersion = "1.3.0"
+    }
+
+    repositories {
+        jcenter()
+        google()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:$androidGradlePluginVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        google()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
+
+// This allows to disable pre dexing. If not disabled, it makes each CI build slow
+// See https://circleci.com/docs/android/#disable-pre-dexing-to-improve-build-performance
+//     http://tools.android.com/tech-docs/new-build-system/tips#TOC-Improving-Build-Server-performance
+project.ext.preDexLibs = !project.hasProperty('disablePreDex')
+
+subprojects {
+    project.plugins.whenPluginAdded { plugin ->
+        if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        } else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/build.gradle b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/build.gradle
new file mode 100755
index 0000000..10cd543
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/build.gradle
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        applicationId "com.google.android.flexbox.apps.catgallery"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation project(path: ":flexbox")
+    implementation "androidx.appcompat:appcompat:${rootProject.androidxAppCompatVersion}"
+    implementation "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
+    implementation "com.google.android.material:material:${rootProject.materialVersion}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.kotlinVersion}"
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/proguard-rules.pro b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/proguard-rules.pro
new file mode 100755
index 0000000..312658e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /usr/local/google/home/thagikura/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..9badf19
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.google.android.flexbox.apps.catgallery">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatAdapter.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatAdapter.kt
new file mode 100755
index 0000000..11b2930
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatAdapter.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.apps.catgallery
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * Adapter class that handles the data set with the {@link RecyclerView.LayoutManager}
+ */
+internal class CatAdapter : RecyclerView.Adapter<CatViewHolder>() {
+
+    companion object {
+        private val CAT_IMAGE_IDS = intArrayOf(
+                R.drawable.cat_1,
+                R.drawable.cat_2,
+                R.drawable.cat_3,
+                R.drawable.cat_4,
+                R.drawable.cat_5,
+                R.drawable.cat_6,
+                R.drawable.cat_7,
+                R.drawable.cat_8,
+                R.drawable.cat_9,
+                R.drawable.cat_10,
+                R.drawable.cat_11,
+                R.drawable.cat_12,
+                R.drawable.cat_13,
+                R.drawable.cat_14,
+                R.drawable.cat_15,
+                R.drawable.cat_16,
+                R.drawable.cat_17,
+                R.drawable.cat_18,
+                R.drawable.cat_19
+        )
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CatViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.viewholder_cat, parent, false)
+        return CatViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: CatViewHolder, position: Int) {
+        val pos = position % CAT_IMAGE_IDS.size
+        holder.bindTo(CAT_IMAGE_IDS[pos])
+    }
+
+    override fun getItemCount() = CAT_IMAGE_IDS.size * 4
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt
new file mode 100755
index 0000000..1778879
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.apps.catgallery
+
+import android.view.View
+import android.widget.ImageView
+import androidx.annotation.DrawableRes
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * ViewHolder that represents a cat image.
+ */
+internal class CatViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    private val imageView: ImageView = itemView.findViewById(R.id.imageview)
+
+    internal fun bindTo(@DrawableRes drawableRes: Int) {
+        imageView.setImageResource(drawableRes)
+        val lp = imageView.layoutParams
+        if (lp is FlexboxLayoutManager.LayoutParams) {
+            lp.flexGrow = 1f
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt
new file mode 100755
index 0000000..bbf1e0b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.apps.catgallery
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * Launcher Activity for the cat gallery demo app that demonstrates the usage of the
+ * {@link FlexboxLayoutManager} that handles various sizes of views aligned nicely regardless of
+ * the device width like the Google Photo app without loading all the images on the memory.
+ * Thus compared to using the {@link FlexboxLayout}, it's much less likely to abuse the memory,
+ * which some times leads to the OutOfMemoryError.
+ */
+class MainActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val toolbar: Toolbar = findViewById(R.id.toolbar)
+        setSupportActionBar(toolbar)
+
+        val flexboxLayoutManager = FlexboxLayoutManager(this).apply {
+            flexWrap = FlexWrap.WRAP
+            flexDirection = FlexDirection.ROW
+            alignItems = AlignItems.STRETCH
+        }
+
+        val recyclerView: RecyclerView = findViewById(R.id.recyclerview)
+        recyclerView.apply {
+            layoutManager = flexboxLayoutManager
+            adapter = CatAdapter()
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_1.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_1.jpg
new file mode 100755
index 0000000..bf23d09
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_1.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_10.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_10.jpg
new file mode 100755
index 0000000..f030ea7
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_10.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_11.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_11.jpg
new file mode 100755
index 0000000..fa1e644
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_11.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_12.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_12.jpg
new file mode 100755
index 0000000..a0c5f5d
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_12.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_13.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_13.jpg
new file mode 100755
index 0000000..4679ffb
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_13.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_14.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_14.jpg
new file mode 100755
index 0000000..13e7aab
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_14.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_15.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_15.jpg
new file mode 100755
index 0000000..31cc4a1
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_15.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_16.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_16.jpg
new file mode 100755
index 0000000..1af0ec8
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_16.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_17.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_17.jpg
new file mode 100755
index 0000000..a3bcfe9
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_17.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_18.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_18.jpg
new file mode 100755
index 0000000..b35a982
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_18.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_19.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_19.jpg
new file mode 100755
index 0000000..74fa74c
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_19.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_2.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_2.jpg
new file mode 100755
index 0000000..e248def
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_2.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_3.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_3.jpg
new file mode 100755
index 0000000..ecb4452
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_3.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_4.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_4.jpg
new file mode 100755
index 0000000..b43bb2d
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_4.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_5.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_5.jpg
new file mode 100755
index 0000000..9efac65
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_5.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_6.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_6.jpg
new file mode 100755
index 0000000..ae6e72a
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_6.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_7.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_7.jpg
new file mode 100755
index 0000000..7a1680a
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_7.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_8.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_8.jpg
new file mode 100755
index 0000000..86d7347
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_8.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_9.jpg b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_9.jpg
new file mode 100755
index 0000000..8d4f7be
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_9.jpg differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/activity_main.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..e80b356
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/activity_main.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="com.google.android.flexbox.apps.catgallery.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/app_bar_height"
+        android:fitsSystemWindows="true"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/toolbar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true"
+            app:contentScrim="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:layout_collapseMode="pin"
+                app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/content_main"/>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/content_main.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/content_main.xml
new file mode 100755
index 0000000..316888f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/content_main.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    android:id="@+id/recyclerview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/viewholder_cat.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/viewholder_cat.xml
new file mode 100755
index 0000000..7426446
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/viewholder_cat.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/imageview"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:scaleType="centerCrop"
+    android:layout_margin="1dp"
+    android:contentDescription="@string/content_description_cat_view_holder"/>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..21141fe
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..ee878a6
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..47e7af4
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..fb48540
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..a919b0a
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values-v21/styles.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..4ec0e24
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values-v21/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/colors.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/colors.xml
new file mode 100755
index 0000000..b45d91a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/dimens.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..bac3851
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/dimens.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <dimen name="app_bar_height">180dp</dimen>
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/strings.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/strings.xml
new file mode 100755
index 0000000..bac6179
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <string name="app_name">Cat Gallery</string>
+    <string name="content_description_cat_view_holder">Cat image</string>
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/styles.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/styles.xml
new file mode 100755
index 0000000..6334ac5
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/styles.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
+
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/build.gradle b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/build.gradle
new file mode 100755
index 0000000..ad350da
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/build.gradle
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        applicationId "com.google.android.apps.flexbox"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation project(":flexbox")
+    implementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
+    implementation "androidx.appcompat:appcompat:${rootProject.androidxAppCompatVersion}"
+    implementation "androidx.preference:preference:${rootProject.androidxPreferenceVersion}"
+    implementation "com.google.android.material:material:${rootProject.materialVersion}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+
+    testImplementation "junit:junit:${rootProject.ext.junitVersion}"
+
+    androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
+    androidTestImplementation "androidx.test:runner:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test:rules:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test.espresso:espresso-core:${rootProject.androidxEspressoVersion}"
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/proguard-rules.pro b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/proguard-rules.pro
new file mode 100755
index 0000000..6ca2aba
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/proguard-rules.pro
@@ -0,0 +1,33 @@
+#
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt
new file mode 100755
index 0000000..6a2d169
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.apps.flexbox.test
+
+import android.content.pm.ActivityInfo
+import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.RadioGroup
+import android.widget.Spinner
+import android.widget.TextView
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import com.google.android.apps.flexbox.R
+import com.google.android.flexbox.*
+import com.google.android.material.navigation.NavigationView
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.core.Is.`is`
+import org.junit.Assert.*
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [MainActivity].
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class MainActivityTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(MainActivity::class.java)
+
+    @Test
+    @FlakyTest
+    fun testAddFlexItem() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val beforeCount = flexboxLayout.childCount
+        onView(withId(R.id.add_fab)).perform(click())
+
+        assertThat(flexboxLayout.childCount, `is`(beforeCount + 1))
+    }
+
+    @Test
+    @FlakyTest
+    fun testRemoveFlexItem() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val beforeCount = flexboxLayout.childCount
+        onView(withId(R.id.remove_fab)).perform(click())
+
+        assertThat(flexboxLayout.childCount, `is`(beforeCount - 1))
+    }
+
+    @Test
+    @FlakyTest
+    fun testConfigurationChange() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.add_fab)).perform(click())
+        onView(withId(R.id.add_fab)).perform(click())
+        onView(withId(R.id.add_fab)).perform(click())
+        val beforeCount = flexboxLayout.childCount
+
+        activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Verify the flex items are restored across the configuration change.
+        assertThat(flexboxLayout.childCount, `is`(beforeCount))
+    }
+
+    @Test
+    @FlakyTest
+    fun testFlexDirectionSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_flex_direction).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val columnPosition = spinnerAdapter.getPosition(activity.getString(R.string.column))
+        activity.runOnUiThread { spinner.setSelection(columnPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val rowReversePosition = spinnerAdapter.getPosition(activity.getString(R.string.row_reverse))
+        activity.runOnUiThread { spinner.setSelection(rowReversePosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+    }
+
+    @Test
+    @FlakyTest
+    fun testFlexWrapSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_flex_wrap).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val wrapReversePosition = spinnerAdapter.getPosition(activity.getString(R.string.wrap_reverse))
+        activity.runOnUiThread { spinner.setSelection(wrapReversePosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+
+        val noWrapPosition = spinnerAdapter.getPosition(activity.getString(R.string.nowrap))
+        activity.runOnUiThread { spinner.setSelection(noWrapPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+    }
+
+    @Test
+    @FlakyTest
+    fun testJustifyContentSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<View>(R.id.nav_view) as NavigationView
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_justify_content).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val spaceBetweenPosition = spinnerAdapter.getPosition(activity.getString(R.string.space_between))
+        activity.runOnUiThread { spinner.setSelection(spaceBetweenPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        val centerPosition = spinnerAdapter.getPosition(activity.getString(R.string.center))
+        activity.runOnUiThread { spinner.setSelection(centerPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+    }
+
+    @Test
+    @FlakyTest
+    fun testAlignItemsSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_align_items).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val baselinePosition = spinnerAdapter.getPosition(activity.getString(R.string.baseline))
+        activity.runOnUiThread { spinner.setSelection(baselinePosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.BASELINE))
+
+        val flexEndPosition = spinnerAdapter.getPosition(activity.getString(R.string.flex_end))
+        activity.runOnUiThread { spinner.setSelection(flexEndPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+    }
+
+    @Test
+    @FlakyTest
+    fun testAlignContentSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_align_content).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val spaceAroundPosition = spinnerAdapter.getPosition(activity.getString(R.string.space_around))
+        activity.runOnUiThread { spinner.setSelection(spaceAroundPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+
+        val stretchPosition = spinnerAdapter.getPosition(activity.getString(R.string.stretch))
+        activity.runOnUiThread { spinner.setSelection(stretchPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeOrder() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_order)).perform(replaceText("3"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = flexboxLayout.getReorderedChildAt(0) as TextView
+        val second = flexboxLayout.getReorderedChildAt(1) as TextView
+        val third = flexboxLayout.getReorderedChildAt(2) as TextView
+
+        assertThat(first.text.toString(), `is`("2"))
+        assertThat(second.text.toString(), `is`("3"))
+        assertThat(third.text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeFlexGrow() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_flex_grow)).perform(replaceText("1"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = activity.findViewById<View>(R.id.textview1) as TextView
+        val second = activity.findViewById<View>(R.id.textview2) as TextView
+        val third = activity.findViewById<View>(R.id.textview3) as TextView
+        assertNotNull(first)
+        assertNotNull(second)
+        assertNotNull(third)
+
+        assertThat(first.width, `is`(flexboxLayout.width - second.width - third.width))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeFlexGrowFloat() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_flex_grow)).perform(replaceText("1.0"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = activity.findViewById<View>(R.id.textview1) as TextView
+        val second = activity.findViewById<View>(R.id.textview2) as TextView
+        val third = activity.findViewById<View>(R.id.textview3) as TextView
+        assertNotNull(first)
+        assertNotNull(second)
+        assertNotNull(third)
+
+        assertThat(first.width, `is`(flexboxLayout.width - second.width - third.width))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeFlexBasisPercent() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_flex_basis_percent))
+                .perform(replaceText("50"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = activity.findViewById<TextView>(R.id.textview1)
+        val second = activity.findViewById<TextView>(R.id.textview2)
+        val third = activity.findViewById<TextView>(R.id.textview3)
+        assertNotNull(first)
+        assertNotNull(second)
+        assertNotNull(third)
+
+        assertTrue(first.width - 1 <= flexboxLayout.width / 2 || flexboxLayout.width / 2 <= first.width + 1)
+    }
+
+    @Test
+    @FlakyTest
+    fun testSwitchRecyclerViewFragment() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        assertNull(activity.findViewById(R.id.recyclerview))
+        assertNotNull(activity.findViewById(R.id.flexbox_layout))
+
+        val radioGroup = navigationView.getHeaderView(0)
+                .findViewById<RadioGroup>(R.id.radiogroup_container_implementation)
+        activity.runOnUiThread { radioGroup.check(R.id.radiobutton_recyclerview) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertNotNull(activity.findViewById(R.id.recyclerview))
+        assertNull(activity.findViewById(R.id.flexbox_layout))
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..1bb3c9a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.google.android.apps.flexbox">
+
+    <uses-sdk tools:overrideLibrary="android.support.v14.preference" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name="com.google.android.flexbox.MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="com.google.android.flexbox.SettingsActivity" />
+    </application>
+
+</manifest>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/Extensions.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/Extensions.kt
new file mode 100755
index 0000000..7f16a7e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/Extensions.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Context
+
+/**
+ * Convert pixel to dp. Preserve the negative value as it's used for representing
+ * MATCH_PARENT(-1) and WRAP_CONTENT(-2).
+ * Ignore the round error that might happen in dividing the pixel by the density.
+ *
+ * @param pixel   the value in pixel
+ *
+ * @return the converted value in dp
+ */
+fun Context.pixelToDp(pixel: Int): Int {
+    val displayMetrics = this.resources.displayMetrics
+    return if (pixel < 0) pixel else Math.round(pixel / displayMetrics.density)
+}
+
+/**
+ * Convert dp to pixel. Preserve the negative value as it's used for representing
+ * MATCH_PARENT(-1) and WRAP_CONTENT(-2).
+ *
+ * @param dp      the value in dp
+ *
+ * @return the converted value in pixel
+ */
+fun Context.dpToPixel(dp: Int): Int {
+    val displayMetrics = this.resources.displayMetrics
+    return if (dp < 0) dp else Math.round(dp * displayMetrics.density)
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt
new file mode 100755
index 0000000..26b8330
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.apps.flexbox.R
+
+/**
+ * [RecyclerView.Adapter] implementation for [FlexItemViewHolder].
+ */
+internal class FlexItemAdapter(private val activity: AppCompatActivity,
+                               private val flexContainer: FlexContainer)
+    : RecyclerView.Adapter<FlexItemViewHolder>() {
+
+    private val layoutParams = mutableListOf<FlexboxLayoutManager.LayoutParams>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FlexItemViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.viewholder_flex_item, parent, false)
+
+        return FlexItemViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: FlexItemViewHolder, position: Int) {
+        val adapterPosition = holder.adapterPosition
+        // TODO: More optimized set the click listener inside the view holder
+        holder.itemView.setOnClickListener(FlexItemClickListener(activity,
+                FlexItemChangedListenerImplRecyclerView(flexContainer, this),
+                adapterPosition))
+        holder.bindTo(layoutParams[position])
+    }
+
+    fun addItem(lp: FlexboxLayoutManager.LayoutParams) {
+        layoutParams.add(lp)
+        notifyItemInserted(layoutParams.size - 1)
+    }
+
+    fun removeItem(position: Int) {
+        if (position < 0 || position >= layoutParams.size) {
+            return
+        }
+        layoutParams.removeAt(position)
+        notifyItemRemoved(layoutParams.size)
+        notifyItemRangeChanged(position, layoutParams.size)
+    }
+
+    val items get() = layoutParams
+
+    override fun getItemCount() = layoutParams.size
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListener.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListener.kt
new file mode 100755
index 0000000..979cc2c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListener.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+/**
+ * A listener that listens to the change of a flex item
+ */
+internal interface FlexItemChangedListener {
+
+    fun onFlexItemChanged(flexItem: FlexItem, viewIndex: Int)
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImpl.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImpl.kt
new file mode 100755
index 0000000..9e25dfc
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImpl.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.ViewGroup
+
+/**
+ * Default implementation for the [FlexItemChangedListener].
+ */
+internal class FlexItemChangedListenerImpl(private val flexContainer: FlexContainer) : FlexItemChangedListener {
+
+    override fun onFlexItemChanged(flexItem: FlexItem, viewIndex: Int) {
+        val view = flexContainer.getFlexItemAt(viewIndex)
+        view.layoutParams = flexItem as ViewGroup.LayoutParams
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt
new file mode 100755
index 0000000..acedf7d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * Implementation for the [FlexItemChangedListener].
+ * It expects RecyclerView as the underlying flex container implementation.
+ */
+internal class FlexItemChangedListenerImplRecyclerView(private val flexContainer: FlexContainer,
+                                              private val adapter: RecyclerView.Adapter<*>) : FlexItemChangedListener {
+
+    override fun onFlexItemChanged(flexItem: FlexItem, viewIndex: Int) {
+        val view = flexContainer.getFlexItemAt(viewIndex)
+        view.layoutParams = flexItem as ViewGroup.LayoutParams
+        adapter.notifyDataSetChanged()
+        // TODO: An Exception is thrown if notifyItemChanged(int) is used.
+        // Investigate that, but using LinearLayoutManager also produces the same Exception
+        // java.lang.IllegalArgumentException: Called attach on a child which is not detached:
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt
new file mode 100755
index 0000000..6ba866b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+
+/**
+ * Implementation of the [android.view.View.OnClickListener] when a flex item is clicked in
+ * the Flexbox Playground demo app.
+ */
+internal class FlexItemClickListener(private val activity: AppCompatActivity, private val flexItemChangedListener: FlexItemChangedListener,
+                                     private val viewIndex: Int) : View.OnClickListener {
+
+    override fun onClick(v: View) =
+            FlexItemEditFragment.newInstance(v.layoutParams as FlexItem, viewIndex).apply {
+                setFlexItemChangedListener(flexItemChangedListener)
+            }.show(activity.supportFragmentManager, EDIT_DIALOG_TAG)
+
+    companion object {
+
+        private const val EDIT_DIALOG_TAG = "edit_dialog_tag"
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt
new file mode 100755
index 0000000..5b59832
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt
@@ -0,0 +1,369 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Context
+import android.os.Build
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
+import android.widget.*
+import androidx.fragment.app.DialogFragment
+import com.google.android.apps.flexbox.R
+import com.google.android.flexbox.validators.*
+import com.google.android.material.textfield.TextInputLayout
+
+/**
+ * DialogFragment that changes the properties for a flex item.
+ */
+internal class FlexItemEditFragment : DialogFragment() {
+
+    private lateinit var alignSelfAuto: String
+
+    private lateinit var alignSelfFlexStart: String
+
+    private lateinit var alignSelfFlexEnd: String
+
+    private lateinit var alignSelfCenter: String
+
+    private lateinit var alignSelfBaseline: String
+
+    private lateinit var alignSelfStretch: String
+
+    private var viewIndex: Int = 0
+
+    private lateinit var flexItem: FlexItem
+
+    /**
+     * Instance of a [FlexItem] being edited. At first it's created as another instance from
+     * the [flexItem] because otherwise changes before clicking the ok button will be
+     * reflected if the [flexItem] is changed directly.
+     */
+    private lateinit var flexItemInEdit: FlexItem
+
+    private var flexItemChangedListener: FlexItemChangedListener? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            setStyle(STYLE_NORMAL, android.R.style.Theme_Material_Light_Dialog)
+        } else {
+            setStyle(STYLE_NORMAL, android.R.style.Theme_Dialog)
+        }
+        arguments?.let {
+            flexItem = it.getParcelable(FLEX_ITEM_KEY)!!
+            viewIndex = it.getInt(VIEW_INDEX_KEY)
+        }
+        flexItemInEdit = createNewFlexItem(flexItem)
+
+        activity?.let {
+            alignSelfAuto = it.getString(R.string.auto)
+            alignSelfFlexStart = it.getString(R.string.flex_start)
+            alignSelfFlexEnd = it.getString(R.string.flex_end)
+            alignSelfCenter = it.getString(R.string.center)
+            alignSelfBaseline = it.getString(R.string.baseline)
+            alignSelfStretch = it.getString(R.string.stretch)
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        val view = inflater.inflate(R.layout.fragment_flex_item_edit, container, false)
+        dialog?.setTitle((viewIndex + 1).toString())
+
+        val context = activity ?: return view
+        val orderTextInput: TextInputLayout = view.findViewById(R.id.input_layout_order)
+        val orderEdit: EditText = view.findViewById(R.id.edit_text_order)
+        orderEdit.setText(flexItem.order.toString())
+        orderEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, orderTextInput, IntegerInputValidator(),
+                        R.string.must_be_integer))
+        if (flexItem is FlexboxLayoutManager.LayoutParams) {
+            // Order is not enabled in FlexboxLayoutManager
+            orderEdit.isEnabled = false
+        }
+
+        val flexGrowInput: TextInputLayout = view .findViewById(R.id.input_layout_flex_grow)
+        val flexGrowEdit: EditText = view.findViewById(R.id.edit_text_flex_grow)
+        flexGrowEdit.setText(flexItem.flexGrow.toString())
+        flexGrowEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, flexGrowInput, NonNegativeDecimalInputValidator(),
+                        R.string.must_be_non_negative_float))
+
+        val flexShrinkInput: TextInputLayout = view.findViewById(R.id.input_layout_flex_shrink)
+        val flexShrinkEdit: EditText = view.findViewById(R.id.edit_text_flex_shrink)
+        flexShrinkEdit.setText(flexItem.flexShrink.toString())
+        flexShrinkEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, flexShrinkInput, NonNegativeDecimalInputValidator(),
+                        R.string.must_be_non_negative_float))
+
+        val flexBasisPercentInput: TextInputLayout =
+                view.findViewById(R.id.input_layout_flex_basis_percent)
+        val flexBasisPercentEdit: EditText = view.findViewById(R.id.edit_text_flex_basis_percent)
+        if (flexItem.flexBasisPercent != FlexboxLayout.LayoutParams.FLEX_BASIS_PERCENT_DEFAULT) {
+            flexBasisPercentEdit
+                    .setText(Math.round(flexItem.flexBasisPercent * 100).toString())
+        } else {
+            flexBasisPercentEdit.setText(flexItem.flexBasisPercent.toInt().toString())
+        }
+        flexBasisPercentEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, flexBasisPercentInput, FlexBasisPercentInputValidator(),
+                        R.string.must_be_minus_one_or_non_negative_integer))
+
+        val widthInput: TextInputLayout = view.findViewById(R.id.input_layout_width)
+        val widthEdit: EditText = view.findViewById(R.id.edit_text_width)
+        widthEdit.setText(context.pixelToDp(flexItem.width).toString())
+        widthEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, widthInput, DimensionInputValidator(),
+                        R.string.must_be_minus_one_or_minus_two_or_non_negative_integer))
+
+        val heightInput: TextInputLayout = view.findViewById(R.id.input_layout_height)
+        val heightEdit: EditText= view.findViewById(R.id.edit_text_height)
+        heightEdit.setText(context.pixelToDp(flexItem.height).toString())
+        heightEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, heightInput, DimensionInputValidator(),
+                        R.string.must_be_minus_one_or_minus_two_or_non_negative_integer))
+
+        val minWidthInput: TextInputLayout = view.findViewById(R.id.input_layout_min_width)
+        val minWidthEdit: EditText = view.findViewById(R.id.edit_text_min_width)
+        minWidthEdit.setText(context.pixelToDp(flexItem.minWidth).toString())
+        minWidthEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, minWidthInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        val minHeightInput: TextInputLayout = view.findViewById(R.id.input_layout_min_height)
+        val minHeightEdit: EditText = view.findViewById(R.id.edit_text_min_height)
+        minHeightEdit.setText(context.pixelToDp(flexItem.minHeight).toString())
+        minHeightEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, minHeightInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        val maxWidthInput: TextInputLayout = view.findViewById(R.id.input_layout_max_width)
+        val maxWidthEdit: EditText = view.findViewById(R.id.edit_text_max_width)
+        maxWidthEdit.setText(context.pixelToDp(flexItem.maxWidth).toString())
+        maxWidthEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, maxWidthInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        val maxHeightInput: TextInputLayout = view.findViewById(R.id.input_layout_max_height)
+        val maxHeightEdit: EditText = view.findViewById(R.id.edit_text_max_height)
+        maxHeightEdit.setText(context.pixelToDp(flexItem.maxHeight).toString())
+        maxHeightEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, maxHeightInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        setNextFocusesOnEnterDown(orderEdit, flexGrowEdit, flexShrinkEdit, flexBasisPercentEdit,
+                widthEdit, heightEdit, minWidthEdit, minHeightEdit, maxWidthEdit, maxHeightEdit)
+
+        val alignSelfSpinner: Spinner = view.findViewById(R.id.spinner_align_self)
+        val arrayAdapter = ArrayAdapter.createFromResource(requireActivity(),
+                R.array.array_align_self, R.layout.spinner_item)
+        alignSelfSpinner.adapter = arrayAdapter
+        alignSelfSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                        id: Long) {
+                flexItemInEdit.alignSelf = when (parent.getItemAtPosition(position).toString()) {
+                    alignSelfAuto -> AlignSelf.AUTO
+                    alignSelfFlexStart -> AlignItems.FLEX_START
+                    alignSelfFlexEnd -> AlignItems.FLEX_END
+                    alignSelfCenter -> AlignItems.CENTER
+                    alignSelfBaseline -> AlignItems.BASELINE
+                    alignSelfStretch -> AlignItems.STRETCH
+                    else -> return
+                }
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>) {
+                // No op
+            }
+        }
+
+        val wrapBeforeCheckBox: CheckBox = view.findViewById(R.id.checkbox_wrap_before)
+        wrapBeforeCheckBox.isChecked = flexItem.isWrapBefore
+        wrapBeforeCheckBox.setOnCheckedChangeListener { _, isChecked ->
+            flexItemInEdit.isWrapBefore = isChecked }
+        val alignSelfPosition = arrayAdapter
+                .getPosition(alignSelfAsString(flexItem.alignSelf))
+        alignSelfSpinner.setSelection(alignSelfPosition)
+
+        view.findViewById<Button>(R.id.button_cancel).setOnClickListener {
+            copyFlexItemValues(flexItem, flexItemInEdit)
+            dismiss()
+        }
+        val okButton: Button = view.findViewById(R.id.button_ok)
+        okButton.setOnClickListener(View.OnClickListener {
+            if (orderTextInput.isErrorEnabled || flexGrowInput.isErrorEnabled ||
+                    flexBasisPercentInput.isErrorEnabled || widthInput.isErrorEnabled ||
+                    heightInput.isErrorEnabled || minWidthInput.isErrorEnabled ||
+                    minHeightInput.isErrorEnabled || maxWidthInput.isErrorEnabled ||
+                    maxHeightInput.isErrorEnabled) {
+                Toast.makeText(activity, R.string.invalid_values_exist, Toast.LENGTH_SHORT)
+                        .show()
+                return@OnClickListener
+            }
+            if (flexItemChangedListener != null) {
+                copyFlexItemValues(flexItemInEdit, flexItem)
+                flexItemChangedListener!!.onFlexItemChanged(flexItem, viewIndex)
+            }
+            dismiss()
+        })
+        return view
+    }
+
+    fun setFlexItemChangedListener(flexItemChangedListener: FlexItemChangedListener) {
+        this.flexItemChangedListener = flexItemChangedListener
+    }
+
+    private fun setNextFocusesOnEnterDown(vararg textViews: TextView) {
+        // This can be done by setting android:nextFocus* as in
+        // https://developer.android.com/training/keyboard-input/navigation.html
+        // But it requires API level 11 as a minimum sdk version. To support the lower level
+        // devices,
+        // doing it programmatically.
+        for (i in textViews.indices) {
+            textViews[i].setOnEditorActionListener { v, actionId, event ->
+                if (actionId == EditorInfo.IME_ACTION_NEXT ||
+                        actionId == EditorInfo.IME_ACTION_DONE ||
+                        actionId == EditorInfo.IME_NULL
+                                && event.action == KeyEvent.ACTION_DOWN
+                                && event.keyCode == KeyEvent.KEYCODE_ENTER) {
+                    if (i + 1 < textViews.size) {
+                        textViews[i + 1].requestFocus()
+                    } else if (i == textViews.size - 1) {
+                        val inputMethodManager = activity?.getSystemService(
+                                Context.INPUT_METHOD_SERVICE) as InputMethodManager?
+                        inputMethodManager?.hideSoftInputFromWindow(v.windowToken, 0)
+                    }
+                }
+                true
+            }
+
+            // Suppress the key focus change by KeyEvent.ACTION_UP of the enter key
+            textViews[i].setOnKeyListener { _, keyCode, event -> keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP }
+        }
+
+    }
+
+    private fun alignSelfAsString(alignSelf: Int): String {
+        return when (alignSelf) {
+            AlignSelf.AUTO -> alignSelfAuto
+            AlignItems.FLEX_START -> alignSelfFlexStart
+            AlignItems.FLEX_END -> alignSelfFlexEnd
+            AlignItems.CENTER -> alignSelfCenter
+            AlignItems.BASELINE -> alignSelfBaseline
+            AlignItems.STRETCH -> alignSelfStretch
+            else -> alignSelfAuto
+        }
+    }
+
+    private inner class FlexEditTextWatcher internal constructor(val context: Context,
+                                                                 val textInputLayout: TextInputLayout,
+                                                                 val inputValidator: InputValidator,
+                                                                 val errorMessageId: Int) : TextWatcher {
+
+        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
+            // No op
+        }
+
+        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+            if (inputValidator.isValidInput(s)) {
+                textInputLayout.isErrorEnabled = false
+                textInputLayout.error = ""
+            } else {
+                textInputLayout.isErrorEnabled = true
+                textInputLayout.error = activity?.resources?.getString(errorMessageId)
+            }
+        }
+
+        override fun afterTextChanged(editable: Editable) {
+            if (textInputLayout.isErrorEnabled || editable.isEmpty() ||
+                    !inputValidator.isValidInput(editable.toString())) {
+                return
+            }
+            val value = editable.toString().toFloatOrNull() ?: return
+            when (textInputLayout.id) {
+                R.id.input_layout_order -> if (flexItemInEdit !is FlexboxLayoutManager.LayoutParams) {
+                    flexItemInEdit.order = value.toInt()
+                } else return
+                R.id.input_layout_flex_grow -> flexItemInEdit.flexGrow = value
+                R.id.input_layout_flex_shrink -> flexItemInEdit.flexShrink = value
+                R.id.input_layout_width -> flexItemInEdit.width = context.dpToPixel(value.toInt())
+                R.id.input_layout_height -> flexItemInEdit.height = context.dpToPixel(value.toInt())
+                R.id.input_layout_flex_basis_percent -> if (value != FlexboxLayout.LayoutParams.FLEX_BASIS_PERCENT_DEFAULT) {
+                    flexItemInEdit.flexBasisPercent = value.toInt() / 100.0f
+                } else {
+                    flexItemInEdit.flexBasisPercent = FlexItem.FLEX_BASIS_PERCENT_DEFAULT
+                }
+                R.id.input_layout_min_width -> flexItemInEdit.minWidth = context.dpToPixel(value.toInt())
+                R.id.input_layout_min_height -> flexItemInEdit.minHeight = context.dpToPixel(value.toInt())
+                R.id.input_layout_max_width -> flexItemInEdit.maxWidth = context.dpToPixel(value.toInt())
+                R.id.input_layout_max_height -> flexItemInEdit.maxHeight = context.dpToPixel(value.toInt())
+                else -> return
+            }
+        }
+    }
+
+    private fun createNewFlexItem(item: FlexItem): FlexItem {
+        if (item is FlexboxLayout.LayoutParams) {
+            val newItem = FlexboxLayout.LayoutParams(item.getWidth(), item.getHeight())
+            copyFlexItemValues(item, newItem)
+            return newItem
+        } else if (item is FlexboxLayoutManager.LayoutParams) {
+            val newItem = FlexboxLayoutManager.LayoutParams(item.getWidth(), item.getHeight())
+            copyFlexItemValues(item, newItem)
+            return newItem
+        }
+        throw IllegalArgumentException("Unknown FlexItem: $item")
+    }
+
+    private fun copyFlexItemValues(from: FlexItem, to: FlexItem) {
+        if (from !is FlexboxLayoutManager.LayoutParams) {
+            to.order = from.order
+        }
+        to.flexGrow = from.flexGrow
+        to.flexShrink = from.flexShrink
+        to.flexBasisPercent = from.flexBasisPercent
+        to.height = from.height
+        to.width = from.width
+        to.maxHeight = from.maxHeight
+        to.minHeight = from.minHeight
+        to.maxWidth = from.maxWidth
+        to.minWidth = from.minWidth
+        to.alignSelf = from.alignSelf
+        to.isWrapBefore = from.isWrapBefore
+    }
+
+    companion object {
+
+        private const val FLEX_ITEM_KEY = "flex_item"
+
+        private const val VIEW_INDEX_KEY = "view_index"
+
+        fun newInstance(flexItem: FlexItem, viewIndex: Int) = FlexItemEditFragment().apply {
+            arguments = Bundle().apply {
+                putParcelable(FLEX_ITEM_KEY, flexItem)
+                putInt(VIEW_INDEX_KEY, viewIndex)
+            }
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt
new file mode 100755
index 0000000..1e9f4a2
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.Gravity
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.apps.flexbox.R
+
+/**
+ * ViewHolder implementation for a flex item.
+ */
+class FlexItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    private val textView: TextView = itemView.findViewById(R.id.textview)
+
+    fun bindTo(params: RecyclerView.LayoutParams) {
+        val adapterPosition = adapterPosition
+        textView.apply {
+            text = (adapterPosition + 1).toString()
+            setBackgroundResource(R.drawable.flex_item_background)
+            gravity = Gravity.CENTER
+            layoutParams = params
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt
new file mode 100755
index 0000000..146299f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Context
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import com.google.android.apps.flexbox.R
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import java.util.*
+
+/**
+ * Fragment that contains the [FlexboxLayout] as the playground.
+ */
+class FlexboxLayoutFragment : Fragment() {
+
+    private lateinit var flexContainer: FlexboxLayout
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_flexboxlayout, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val activity = activity as MainActivity
+        flexContainer = view.findViewById(R.id.flexbox_layout)
+
+        val fragmentHelper = FragmentHelper(activity, flexContainer)
+        fragmentHelper.initializeViews()
+        if (savedInstanceState != null) {
+            val flexItems = savedInstanceState
+                    .getParcelableArrayList<FlexItem>(FLEX_ITEMS_KEY)!!
+            flexContainer.removeAllViews()
+            for (i in flexItems.indices) {
+                val flexItem = flexItems[i]
+                val textView = createBaseFlexItemTextView(activity, i)
+                textView.layoutParams = flexItem as FlexboxLayout.LayoutParams
+                flexContainer.addView(textView)
+            }
+        }
+        for (i in 0 until flexContainer.flexItemCount) {
+            flexContainer.getFlexItemAt(i).setOnClickListener(
+                    FlexItemClickListener(activity,
+                            FlexItemChangedListenerImpl(flexContainer), i))
+        }
+
+        val addFab: FloatingActionButton = activity.findViewById(R.id.add_fab)
+        addFab.setOnClickListener {
+            val viewIndex = flexContainer.flexItemCount
+            // index starts from 0. New View's index is N if N views ([0, 1, 2, ... N-1])
+            // exist.
+            val textView = createBaseFlexItemTextView(activity, viewIndex)
+            val lp = FlexboxLayout.LayoutParams(
+                    ViewGroup.LayoutParams.WRAP_CONTENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT)
+            fragmentHelper.setFlexItemAttributes(lp)
+            textView.layoutParams = lp
+            textView.setOnClickListener(FlexItemClickListener(activity,
+                    FlexItemChangedListenerImpl(flexContainer), viewIndex))
+            flexContainer.addView(textView)
+        }
+        val removeFab: FloatingActionButton = activity.findViewById(R.id.remove_fab)
+        removeFab.setOnClickListener(View.OnClickListener {
+            if (flexContainer.flexItemCount == 0) {
+                return@OnClickListener
+            }
+            flexContainer.removeViewAt(flexContainer.flexItemCount - 1)
+        })
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        val flexItems = (0 until flexContainer.flexItemCount)
+                .map { flexContainer.getFlexItemAt(it) }
+                .mapTo(ArrayList()) { it.layoutParams as FlexItem }
+        outState.putParcelableArrayList(FLEX_ITEMS_KEY, flexItems)
+    }
+
+    private fun createBaseFlexItemTextView(context: Context, index: Int): TextView {
+        return TextView(context).apply {
+            setBackgroundResource(R.drawable.flex_item_background)
+            text = (index + 1).toString()
+            gravity = Gravity.CENTER
+        }
+    }
+
+    companion object {
+
+        private const val FLEX_ITEMS_KEY = "flex_items_key"
+
+        fun newInstance(): FlexboxLayoutFragment {
+            return FlexboxLayoutFragment()
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt
new file mode 100755
index 0000000..9f9fc3e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt
@@ -0,0 +1,340 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.SharedPreferences
+import android.view.Menu
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Spinner
+import android.widget.Toast
+import androidx.preference.PreferenceManager
+import com.google.android.apps.flexbox.R
+import com.google.android.material.navigation.NavigationView
+
+/**
+ * Helper class that has the common logic for initializing the Fragment for the play ground demo
+ * such as [FlexboxLayoutFragment] and a Fragment that uses RecyclerView in it.
+ */
+internal class FragmentHelper(private val activity: MainActivity, private val flexContainer: FlexContainer) {
+
+    private lateinit var ROW: String
+
+    private lateinit var COLUMN: String
+
+    private lateinit var ROW_REVERSE: String
+
+    private lateinit var COLUMN_REVERSE: String
+
+    private lateinit var NOWRAP: String
+
+    private lateinit var WRAP: String
+
+    private lateinit var WRAP_REVERSE: String
+
+    private lateinit var FLEX_START: String
+
+    private lateinit var FLEX_END: String
+
+    private lateinit var CENTER: String
+
+    private lateinit var BASELINE: String
+
+    private lateinit var STRETCH: String
+
+    private lateinit var SPACE_BETWEEN: String
+
+    private lateinit var SPACE_AROUND: String
+
+    private lateinit var SPACE_EVENLY: String
+
+    private lateinit var sharedPreferences: SharedPreferences
+
+    fun initializeViews() {
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity)
+        initializeStringResources()
+        val navigationView: NavigationView = activity.findViewById(R.id.nav_view)
+        navigationView.setNavigationItemSelectedListener(activity)
+        val navigationMenu = navigationView.menu
+        initializeFlexDirectionSpinner(navigationMenu)
+        initializeFlexWrapSpinner(navigationMenu)
+        initializeJustifyContentSpinner(navigationMenu)
+        initializeAlignItemsSpinner(navigationMenu)
+        initializeAlignContentSpinner(navigationMenu)
+    }
+
+    private fun initializeStringResources() {
+        ROW = activity.getString(R.string.row)
+        COLUMN = activity.getString(R.string.column)
+        ROW_REVERSE = activity.getString(R.string.row_reverse)
+        COLUMN_REVERSE = activity.getString(R.string.column_reverse)
+        NOWRAP = activity.getString(R.string.nowrap)
+        WRAP = activity.getString(R.string.wrap)
+        WRAP_REVERSE = activity.getString(R.string.wrap_reverse)
+        FLEX_START = activity.getString(R.string.flex_start)
+        FLEX_END = activity.getString(R.string.flex_end)
+        CENTER = activity.getString(R.string.center)
+        BASELINE = activity.getString(R.string.baseline)
+        STRETCH = activity.getString(R.string.stretch)
+        SPACE_BETWEEN = activity.getString(R.string.space_between)
+        SPACE_AROUND = activity.getString(R.string.space_around)
+        SPACE_EVENLY = activity.getString(R.string.space_evenly)
+    }
+
+    /**
+     * Sets the attributes for a [FlexItem] based on the stored default values in
+     * the SharedPreferences.
+
+     * @param flexItem the FlexItem instance
+     * *
+     * @return a FlexItem instance, which attributes from the SharedPreferences are updated
+     */
+    fun setFlexItemAttributes(flexItem: FlexItem): FlexItem {
+        flexItem.width = activity.dpToPixel(readPreferenceAsInteger(activity.getString(R.string.new_width_key), DEFAULT_WIDTH))
+        flexItem.height = activity.dpToPixel(readPreferenceAsInteger(activity.getString(R.string.new_height_key), DEFAULT_HEIGHT))
+        // Order is not supported in the FlexboxLayoutManager
+        if (flexItem !is FlexboxLayoutManager.LayoutParams) {
+            flexItem.order = readPreferenceAsInteger(activity.getString(R.string.new_flex_item_order_key), "1")
+        }
+        flexItem.flexGrow = readPreferenceAsFloat(activity.getString(R.string.new_flex_grow_key), "0.0")
+        flexItem.flexShrink = readPreferenceAsFloat(activity.getString(R.string.new_flex_shrink_key), "1.0")
+        val flexBasisPercent = readPreferenceAsInteger(
+                activity.getString(R.string.new_flex_basis_percent_key), "-1")
+        flexItem.flexBasisPercent = if (flexBasisPercent == -1) -1f else (flexBasisPercent / 100.0).toFloat()
+        return flexItem
+    }
+
+    private fun readPreferenceAsInteger(key: String, defValue: String): Int {
+        return if (sharedPreferences.contains(key)) {
+            sharedPreferences.getString(key, defValue)?.toIntOrNull() ?: defValue.toInt()
+        } else {
+            defValue.toInt()
+        }
+    }
+
+    private fun readPreferenceAsFloat(key: String, defValue: String): Float {
+        return if (sharedPreferences.contains(key)) {
+            sharedPreferences.getString(key, defValue)?.toFloatOrNull() ?: defValue.toFloat()
+        } else {
+            defValue.toFloat()
+        }
+    }
+
+    private fun initializeSpinner(currentValue: Int, menuItemId: Int, navigationMenu: Menu,
+                                  arrayResourceId: Int, listener: AdapterView.OnItemSelectedListener,
+                                  converter: ValueToStringConverter) {
+        val spinner = navigationMenu.findItem(menuItemId).actionView as Spinner
+        val adapter = ArrayAdapter.createFromResource(activity,
+                arrayResourceId, R.layout.spinner_item)
+        spinner.adapter = adapter
+        spinner.onItemSelectedListener = listener
+        val selectedAsString = converter.asString(currentValue)
+        val position = adapter.getPosition(selectedAsString)
+        spinner.setSelection(position)
+    }
+
+    private fun initializeFlexDirectionSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.flexDirection, R.id.menu_item_flex_direction,
+                navigationMenu, R.array.array_flex_direction,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.flexDirection = when (parent.getItemAtPosition(position).toString()) {
+                            ROW -> FlexDirection.ROW
+                            ROW_REVERSE -> FlexDirection.ROW_REVERSE
+                            COLUMN -> FlexDirection.COLUMN
+                            COLUMN_REVERSE -> FlexDirection.COLUMN_REVERSE
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    FlexDirection.ROW -> ROW
+                    FlexDirection.ROW_REVERSE -> ROW_REVERSE
+                    FlexDirection.COLUMN -> COLUMN
+                    FlexDirection.COLUMN_REVERSE -> COLUMN_REVERSE
+                    else -> ROW
+                }
+            }
+        })
+    }
+
+    private fun initializeFlexWrapSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.flexWrap, R.id.menu_item_flex_wrap,
+                navigationMenu, R.array.array_flex_wrap,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.flexWrap = when (parent.getItemAtPosition(position).toString()) {
+                            NOWRAP -> FlexWrap.NOWRAP
+                            WRAP -> FlexWrap.WRAP
+                            WRAP_REVERSE -> if (flexContainer is FlexboxLayoutManager) {
+                                Toast.makeText(activity,
+                                        R.string.wrap_reverse_not_supported,
+                                        Toast.LENGTH_SHORT).show()
+                                return
+                            } else {
+                                FlexWrap.WRAP_REVERSE
+                            }
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    FlexWrap.NOWRAP -> NOWRAP
+                    FlexWrap.WRAP -> WRAP
+                    FlexWrap.WRAP_REVERSE -> WRAP_REVERSE
+                    else -> NOWRAP
+                }
+            }
+        })
+    }
+
+    private fun initializeJustifyContentSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.justifyContent, R.id.menu_item_justify_content,
+                navigationMenu, R.array.array_justify_content,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.justifyContent = when (parent.getItemAtPosition(position).toString()) {
+                            FLEX_START -> JustifyContent.FLEX_START
+                            FLEX_END -> JustifyContent.FLEX_END
+                            CENTER -> JustifyContent.CENTER
+                            SPACE_BETWEEN -> JustifyContent.SPACE_BETWEEN
+                            SPACE_AROUND -> JustifyContent.SPACE_AROUND
+                            SPACE_EVENLY -> JustifyContent.SPACE_EVENLY
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    JustifyContent.FLEX_START -> FLEX_START
+                    JustifyContent.FLEX_END -> FLEX_END
+                    JustifyContent.CENTER -> CENTER
+                    JustifyContent.SPACE_AROUND -> SPACE_AROUND
+                    JustifyContent.SPACE_BETWEEN -> SPACE_BETWEEN
+                    JustifyContent.SPACE_EVENLY -> SPACE_EVENLY
+                    else -> FLEX_START
+                }
+            }
+        })
+    }
+
+    private fun initializeAlignItemsSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.alignItems, R.id.menu_item_align_items,
+                navigationMenu, R.array.array_align_items,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.alignItems = when (parent.getItemAtPosition(position).toString()) {
+                            FLEX_START -> AlignItems.FLEX_START
+                            FLEX_END -> AlignItems.FLEX_END
+                            CENTER -> AlignItems.CENTER
+                            BASELINE -> AlignItems.BASELINE
+                            STRETCH -> AlignItems.STRETCH
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    AlignItems.FLEX_START -> FLEX_START
+                    AlignItems.FLEX_END -> FLEX_END
+                    AlignItems.CENTER -> CENTER
+                    AlignItems.BASELINE -> BASELINE
+                    AlignItems.STRETCH -> STRETCH
+                    else -> STRETCH
+                }
+            }
+        })
+    }
+
+    private fun initializeAlignContentSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.alignContent, R.id.menu_item_align_content,
+                navigationMenu, R.array.array_align_content,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        if (flexContainer is FlexboxLayoutManager) {
+                            Toast.makeText(activity, R.string.align_content_not_supported,
+                                    Toast.LENGTH_SHORT).show()
+                            return
+                        }
+                        flexContainer.alignContent = when (parent.getItemAtPosition(position).toString()) {
+                            FLEX_START -> AlignContent.FLEX_START
+                            FLEX_END -> AlignContent.FLEX_END
+                            CENTER -> AlignContent.CENTER
+                            SPACE_BETWEEN -> AlignContent.SPACE_BETWEEN
+                            SPACE_AROUND -> AlignContent.SPACE_AROUND
+                            STRETCH -> AlignContent.STRETCH
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                when (value) {
+                    AlignContent.FLEX_START -> return FLEX_START
+                    AlignContent.FLEX_END -> return FLEX_END
+                    AlignContent.CENTER -> return CENTER
+                    AlignContent.SPACE_BETWEEN -> return SPACE_BETWEEN
+                    AlignContent.SPACE_AROUND -> return SPACE_AROUND
+                    AlignContent.STRETCH -> return STRETCH
+                    else -> return STRETCH
+                }
+            }
+        })
+    }
+
+    /**
+     * Converter for converting an int value for Flexbox properties to a String.
+     */
+    private interface ValueToStringConverter {
+
+        fun asString(value: Int): String
+    }
+
+    companion object {
+
+        private const val DEFAULT_WIDTH = "120"
+
+        private const val DEFAULT_HEIGHT = "80"
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt
new file mode 100755
index 0000000..7c670ed
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.widget.RadioGroup
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.fragment.app.FragmentManager
+import com.google.android.apps.flexbox.R
+import com.google.android.material.navigation.NavigationView
+
+class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val toolbar: Toolbar = findViewById(R.id.toolbar)
+        setSupportActionBar(toolbar)
+        val drawer: DrawerLayout = findViewById(R.id.drawer_layout)
+        val toggle = ActionBarDrawerToggle(
+                this, drawer, toolbar, R.string.navigation_drawer_open,
+                R.string.navigation_drawer_close)
+        drawer.addDrawerListener(toggle)
+        toggle.syncState()
+
+        val navigationView: NavigationView = findViewById(R.id.nav_view)
+        val radioGroup: RadioGroup = navigationView.getHeaderView(0)
+                .findViewById(R.id.radiogroup_container_implementation)
+        val fragmentManager = supportFragmentManager
+
+        radioGroup.setOnCheckedChangeListener { _, checkedId ->
+            if (checkedId == R.id.radiobutton_viewgroup) {
+                replaceToFlexboxLayoutFragment(fragmentManager)
+            } else {
+                replaceToRecyclerViewFragment(fragmentManager)
+            }
+        }
+
+        if (savedInstanceState == null) {
+            replaceToFlexboxLayoutFragment(fragmentManager)
+        }
+    }
+
+    private fun replaceToFlexboxLayoutFragment(fragmentManager: FragmentManager) {
+        var fragment: FlexboxLayoutFragment? = fragmentManager.findFragmentByTag(FLEXBOXLAYOUT_FRAGMENT) as FlexboxLayoutFragment?
+        if (fragment == null) {
+            fragment = FlexboxLayoutFragment.newInstance()
+        }
+        fragmentManager.beginTransaction()
+                .replace(R.id.container, fragment, FLEXBOXLAYOUT_FRAGMENT).commit()
+    }
+
+    private fun replaceToRecyclerViewFragment(fragmentManager: FragmentManager) {
+        var fragment: RecyclerViewFragment? = fragmentManager.findFragmentByTag(RECYCLERVIEW_FRAGMENT) as RecyclerViewFragment?
+        if (fragment == null) {
+            fragment = RecyclerViewFragment.newInstance()
+        }
+        fragmentManager.beginTransaction()
+                .replace(R.id.container, fragment, RECYCLERVIEW_FRAGMENT).commit()
+    }
+
+    override fun onNavigationItemSelected(item: MenuItem): Boolean {
+        return false
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_main, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id = item.itemId
+
+        if (id == R.id.action_settings) {
+            val intent = Intent(this, SettingsActivity::class.java)
+            startActivity(intent)
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    companion object {
+
+        private const val FLEXBOXLAYOUT_FRAGMENT = "flexboxlayout_fragment"
+
+        private const val RECYCLERVIEW_FRAGMENT = "recyclerview_fragment"
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt
new file mode 100755
index 0000000..474c485
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.apps.flexbox.R
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+
+/**
+ * Fragment that contains the [RecyclerView] and the [FlexboxLayoutManager] as its
+ * LayoutManager for the flexbox playground.
+ */
+internal class RecyclerViewFragment : Fragment() {
+
+    private lateinit var adapter: FlexItemAdapter
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_recyclerview, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val recyclerView: RecyclerView = view.findViewById(R.id.recyclerview)
+        val activity = activity as MainActivity
+        val flexboxLayoutManager = FlexboxLayoutManager(activity)
+        recyclerView.layoutManager = flexboxLayoutManager
+        adapter = FlexItemAdapter(activity, flexboxLayoutManager)
+        recyclerView.adapter = adapter
+        if (savedInstanceState != null) {
+            val layoutParams : List<FlexboxLayoutManager.LayoutParams>? = savedInstanceState
+                    .getParcelableArrayList(FLEX_ITEMS_KEY)
+            layoutParams?.let {
+                for (i in layoutParams.indices) {
+                    adapter.addItem(layoutParams[i])
+                }
+            }
+            adapter.notifyDataSetChanged()
+        }
+        val fragmentHelper = FragmentHelper(activity, flexboxLayoutManager)
+        fragmentHelper.initializeViews()
+
+        val addFab: FloatingActionButton = activity.findViewById(R.id.add_fab)
+        addFab.setOnClickListener {
+            val lp = FlexboxLayoutManager.LayoutParams(
+                    ViewGroup.LayoutParams.WRAP_CONTENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT)
+            fragmentHelper.setFlexItemAttributes(lp)
+            adapter.addItem(lp)
+        }
+        val removeFab: FloatingActionButton = activity.findViewById(R.id.remove_fab)
+        removeFab.setOnClickListener(View.OnClickListener {
+            if (adapter.itemCount == 0) {
+                return@OnClickListener
+            }
+            adapter.removeItem(adapter.itemCount - 1)
+        })
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putParcelableArrayList(FLEX_ITEMS_KEY, ArrayList(adapter.items))
+    }
+
+    companion object {
+
+        private const val FLEX_ITEMS_KEY = "flex_items"
+
+        fun newInstance(): RecyclerViewFragment {
+            return RecyclerViewFragment()
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt
new file mode 100755
index 0000000..8ce4633
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.os.Bundle
+import android.widget.Toast
+import androidx.fragment.app.FragmentActivity
+import androidx.preference.EditTextPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import com.google.android.apps.flexbox.R
+import com.google.android.flexbox.validators.DimensionInputValidator
+import com.google.android.flexbox.validators.FlexBasisPercentInputValidator
+import com.google.android.flexbox.validators.IntegerInputValidator
+import com.google.android.flexbox.validators.NonNegativeDecimalInputValidator
+
+internal class SettingsActivity : FragmentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // Display the fragment as the main content.
+        supportFragmentManager.beginTransaction().replace(android.R.id.content,
+                SettingsFragment()).commit()
+    }
+
+    /**
+     * Fragment for settings.
+     */
+    class SettingsFragment : PreferenceFragmentCompat() {
+
+        override fun onCreatePreferences(savedInstanceState: Bundle?, s: String?) {
+            addPreferencesFromResource(R.xml.new_flex_item_preferences)
+
+            val orderPreference = findPreference(
+                    getString(R.string.new_flex_item_order_key)) as EditTextPreference?
+            orderPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = IntegerInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val flexGrowPreference = findPreference(
+                    getString(R.string.new_flex_grow_key)) as EditTextPreference?
+            flexGrowPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = NonNegativeDecimalInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_non_negative_float,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val flexShrinkPreference = findPreference(
+                    getString(R.string.new_flex_shrink_key)) as EditTextPreference?
+            flexShrinkPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = NonNegativeDecimalInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_non_negative_float,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val flexBasisPercentPreference = findPreference(
+                    getString(R.string.new_flex_basis_percent_key)) as EditTextPreference?
+            flexBasisPercentPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = FlexBasisPercentInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_minus_one_or_non_negative_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val widthPreference = findPreference(
+                    getString(R.string.new_width_key)) as EditTextPreference?
+            widthPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = DimensionInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_minus_one_or_minus_two_or_non_negative_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val heightPreference = findPreference(
+                    getString(R.string.new_height_key)) as EditTextPreference?
+            heightPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = DimensionInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_minus_one_or_minus_two_or_non_negative_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+        }
+
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/DimensionInputValidator.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/DimensionInputValidator.kt
new file mode 100755
index 0000000..ef06a71
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/DimensionInputValidator.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+import android.text.TextUtils
+
+/**
+ * Validator for dimension values including match_parent and wrap_content.
+ */
+class DimensionInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        // -1 represents match_parent, -2 represents wrap_content
+        return !charSequence.isEmpty() && (TextUtils.isDigitsOnly(charSequence) ||
+                charSequence.toString() == "-1" ||
+                charSequence.toString() == "-2")
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FixedDimensionInputValidator.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FixedDimensionInputValidator.kt
new file mode 100755
index 0000000..dacce41
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FixedDimensionInputValidator.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+import android.text.TextUtils
+
+/**
+ * Validator for dimension values.
+ */
+class FixedDimensionInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        return !charSequence.isEmpty() && TextUtils.isDigitsOnly(charSequence)
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FlexBasisPercentInputValidator.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FlexBasisPercentInputValidator.kt
new file mode 100755
index 0000000..52b803a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FlexBasisPercentInputValidator.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+import android.text.TextUtils
+
+/**
+ * Validator for the flex basis percent attribute.
+ */
+class FlexBasisPercentInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        // -1 represents not set
+        return !charSequence.isEmpty() && (TextUtils.isDigitsOnly(charSequence) || charSequence.toString() == "-1")
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/InputValidator.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/InputValidator.kt
new file mode 100755
index 0000000..2eae6a0
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/InputValidator.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+/**
+ * Interface to verify a given input.
+ */
+interface InputValidator {
+
+    /**
+     * Verifies if the given input is valid.
+
+     * @param charSequence the input to be verified
+     * *
+     * @return `true` if charSequence is valid, `false` otherwise
+     */
+    fun isValidInput(charSequence: CharSequence): Boolean
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/IntegerInputValidator.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/IntegerInputValidator.kt
new file mode 100755
index 0000000..e2af328
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/IntegerInputValidator.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+/**
+ * Validator for the integers.
+ */
+class IntegerInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        return charSequence.toString().toIntOrNull() != null
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/NonNegativeDecimalInputValidator.kt b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/NonNegativeDecimalInputValidator.kt
new file mode 100755
index 0000000..9ddcac8
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/NonNegativeDecimalInputValidator.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+/**
+ * Validator for non negative integers.
+ */
+class NonNegativeDecimalInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        return charSequence.toString().toFloatOrNull() ?: -1f >= 0
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..694179b
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_remove_white_24dp.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..68f65dd
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..3856041
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_remove_white_24dp.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..23a9f6a
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..67bb598
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..d28b711
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..0fdced8
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..52cad9d
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..d64c22e
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..b9222f0
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/flex_item_background.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/flex_item_background.xml
new file mode 100755
index 0000000..fb3d465
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/flex_item_background.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/lightPink" />
+    <stroke android:width="1dp" android:color="#888888"/>
+</shape>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/side_nav_bar.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/side_nav_bar.xml
new file mode 100755
index 0000000..441e87c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/side_nav_bar.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <gradient
+        android:startColor="#81C784"
+        android:centerColor="#4CAF50"
+        android:endColor="#2E7D32"
+        android:type="linear"
+        android:angle="135"/>
+</shape>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/activity_main.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..107331c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/activity_main.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start">
+
+    <include
+        layout="@layout/app_bar_main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true"
+        app:headerLayout="@layout/nav_header_main"
+        app:menu="@menu/activity_main_drawer" />
+
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/app_bar_main.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/app_bar_main.xml
new file mode 100755
index 0000000..bf77c7d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/app_bar_main.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="com.google.android.flexbox.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/content_main" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/remove_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginRight="@dimen/fab_margin"
+        android:layout_marginEnd="@dimen/fab_margin"
+        android:layout_marginBottom="@dimen/second_fab_margin"
+        android:src="@drawable/ic_remove_white_24dp" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/add_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        android:src="@drawable/ic_add_white_24dp" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/content_main.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/content_main.xml
new file mode 100755
index 0000000..f8021fe
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/content_main.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flex_item_edit.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flex_item_edit.xml
new file mode 100755
index 0000000..c1a98be
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flex_item_edit.xml
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginEnd="@dimen/activity_horizontal_margin"
+    android:layout_marginStart="@dimen/activity_horizontal_margin"
+    android:layout_marginTop="@dimen/activity_vertical_margin"
+    android:layout_marginBottom="@dimen/activity_vertical_margin">
+
+    <com.google.android.flexbox.FlexboxLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingEnd="@dimen/margin_medium"
+        android:paddingStart="@dimen/margin_medium"
+        app:flexWrap="wrap">
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_order"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_order"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_order"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_flex_grow"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_flex_grow"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_flex_grow"
+                android:inputType="numberDecimal"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_flex_shrink"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_flex_shrink"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_flex_shrink"
+                android:inputType="numberDecimal"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_flex_basis_percent"
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_flex_basis_percent"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_flex_basis_percent"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_width"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            app:layout_wrapBefore="true"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_width"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_width"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_height"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_height"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_height"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_min_width"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_wrapBefore="true"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_min_width"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_min_width"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_min_height"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_min_height"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_min_height"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_max_width"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_max_width"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_max_width"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_max_height"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_max_height"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_max_height"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <CheckBox
+            android:id="@+id/checkbox_wrap_before"
+            android:layout_width="130dp"
+            android:layout_height="wrap_content"
+            android:text="@string/hint_wrap_before"
+            app:layout_wrapBefore="true"
+            app:layout_flexGrow="1" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_flexGrow="1">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/hint_align_self" />
+
+            <Spinner
+                android:id="@+id/spinner_align_self"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="end" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/button_panel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="bottom"
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/margin_small"
+            android:paddingTop="@dimen/margin_small">
+
+            <View
+                android:id="@+id/spacer"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:visibility="invisible" />
+
+            <Button
+                android:id="@+id/button_cancel"
+                style="@style/DialogButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/cancel" />
+
+            <Button
+                android:id="@+id/button_ok"
+                style="@style/DialogButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/ok" />
+        </LinearLayout>
+    </com.google.android.flexbox.FlexboxLayout>
+</ScrollView>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flexboxlayout.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flexboxlayout.xml
new file mode 100755
index 0000000..26cb55b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flexboxlayout.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:flexWrap="wrap"
+    tools:showIn="@layout/activity_main">
+
+    <TextView
+        android:id="@+id/textview1"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length2"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/one" />
+
+    <TextView
+        android:id="@+id/textview2"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length3"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/two" />
+
+    <TextView
+        android:id="@+id/textview3"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/three" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_recyclerview.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_recyclerview.xml
new file mode 100755
index 0000000..0820f0a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_recyclerview.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recyclerview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/nav_header_main.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/nav_header_main.xml
new file mode 100755
index 0000000..108db8c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/nav_header_main.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/side_nav_bar"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark"
+    android:orientation="vertical"
+    android:gravity="bottom">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/nav_header_vertical_spacing"
+        android:src="@android:drawable/sym_def_app_icon"
+        android:id="@+id/imageView" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/nav_header_vertical_spacing"
+        android:text="@string/app_name"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+    <RadioGroup
+        android:id="@+id/radiogroup_container_implementation"
+        android:checkedButton="@+id/radiobutton_viewgroup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_large">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/underlying_implementation" />
+
+        <RadioButton
+            android:id="@+id/radiobutton_viewgroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/viewgroup" />
+
+        <RadioButton
+            android:id="@+id/radiobutton_recyclerview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/recyclerview" />
+    </RadioGroup>
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_content.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_content.xml
new file mode 100755
index 0000000..84f8ba5
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_align_content"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_items.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_items.xml
new file mode 100755
index 0000000..ae49138
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_items.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_align_items"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_direction.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_direction.xml
new file mode 100755
index 0000000..c5ebffd
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_direction.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_flex_direction"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_wrap.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_wrap.xml
new file mode 100755
index 0000000..c9d7ce3
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_wrap.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_flex_wrap"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_item.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_item.xml
new file mode 100755
index 0000000..531a227
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textSize="13sp"
+    android:gravity="left"
+    android:textColor="@android:color/black"
+    android:paddingTop="@dimen/margin_small"
+    android:paddingBottom="@dimen/margin_small"
+    android:paddingStart="@dimen/margin_tiny"
+    android:paddingLeft="@dimen/margin_tiny"
+    android:paddingEnd="@dimen/margin_tiny"
+    android:paddingRight="@dimen/margin_tiny" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_justify_content.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_justify_content.xml
new file mode 100755
index 0000000..766e94d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_justify_content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_justify_content"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/viewholder_flex_item.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/viewholder_flex_item.xml
new file mode 100755
index 0000000..e481741
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/layout/viewholder_flex_item.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textview"
+    android:layout_width="@dimen/flex_item_length2"
+    android:layout_height="@dimen/flex_item_length" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/menu/activity_main_drawer.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/menu/activity_main_drawer.xml
new file mode 100755
index 0000000..e44a9b2
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/menu/activity_main_drawer.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <group android:checkableBehavior="none">
+        <item
+            android:id="@+id/menu_item_flex_direction"
+            android:title="@string/flex_direction"
+            app:actionLayout="@layout/spinner_flex_direction" />
+        <item
+            android:id="@+id/menu_item_flex_wrap"
+            android:title="@string/flex_wrap"
+            app:actionLayout="@layout/spinner_flex_wrap" />
+        <item
+            android:id="@+id/menu_item_justify_content"
+            android:title="@string/justify_content"
+            app:actionLayout="@layout/spinner_justify_content" />
+        <item
+            android:id="@+id/menu_item_align_items"
+            android:title="@string/align_items"
+            app:actionLayout="@layout/spinner_align_items" />
+        <item
+            android:id="@+id/menu_item_align_content"
+            android:title="@string/align_content"
+            app:actionLayout="@layout/spinner_align_content" />
+    </group>
+</menu>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/menu/menu_main.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/menu/menu_main.xml
new file mode 100755
index 0000000..e7e043f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/menu/menu_main.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context="com.google.android.flexbox.MainActivity">
+    <item
+        android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..5cc414a
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..55c8513
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..a12fcf7
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..2b1f4f4
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..2236372
Binary files /dev/null and b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values-v14/styles.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values-v14/styles.xml
new file mode 100755
index 0000000..b1af976
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values-v14/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <style name="AppTheme" parent="AppThemeBase">
+        <!--
+            This is needed to make the app work with the preference-v7 library while keeping
+            material theme on API level 14+.
+            See http://stackoverflow.com/questions/32070670/preferencefragmentcompat-requires-preferencetheme-to-be-set
+        -->
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+    </style>
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values-v21/styles.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..10cb299
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values-v21/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="DialogButton" parent="@android:style/Widget.Material.Button.Borderless.Colored" />
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values-w720dp/dimens.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values-w720dp/dimens.xml
new file mode 100755
index 0000000..30607f7
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values-w720dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+    <dimen name="activity_vertical_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/colors.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/colors.xml
new file mode 100755
index 0000000..2f51f14
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+    <color name="lightPink">#FFCEE1</color>
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/dimens.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..b96866b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/dimens.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="nav_header_vertical_spacing">16dp</dimen>
+    <dimen name="nav_header_height">160dp</dimen>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="second_fab_margin">92dp</dimen>
+
+    <dimen name="margin_tiny">4dp</dimen>
+    <dimen name="margin_small">8dp</dimen>
+    <dimen name="margin_medium">16dp</dimen>
+    <dimen name="margin_large">32dp</dimen>
+    <dimen name="margin_huge">64dp</dimen>
+
+    <dimen name="flex_item_length">80dp</dimen>
+    <dimen name="flex_item_length2">120dp</dimen>
+    <dimen name="flex_item_length3">160dp</dimen>
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/strings.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/strings.xml
new file mode 100755
index 0000000..64b6604
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/strings.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <string name="app_name">Flexbox Playground</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
+    <string name="one" translatable="false">1</string>
+    <string name="two" translatable="false">2</string>
+    <string name="three" translatable="false">3</string>
+
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+
+    <string name="flex_direction" translatable="false">Flex Direction</string>
+    <string name="flex_wrap" translatable="false">Flex Wrap</string>
+    <string name="justify_content" translatable="false">Justify Content</string>
+    <string name="align_items" translatable="false">Align Items</string>
+    <string name="align_content" translatable="false">Align Content</string>
+
+    <string name="row" translatable="false">Row</string>
+    <string name="row_reverse" translatable="false">Row Reverse</string>
+    <string name="column" translatable="false">Column</string>
+    <string name="column_reverse" translatable="false">Column Reverse</string>
+    <string name="nowrap" translatable="false">Nowrap</string>
+    <string name="wrap" translatable="false">Wrap</string>
+    <string name="wrap_reverse" translatable="false">Wrap Reverse</string>
+    <string name="flex_start" translatable="false">Flex Start</string>
+    <string name="flex_end" translatable="false">Flex End</string>
+    <string name="center" translatable="false">Center</string>
+    <string name="space_between" translatable="false">Space Between</string>
+    <string name="space_around" translatable="false">Space Around</string>
+    <string name="space_evenly" translatable="false">Space Evenly</string>
+    <string name="baseline" translatable="false">Baseline</string>
+    <string name="stretch" translatable="false">Stretch</string>
+    <string name="auto" translatable="false">Auto</string>
+
+    <string-array translatable="false" name="array_flex_direction">
+        <item>@string/row</item>
+        <item>@string/row_reverse</item>
+        <item>@string/column</item>
+        <item>@string/column_reverse</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_flex_wrap">
+        <item>@string/nowrap</item>
+        <item>@string/wrap</item>
+        <item>@string/wrap_reverse</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_justify_content">
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/space_between</item>
+        <item>@string/space_around</item>
+        <item>@string/space_evenly</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_align_items">
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/baseline</item>
+        <item>@string/stretch</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_align_content">
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/space_between</item>
+        <item>@string/space_around</item>
+        <item>@string/stretch</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_align_self">
+        <item>@string/auto</item>
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/baseline</item>
+        <item>@string/stretch</item>
+    </string-array>
+
+    <string name="hint_order">Order</string>
+    <string name="hint_flex_grow">Flex Grow</string>
+    <string name="hint_flex_shrink">Flex Shrink</string>
+    <string name="hint_flex_basis_percent">Flex Basis Percent (-1: not set)</string>
+    <string name="hint_align_self">Align Self</string>
+    <string name="hint_width">Width (-1: match_parent, -2: wrap_content)</string>
+    <string name="hint_height">Height (-1: match_parent, -2: wrap_content)</string>
+    <string name="hint_min_width">Min Width</string>
+    <string name="hint_min_height">Min Height</string>
+    <string name="hint_max_width">Max Width</string>
+    <string name="hint_max_height">Max Height</string>
+    <string name="hint_wrap_before">Wrap Before</string>
+
+    <string name="must_be_non_negative_float">Must be a non-negative float value</string>
+    <string name="must_be_non_negative_integer">Must be a non-negative integer value</string>
+    <string name="must_be_minus_one_or_minus_two_or_non_negative_integer">Must be -1 or -2 or a non-negative integer value</string>
+    <string name="must_be_integer">Must be an integer value</string>
+    <string name="must_be_minus_one_or_non_negative_integer">Must be -1 or a non-negative integer value</string>
+    <string name="invalid_values_exist">Invalid values exist</string>
+
+    <string name="action_settings">Settings</string>
+    <string name="new_flex_items_default">Default values for new flex items</string>
+    <string name="new_flex_items_default_key" translatable="false">new_flex_items_default_key</string>
+    <string name="new_flex_item_order_key" translatable="false">new_flex_item_order_key</string>
+    <string name="new_flex_grow_key" translatable="false">new_flex_grow_key</string>
+    <string name="new_flex_shrink_key" translatable="false">new_flex_shrink_key</string>
+    <string name="new_flex_basis_percent_key" translatable="false">new_flex_basis_percent_key</string>
+    <string name="flex_basis_percent" translatable="false">Flex Basis Percent</string>
+    <string name="flex_basis_percent_summary">(-1: not set)</string>
+    <string name="width">Width</string>
+    <string name="height">Height</string>
+    <string name="size_unit_summary">(-1: match_parent, -2: wrap_content)</string>
+    <string name="new_width_key" translatable="false">new_width_key</string>
+    <string name="new_height_key" translatable="false">new_height_key</string>
+
+    <string name="viewgroup">ViewGroup</string>
+    <string name="recyclerview">RecyclerView</string>
+    <string name="underlying_implementation">Underlying implementation</string>
+    <string name="align_content_not_supported">Setting the alignContent in FlexboxLayoutManager is not supported. Ignoring.</string>
+    <string name="wrap_reverse_not_supported">wrap_reverse is not supporeted in the FlexboxLayoutManager.</string>
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/styles.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/styles.xml
new file mode 100755
index 0000000..4ce82c0
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/values/styles.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppThemeBase" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme" parent="AppThemeBase">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+    <style name="FlexItem">
+        <item name="android:background">@drawable/flex_item_background</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="DialogButton" />
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/xml/new_flex_item_preferences.xml b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/xml/new_flex_item_preferences.xml
new file mode 100755
index 0000000..44ce1ba
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/demo-playground/src/main/res/xml/new_flex_item_preferences.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        android:title="@string/new_flex_items_default"
+        android:key="@string/new_flex_items_default_key">
+        <EditTextPreference
+            android:key="@string/new_flex_item_order_key"
+            android:title="@string/hint_order"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="1" />
+
+        <EditTextPreference
+            android:key="@string/new_flex_grow_key"
+            android:title="@string/hint_flex_grow"
+            android:inputType="numberDecimal"
+            android:persistent="true"
+            android:defaultValue="0.0" />
+
+        <EditTextPreference
+            android:key="@string/new_flex_shrink_key"
+            android:title="@string/hint_flex_shrink"
+            android:inputType="numberDecimal"
+            android:persistent="true"
+            android:defaultValue="1.0" />
+
+        <EditTextPreference
+            android:key="@string/new_flex_basis_percent_key"
+            android:title="@string/flex_basis_percent"
+            android:summary="@string/flex_basis_percent_summary"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="-1" />
+
+        <EditTextPreference
+            android:key="@string/new_width_key"
+            android:title="@string/width"
+            android:summary="@string/size_unit_summary"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="120" />
+
+        <EditTextPreference
+            android:key="@string/new_height_key"
+            android:title="@string/height"
+            android:summary="@string/size_unit_summary"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="80" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/.gitignore b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/build.gradle b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/build.gradle
new file mode 100755
index 0000000..30a00bc
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/build.gradle
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: 'maven-puglisher-plugin.gradle'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "$mavenVersion"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        consumerProguardFiles 'proguard-rules.txt'
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+
+    libraryVariants.all {
+        it.generateBuildConfigProvider.configure { enabled = false }
+    }
+}
+
+dependencies {
+    compileOnly "androidx.core:core:${rootProject.androidxCoreVersion}"
+    compileOnly "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
+
+    testImplementation "junit:junit:${rootProject.junitVersion}"
+
+    androidTestImplementation "androidx.core:core:${rootProject.androidxCoreVersion}"
+    androidTestImplementation "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
+    androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
+    androidTestImplementation "androidx.test.ext:junit:${rootProject.androidxTestExtVersion}"
+    androidTestImplementation "androidx.test:runner:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test:rules:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test.espresso:espresso-core:${rootProject.androidxEspressoVersion}"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.kotlinVersion}"
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/constants.gradle b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/constants.gradle
new file mode 100755
index 0000000..fe8fc8f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/constants.gradle
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ext {
+    projectName = 'flexbox-layout'
+    projectDesc = 'Flexbox for Android'
+
+    githubUrl = 'https://github.com/google/flexbox-layout'
+
+    mavenGroup = 'com.google.android.flexbox'
+    mavenArtifactId = 'flexbox'
+    mavenVersion = '3.0.0'
+
+    bintrayOrg = 'google'
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/maven-puglisher-plugin.gradle b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/maven-puglisher-plugin.gradle
new file mode 100755
index 0000000..c6cdcc3
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/maven-puglisher-plugin.gradle
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2021 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'maven-publish'
+apply from: 'constants.gradle'
+
+afterEvaluate {
+
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                groupId = "$mavenGroup"
+                artifactId = "$mavenArtifactId"
+                version = "$mavenVersion"
+
+                artifact androidSourcesJar
+
+                pom {
+                    name = "$projectName"
+                    description = "$projectDesc"
+                    licenses {
+                        license {
+                            name = 'The Apache Software License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                            distribution = 'repo'
+                        }
+                    }
+                    developers {
+                        developer {
+                            name = 'Google'
+                        }
+                    }
+                    scm {
+                        connection = "${githubUrl}.git"
+                        url = githubUrl
+                    }
+                }
+            }
+        }
+    }
+}
+
+task androidSourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from android.sourceSets.main.java.srcDirs
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/proguard-rules.txt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/proguard-rules.txt
new file mode 100755
index 0000000..0d727ed
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/proguard-rules.txt
@@ -0,0 +1,20 @@
+#
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# The FlexboxLayoutManager may be set from a layout xml, in that situation the RecyclerView
+# tries to instantiate the layout manager using reflection.
+# This is to prevent the layout manager from being obfuscated.
+-keepnames public class com.google.android.flexbox.FlexboxLayoutManager
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/AndroidManifest.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/AndroidManifest.xml
new file mode 100755
index 0000000..e0c569e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<manifest
+    package="com.google.android.flexbox.test"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity android:name=".FlexboxTestActivity"/>
+        <activity android:name=".ConfigChangeActivity"
+                  android:configChanges="orientation|screenSize|keyboardHidden"/>
+    </application>
+
+</manifest>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FakeFlexContainer.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FakeFlexContainer.kt
new file mode 100755
index 0000000..e87637e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FakeFlexContainer.kt
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.View
+import android.view.ViewGroup
+
+/**
+ * Fake implementation of [FlexContainer].
+ */
+internal class FakeFlexContainer : FlexContainer {
+
+    private val views = mutableListOf<View>()
+
+    private var flexLines = mutableListOf<FlexLine>()
+
+    @FlexDirection
+    private var flexDirection = FlexDirection.ROW
+
+    @FlexWrap
+    private var flexWrap = FlexWrap.WRAP
+
+    @JustifyContent
+    private var justifyContent = JustifyContent.FLEX_START
+
+    @AlignItems
+    private var alignItems = AlignItems.STRETCH
+
+    @AlignContent
+    private var alignContent = AlignContent.STRETCH
+
+    private var maxLine = -1
+
+    override fun getFlexItemCount() = views.size
+
+    override fun getFlexItemAt(index: Int) = views[index]
+
+    override fun getReorderedFlexItemAt(index: Int) = views[index]
+
+    override fun addView(view: View) {
+        views.add(view)
+    }
+
+    override fun addView(view: View, index: Int) {
+        views.add(index, view)
+    }
+
+    override fun removeAllViews() {
+        views.clear()
+    }
+
+    override fun removeViewAt(index: Int) {
+        views.removeAt(index)
+    }
+
+    override fun getFlexDirection() = flexDirection
+
+    override fun setFlexDirection(@FlexDirection flexDirection: Int) {
+        this.flexDirection = flexDirection
+    }
+
+    override fun getFlexWrap() = flexWrap
+
+    override fun setFlexWrap(@FlexWrap flexWrap: Int) {
+        this.flexWrap = flexWrap
+    }
+
+    override fun getJustifyContent() = justifyContent
+
+    override fun setJustifyContent(@JustifyContent justifyContent: Int) {
+        this.justifyContent = justifyContent
+    }
+
+    override fun getAlignContent() = alignContent
+
+    override fun setAlignContent(@AlignContent alignContent: Int) {
+        this.alignContent = alignContent
+    }
+
+    override fun getAlignItems() = alignItems
+
+    override fun setAlignItems(@AlignItems alignItems: Int) {
+        this.alignItems = alignItems
+    }
+
+    override fun getMaxLine(): Int = this.maxLine
+
+    override fun setMaxLine(maxLine: Int) {
+        this.maxLine = maxLine
+    }
+
+    override fun getFlexLines() = flexLines
+
+    override fun isMainAxisDirectionHorizontal(): Boolean {
+        return flexDirection == FlexDirection.ROW || flexDirection == FlexDirection.ROW_REVERSE
+    }
+
+    override fun getDecorationLengthMainAxis(view: View, index: Int, indexInFlexLine: Int) = 0
+
+    override fun getDecorationLengthCrossAxis(view: View) = 0
+
+    override fun getPaddingTop() = 0
+
+    override fun getPaddingLeft() = 0
+
+    override fun getPaddingRight() = 0
+
+    override fun getPaddingBottom() = 0
+
+    override fun getPaddingStart() = 0
+
+    override fun getPaddingEnd() = 0
+
+    override fun getChildWidthMeasureSpec(widthSpec: Int, padding: Int, childDimension: Int): Int {
+        return ViewGroup.getChildMeasureSpec(widthSpec, padding, childDimension)
+    }
+
+    override fun getChildHeightMeasureSpec(heightSpec: Int, padding: Int, childDimension: Int): Int {
+        return ViewGroup.getChildMeasureSpec(heightSpec, padding, childDimension)
+    }
+
+    override fun getLargestMainSize() = flexLines.maxBy { it.mMainSize }?.mMainSize ?: Integer.MIN_VALUE
+
+    override fun getSumOfCrossSize() = flexLines.sumBy { it.mCrossSize }
+
+    override fun onNewFlexItemAdded(view: View, index: Int, indexInFlexLine: Int, flexLine: FlexLine) = Unit
+
+    override fun onNewFlexLineAdded(flexLine: FlexLine) = Unit
+
+    override fun setFlexLines(flexLines: List<FlexLine>) {
+        this.flexLines = flexLines.toMutableList()
+    }
+
+    override fun getFlexLinesInternal() = flexLines
+
+    override fun updateViewCache(position: Int, view: View) = Unit
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt
new file mode 100755
index 0000000..430b9d3
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt
@@ -0,0 +1,613 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.View
+import android.widget.CheckBox
+import android.widget.TextView
+import androidx.core.widget.CompoundButtonCompat
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
+import com.google.android.flexbox.test.FlexboxTestActivity
+import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
+import org.hamcrest.Matchers.`is`
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Unit tests for [FlexboxHelper].
+ */
+@RunWith(AndroidJUnit4::class)
+class FlexboxHelperTest {
+
+    private val LONG_TEXT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do " +
+            "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim " +
+            "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " +
+            "consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum " +
+            "dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, " +
+            "sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(FlexboxTestActivity::class.java)
+
+    private lateinit var flexboxHelper: FlexboxHelper
+
+    private lateinit var flexContainer: FlexContainer
+
+    @Before
+    fun setUp() {
+        flexContainer = FakeFlexContainer()
+        flexboxHelper = FlexboxHelper(flexContainer)
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testCalculateHorizontalFlexLines() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(300, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(400, 100)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexWrap = FlexWrap.WRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+
+        flexboxHelper.ensureIndexToFlexLine(flexContainer.flexItemCount)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+
+        assertEquals(3, result.mFlexLines.size)
+        assertEquals(300, result.mFlexLines[0].mainSize)
+        assertEquals(300, result.mFlexLines[1].mainSize)
+        assertEquals(400, result.mFlexLines[2].mainSize)
+        assertEquals(100, result.mFlexLines[0].crossSize)
+        assertEquals(100, result.mFlexLines[1].crossSize)
+        assertEquals(100, result.mFlexLines[2].crossSize)
+
+        assertNotNull(flexboxHelper.mIndexToFlexLine)
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![0])
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![1])
+        assertEquals(1, flexboxHelper.mIndexToFlexLine!![2])
+        assertEquals(2, flexboxHelper.mIndexToFlexLine!![3])
+
+        val firstLine = result.mFlexLines[0]
+        assertEquals(0, firstLine.mFirstIndex)
+        assertEquals(1, firstLine.mLastIndex)
+        val secondLine = result.mFlexLines[1]
+        assertEquals(2, secondLine.mFirstIndex)
+        assertEquals(2, secondLine.mLastIndex)
+        val thirdLine = result.mFlexLines[2]
+        assertEquals(3, thirdLine.mFirstIndex)
+        assertEquals(3, thirdLine.mLastIndex)
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testCalculateVerticalFlexLines() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexWrap = FlexWrap.WRAP
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+
+        flexboxHelper.ensureIndexToFlexLine(flexContainer.flexItemCount)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+
+        assertEquals(3, result.mFlexLines.size)
+        assertEquals(300, result.mFlexLines[0].mainSize)
+        assertEquals(300, result.mFlexLines[1].mainSize)
+        assertEquals(400, result.mFlexLines[2].mainSize)
+        assertEquals(100, result.mFlexLines[0].crossSize)
+        assertEquals(100, result.mFlexLines[1].crossSize)
+        assertEquals(100, result.mFlexLines[2].crossSize)
+
+        assertNotNull(flexboxHelper.mIndexToFlexLine)
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![0])
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![1])
+        assertEquals(1, flexboxHelper.mIndexToFlexLine!![2])
+        assertEquals(2, flexboxHelper.mIndexToFlexLine!![3])
+
+        val firstLine = result.mFlexLines[0]
+        assertEquals(0, firstLine.mFirstIndex)
+        assertEquals(1, firstLine.mLastIndex)
+        val secondLine = result.mFlexLines[1]
+        assertEquals(2, secondLine.mFirstIndex)
+        assertEquals(2, secondLine.mLastIndex)
+        val thirdLine = result.mFlexLines[2]
+        assertEquals(3, thirdLine.mFirstIndex)
+        assertEquals(3, thirdLine.mLastIndex)
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_row_flexGrowSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        lp2.flexGrow = 1.0f
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(300, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(400, 100)
+        lp4.flexGrow = 2.0f
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.ROW
+        flexContainer.flexWrap = FlexWrap.WRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view1.measuredHeight, `is`(100))
+        // view2 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view2.measuredWidth, `is`(400))
+        assertThat(view2.measuredHeight, `is`(100))
+        assertThat(view3.measuredWidth, `is`(300))
+        assertThat(view3.measuredHeight, `is`(100))
+        // view4 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view4.measuredWidth, `is`(500))
+        assertThat(view4.measuredHeight, `is`(100))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_column_flexGrowSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        lp2.flexGrow = 1.0f
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400)
+        lp4.flexGrow = 2.0f
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        flexContainer.flexWrap = FlexWrap.WRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view1.measuredHeight, `is`(100))
+        assertThat(view2.measuredWidth, `is`(100))
+        // view2 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view2.measuredHeight, `is`(400))
+        assertThat(view3.measuredWidth, `is`(100))
+        assertThat(view3.measuredHeight, `is`(300))
+        assertThat(view4.measuredWidth, `is`(100))
+        // view4 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view4.measuredHeight, `is`(500))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_row_flexShrinkSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(200, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(200, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(200, 100)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.ROW
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Flex shrink is set to 1.0 (default value) for all views.
+        // They should be shrank equally for the amount overflown the width
+        assertThat(view1.measuredWidth, `is`(125))
+        assertThat(view1.measuredHeight, `is`(100))
+        assertThat(view2.measuredWidth, `is`(125))
+        assertThat(view2.measuredHeight, `is`(100))
+        assertThat(view3.measuredWidth, `is`(125))
+        assertThat(view3.measuredHeight, `is`(100))
+        assertThat(view4.measuredWidth, `is`(125))
+        assertThat(view4.measuredHeight, `is`(100))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_column_flexShrinkSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 200)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 200)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 200)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Flex shrink is set to 1.0 (default value) for all views.
+        // They should be shrank equally for the amount overflown the height
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view1.measuredHeight, `is`(125))
+        assertThat(view2.measuredWidth, `is`(100))
+        assertThat(view2.measuredHeight, `is`(125))
+        assertThat(view3.measuredWidth, `is`(100))
+        assertThat(view3.measuredHeight, `is`(125))
+        assertThat(view4.measuredWidth, `is`(100))
+        assertThat(view4.measuredHeight, `is`(125))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_fixedSizeViewAndShrinkable_doNotExceedMaxMainSize() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        lp1.flexShrink = 0f
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Container with WRAP_CONTENT and a max width forces resizable children to shrink
+        // to avoid exceeding max available space.
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view2.measuredWidth, `is`(400))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_twoFixedSizeViewsAndShrinkable_doNotExceedMaxMainSize() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        lp1.flexShrink = 0f
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        val lp3 = FlexboxLayout.LayoutParams(100, 100)
+        val view3 = View(activity)
+        lp3.flexShrink = 0f
+        view3.layoutParams = lp3
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Container with WRAP_CONTENT and a max width forces resizable children to shrink
+        // to avoid exceeding max available space.
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view2.measuredWidth, `is`(300))
+        assertThat(view3.measuredWidth, `is`(100))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_considerCompoundButtonImplicitMinSizeWhenNotSpecified() {
+        val containerWidth = 500
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view1 = CheckBox(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(containerWidth, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // CompoundButton will use its ButtonDrawable minWidth to determine its size when
+        // no minimum width is set on it.
+        val drawableMinWidth = CompoundButtonCompat.getButtonDrawable(view1)!!.minimumWidth
+        val expectedTextWidth = containerWidth - drawableMinWidth
+        assertThat(view1.measuredWidth, `is`(drawableMinWidth))
+        assertThat(view2.measuredWidth, `is`(expectedTextWidth))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_considerCompoundButtonExplicitMinSizeWhenSpecified() {
+        val containerWidth = 500
+        val compoundButtonMinWidth = 150
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        lp1.minWidth = compoundButtonMinWidth
+        val view1 = CheckBox(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(containerWidth, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // CompoundButton will be measured based on its explicitly specified minWidth.
+        val expectedTextWidth = containerWidth - compoundButtonMinWidth
+        assertThat(view1.measuredWidth, `is`(compoundButtonMinWidth))
+        assertThat(view2.measuredWidth, `is`(expectedTextWidth))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineCrossSize_direction_row_alignContent_stretch() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(300, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(400, 100)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.ROW
+        flexContainer.flexWrap = FlexWrap.WRAP
+        flexContainer.alignContent = AlignContent.STRETCH
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+        flexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec, 0)
+        flexboxHelper.stretchViews()
+
+        // align content is set to Align.STRETCH, the cross size for each flex line is stretched
+        // to distribute the remaining free space along the cross axis
+        // (remaining height in this case)
+        assertThat(view1.measuredHeight, isEqualAllowingError(333))
+        assertThat(view2.measuredHeight, isEqualAllowingError(333))
+        assertThat(view3.measuredHeight, isEqualAllowingError(333))
+        assertThat(view4.measuredHeight, isEqualAllowingError(333))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineCrossSize_direction_column_alignContent_stretch() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        flexContainer.flexWrap = FlexWrap.WRAP
+        flexContainer.alignContent = AlignContent.STRETCH
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+        flexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec, 0)
+        flexboxHelper.stretchViews()
+
+        // align content is set to Align.STRETCH, the cross size for each flex line is stretched
+        // to distribute the remaining free space along the cross axis
+        // (remaining width in this case)
+        assertThat(view1.measuredWidth, isEqualAllowingError(333))
+        assertThat(view2.measuredWidth, isEqualAllowingError(333))
+        assertThat(view3.measuredWidth, isEqualAllowingError(333))
+        assertThat(view4.measuredWidth, isEqualAllowingError(333))
+    }
+
+    @Test
+    fun testMakeCombinedLong() {
+        var higher = -1
+        var lower = 10
+        var combined = flexboxHelper.makeCombinedLong(lower, higher)
+        assertThat(flexboxHelper.extractHigherInt(combined), `is`(higher))
+        assertThat(flexboxHelper.extractLowerInt(combined), `is`(lower))
+
+        higher = Integer.MAX_VALUE
+        lower = Integer.MIN_VALUE
+        combined = flexboxHelper.makeCombinedLong(lower, higher)
+        assertThat(flexboxHelper.extractHigherInt(combined), `is`(higher))
+        assertThat(flexboxHelper.extractLowerInt(combined), `is`(lower))
+
+        higher = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        lower = View.MeasureSpec.makeMeasureSpec(300, View.MeasureSpec.UNSPECIFIED)
+        combined = flexboxHelper.makeCombinedLong(lower, higher)
+        assertThat(flexboxHelper.extractHigherInt(combined), `is`(higher))
+        assertThat(flexboxHelper.extractLowerInt(combined), `is`(lower))
+    }
+
+    @Test
+    fun testFlexLine_anyItemsHaveFlexGrow() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100).apply {
+            flexGrow = 1.0f
+        }
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400).apply {
+            flexGrow = 2.0f
+        }
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.apply {
+            addView(view1)
+            addView(view2)
+            addView(view3)
+            addView(view4)
+            flexDirection = FlexDirection.COLUMN
+            flexWrap = FlexWrap.WRAP
+            alignContent = AlignContent.STRETCH
+        }
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        assertThat(flexContainer.flexLines.size, `is`(3))
+        assertThat(flexContainer.flexLines[0].mAnyItemsHaveFlexGrow, `is`(true))
+        assertThat(flexContainer.flexLines[1].mAnyItemsHaveFlexGrow, `is`(false))
+        assertThat(flexContainer.flexLines[2].mAnyItemsHaveFlexGrow, `is`(true))
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt
new file mode 100755
index 0000000..520d557
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.app.Activity
+import android.content.res.Configuration
+import android.util.Log
+
+import com.google.android.flexbox.FlexboxLayout
+
+/**
+ * Activity for testing the [FlexboxLayout] that handles configuration changes by itself
+ * instead of letting the system take care of those.
+ */
+class ConfigChangeActivity : Activity() {
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+
+        Log.d(TAG, "onConfigurationChanged: $newConfig")
+    }
+
+    companion object {
+        private const val TAG = "ConfigChangeActivity"
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt
new file mode 100755
index 0000000..63b8723
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt
@@ -0,0 +1,4066 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.annotation.LayoutRes
+import androidx.core.content.res.ResourcesCompat
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewAssertion
+import androidx.test.espresso.assertion.PositionAssertions.isBottomAlignedWith
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyAbove
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyBelow
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyLeftOf
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyRightOf
+import androidx.test.espresso.assertion.PositionAssertions.isLeftAlignedWith
+import androidx.test.espresso.assertion.PositionAssertions.isRightAlignedWith
+import androidx.test.espresso.assertion.PositionAssertions.isTopAlignedWith
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import com.google.android.flexbox.AlignContent
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxLayout
+import com.google.android.flexbox.JustifyContent
+import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
+import org.hamcrest.Description
+import org.hamcrest.TypeSafeMatcher
+import org.hamcrest.core.Is.`is`
+import org.hamcrest.core.IsNot.not
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertThat
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [FlexboxLayout].
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class FlexboxAndroidTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(FlexboxTestActivity::class.java)
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLoadFromLayoutXml() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_simple)
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.childCount, `is`(1))
+
+        val child = flexboxLayout.getChildAt(0)
+        val lp = child.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(lp.order, `is`(2))
+        assertThat(lp.flexGrow, `is`(1f))
+        assertThat(lp.alignSelf, `is`(AlignItems.STRETCH))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_fromLayoutXml() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test)
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(4))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 1, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_fromCode() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val fifth = createTextView(activity, "5", 0)
+                        val sixth = createTextView(activity, "6", -10)
+                        flexboxLayout.addView(fifth)
+                        flexboxLayout.addView(sixth)
+                    }
+                })
+
+        assertThat(flexboxLayout.childCount, `is`(6))
+        // order: -10, index 5
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("6"))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("3"))
+        // order: 0, index 4
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("5"))
+        // order: 1, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(4) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(5) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChangeOrder_fromChildSetLayoutParams() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test)
+
+        assertThat(flexboxLayout.childCount, `is`(4))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 0, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("1"))
+
+        // By changing the order and calling the setLayoutParams, the reordered array in the
+        // FlexboxLayout (mReorderedIndices) will be recreated without adding a new View.
+        activityRule.runOnUiThread {
+            val view1 = flexboxLayout.getChildAt(0)
+            val lp = view1.layoutParams as FlexboxLayout.LayoutParams
+            lp.order = -3
+            view1.layoutParams = lp
+        }
+        // order: -3, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("1"))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 1, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("4"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_addViewInMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val fifth = createTextView(activity, "5", 0)
+                        // Add the new TextView in the middle of the indices
+                        flexboxLayout.addView(fifth, 2)
+                    }
+                })
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(5))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("5"))
+        // order: 0, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("3"))
+        // order: 0, index 4
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(4) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_removeLastView() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.removeViewAt(flexboxLayout.childCount - 1)
+                    }
+                })
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(3))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_removeViewInMiddle() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.removeViewAt(2)
+                    }
+                })
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(3))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // The third text view should be placed below the first one
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        val activity = activityRule.activity
+        assertThat(flexLine1.mainSize, `is`(activity.dpToPixel(320)))
+        assertThat(flexLine1.crossSize, `is`(activity.dpToPixel(120)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.mainSize, `is`(activity.dpToPixel(160)))
+        assertThat(flexLine2.crossSize, `is`(activity.dpToPixel(120)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_nowrap() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                        flexboxLayout.alignItems = AlignItems.FLEX_START
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // But the flexWrap attribute is set to NOWRAP, the third text view is placed
+        // to the right of the second one and overflowing the parent FlexboxLayout.
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(1))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(1))
+        val flexLine = flexLines[0]
+        val activity = activityRule.activity
+        assertThat(flexLine.mainSize, `is`(activity.dpToPixel(480)))
+        assertThat(flexLine.crossSize, `is`(activity.dpToPixel(300)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap_reverse() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // There should be two flex lines same as WRAP, but the layout starts from bottom
+        // to top in FlexWrap.WRAP_REVERSE
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        // The height of the FlexboxLayout is not enough for placing the three text views.
+        // The third text view should be placed right of the first one
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_nowrap_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        // The height of the FlexboxLayout is not enough for placing the three text views.
+        // But the flexWrap attribute is set to NOWRAP, the third text view is placed
+        // below the second one and overflowing the parent FlexboxLayout.
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap_reverse_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // There should be two flex lines same as WRAP, but the layout starts from right
+        // to left in FlexWrap.WRAP_REVERSE
+        onView(withId(R.id.text3)).check(isCompletelyLeftOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyLeftOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexItem_match_parent() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_item_match_parent)
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(text1.width, `is`(flexboxLayout.width))
+        assertThat(text2.width, `is`(flexboxLayout.width))
+        assertThat(text3.width, `is`(flexboxLayout.width))
+        assertThat(flexboxLayout.height, `is`(text1.height + text2.height + text3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexItem_match_parent_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_flex_item_match_parent_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(text1.height, `is`(flexboxLayout.height))
+        assertThat(text2.height, `is`(flexboxLayout.height))
+        assertThat(text3.height, `is`(flexboxLayout.height))
+        assertThat(flexboxLayout.width, `is`(text1.width + text2.width + text3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexboxLayout_wrapContent() {
+        createFlexboxLayout(R.layout.activity_flexbox_wrap_content)
+        // The parent FlexboxLayout's layout_width and layout_height are set to wrap_content
+        // The size of the FlexboxLayout is aligned with three text views.
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexboxLayout_wrapped_with_ScrollView() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flexbox_wrapped_with_scrollview)
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        // The heightMode of the FlexboxLayout is set as MeasureSpec.UNSPECIFIED, the height of the
+        // layout will be expanded to include the all children views
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexboxLayout_wrapped_with_HorizontalScrollView() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_flexbox_wrapped_with_horizontalscrollview)
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // The widthMode of the FlexboxLayout is set as MeasureSpec.UNSPECIFIED, the width of the
+        // layout will be expanded to include the all children views
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.width, `is`(textView1.width + textView2.width + textView3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test)
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_START))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_withParentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_parent_padding)
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_START))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        // Both the parent FrameLayout and the FlexboxLayout have different padding values
+        // but the text1.getLeft should be the padding value for the FlexboxLayout, not including
+        // the parent's padding value
+        assertThat(text1.left, `is`(flexboxLayout.paddingLeft))
+        assertThat(text1.top, `is`(flexboxLayout.paddingTop))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_END))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text2)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_withParentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_parent_padding,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_END))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text2)))
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        // Both the parent FrameLayout and the FlexboxLayout have different padding values
+        // but the text3.getRight should be the padding value for the FlexboxLayout, not including
+        // the parent's padding value
+        assertThat(flexboxLayout.width - text3.right, `is`(flexboxLayout.paddingRight))
+        assertThat(text3.top, `is`(flexboxLayout.paddingTop))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val space = (flexboxLayout.width - textView1.width - textView2.width - textView3.width) / 2
+        assertThat(textView1.left, isEqualAllowingError(space))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_withParentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_parent_padding,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width -
+                textView3.width - flexboxLayout.paddingLeft - flexboxLayout.paddingRight
+        space /= 2
+        assertThat(textView1.left - flexboxLayout.paddingLeft, isEqualAllowingError(space))
+        assertThat(flexboxLayout.width - textView3.right - flexboxLayout.paddingRight,
+                isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width
+        space /= 2
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width -
+                padding * 2
+        space /= 2
+        assertThat(textView1.left, `is`(padding))
+        assertThat(flexboxLayout.right - textView3.right, `is`(padding))
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width
+        space /= 6 // Divide by the number of children * 2
+        assertTrue(space - 1 <= textView1.left && textView1.left <= space + 1)
+        val spaceInMiddle = space * 2
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.left, isEqualAllowingError(space))
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width -
+                padding * 2
+        space /= 6 // Divide by the number of children * 2
+        assertThat(textView1.left - padding, isEqualAllowingError(space))
+
+        val spaceInMiddle = space * 2
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.right - textView3.right - padding, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width -
+                padding * 2
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.left - padding, isEqualAllowingError(space))
+
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+        assertThat(flexboxLayout.right - textView3.right - padding, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.alignItems = AlignItems.STRETCH
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isCompletelyAbove(withId(R.id.text2)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 2
+        assertThat(textView1.top, isEqualAllowingError(space))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 2
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_flexDirection_column_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height - padding * 2
+        space /= 2
+        assertThat(textView1.top, `is`(padding))
+        assertThat(flexboxLayout.bottom - textView3.bottom, `is`(padding))
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 6 // Divide by the number of children * 2
+        assertThat(textView1.top, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.top, isEqualAllowingError(space))
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_flexDirection_column_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height -
+                padding * 2
+        space /= 6 // Divide by the number of children * 2
+        assertThat(textView1.top - padding, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.bottom - textView3.bottom - padding, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_flexDirection_column_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height -
+                padding * 2
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.top - padding, isEqualAllowingError(space))
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+        assertThat(flexboxLayout.bottom - textView3.bottom - padding,
+                isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_including_gone_views() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView3.width
+        space /= 4 // Divide by the number of visible children * 2
+        assertThat(textView1.left, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView3.left - textView1.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_including_gone_views() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val space = flexboxLayout.width - textView1.width - textView3.width
+        assertThat(textView3.left - textView1.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_including_gone_views_direction_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView3.height
+        space /= 4 // Divide by the number of visible children * 2
+        assertThat(textView1.top, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView3.top - textView1.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_including_gone_views_direction_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val space = flexboxLayout.height - textView1.height - textView3.height
+        assertThat(textView3.top - textView1.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_withExactParentLength() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_grow_test)
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is expanded to the right edge of the FlexboxLayout
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.width, `is`(flexboxLayout.width - textView1.width - textView2.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_withExactParentLength_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_grow_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is expanded to the bottom edge of the FlexboxLayout
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.height, `is`(flexboxLayout.height - textView1.height - textView2.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_including_view_gone() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_grow_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val textView2 = activity.findViewById<TextView>(R.id.text2)
+                        textView2.visibility = View.GONE
+                    }
+                })
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        // the third TextView is expanded to the right edge of the FlexboxLayout
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView2.visibility, `is`(View.GONE))
+        assertThat(textView3.width, `is`(flexboxLayout.width - textView1.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test)
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val flexLineCrossSize = flexboxLayout.height / 2
+        // Two flex line's cross sizes are expanded to the half of the height of the FlexboxLayout.
+        // The third textView's top should be aligned width the second flex line.
+        assertThat(textView3.top, `is`(flexLineCrossSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexStart() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_START
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_START))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.top, `is`(textView1.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isCompletelyAbove(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text3)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.bottom, `is`(flexboxLayout.bottom - textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_parentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.setPadding(32, 32, 32, 32)
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        onView(withId(R.id.text1)).check(isCompletelyAbove(withId(R.id.text3)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text3)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.bottom, `is`(flexboxLayout.bottom - flexboxLayout.paddingBottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_parentPadding_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(32, 32, 32, 32)
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text3)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.right, `is`(flexboxLayout.right - flexboxLayout.paddingRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_center() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var spaceAboveAndBottom = flexboxLayout.height - textView1.height - textView3.height
+        spaceAboveAndBottom /= 2
+
+        assertThat(textView1.top, isEqualAllowingError(spaceAboveAndBottom))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(spaceAboveAndBottom))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween_withPadding() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceAround() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_AROUND
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        var spaceAround = flexboxLayout.height - textView1.height - textView3.height
+        spaceAround /= 4 // Divide by the number of flex lines * 2
+
+        assertThat(textView1.top, isEqualAllowingError(spaceAround))
+        val spaceInMiddle = textView1.bottom + spaceAround * 2
+        assertThat(textView3.top, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch_parentWrapContent() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val parentLp = flexboxLayout.layoutParams
+                        parentLp.height = ViewGroup.LayoutParams.WRAP_CONTENT
+                        flexboxLayout.layoutParams = parentLp
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // alignContent is only effective if the parent's height/width mode is MeasureSpec.EXACTLY.
+        // The size of the flex lines don't change even if the alignContent is set to
+        // ALIGN_CONTENT_STRETCH
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.top, `is`(textView1.height))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val flexLineCrossSize = flexboxLayout.width / 2
+        // Two flex line's cross sizes are expanded to the half of the width of the FlexboxLayout.
+        // The third textView's left should be aligned with the second flex line.
+        assertThat(textView3.left, `is`(flexLineCrossSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexStart_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_START
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_START))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.left, `is`(textView1.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text3)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.right, `is`(flexboxLayout.right - textView3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_center_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val spaceLeftAndRight = (flexboxLayout.width - textView1.width - textView3.width) / 2
+
+        assertThat(textView1.left, isEqualAllowingError(spaceLeftAndRight))
+        assertThat(textView3.right, isEqualAllowingError(flexboxLayout.right - spaceLeftAndRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceAround_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_AROUND
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        var spaceAround = flexboxLayout.width - textView1.width - textView3.width
+        spaceAround /= 4 // Divide by the number of flex lines * 2
+
+        assertThat(textView1.left, isEqualAllowingError(spaceAround))
+        val spaceInMiddle = textView1.right + spaceAround * 2
+        assertThat(textView3.left, isEqualAllowingError(spaceInMiddle))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch_parentWrapContent_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val parentLp = flexboxLayout.layoutParams
+                        parentLp.width = ViewGroup.LayoutParams.WRAP_CONTENT
+                        flexboxLayout.layoutParams = parentLp
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // alignContent is only effective if the parent's height/width mode is MeasureSpec.EXACTLY.
+        // The size of the flex lines don't change even if the alignContent is set to
+        // ALIGN_CONTENT_STRETCH
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.left, `is`(textView1.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_wrapReverse_contentOverflowed() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        onView(withId(R.id.text6)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text5)).check(isCompletelyLeftOf(withId(R.id.text6)))
+        onView(withId(R.id.text4)).check(isCompletelyBelow(withId(R.id.text6)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexStart_wrapReverse_contentOverflowed() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_START
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_START))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text1)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween_wrapReverse_contentOverflowed() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text1)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_center_wrapReverse_contentOverflowed() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.CENTER
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+        val textView6 = activity.findViewById<TextView>(R.id.text6)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+
+        assertThat(textView6.top - flexboxLayout.top, isEqualAllowingError(
+                (flexboxLayout.height - textView6.height - textView4.height - textView2.height) / 2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceAround_wrapReverse_contentOverflowed() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_AROUND
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+        val textView6 = activity.findViewById<TextView>(R.id.text6)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+
+        assertThat(textView6.top - flexboxLayout.top, isEqualAllowingError(
+                (flexboxLayout.height - textView6.height - textView4.height - textView2.height) / 2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_stretch() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_stretch_test)
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.STRETCH))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.height, isEqualAllowingError(flexLineSize))
+        assertThat(textView3.height, isEqualAllowingError(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_align_self_stretch_test)
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        // Only the first TextView's alignSelf is set to ALIGN_SELF_STRETCH
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_self_stretch_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        // Only the first TextView's alignSelf is set to ALIGN_SELF_STRETCH
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.width, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexStart() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test)
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_START))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView3.top, isEqualAllowingError(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.bottom, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.bottom, isEqualAllowingError(flexLineSize))
+        assertThat(textView3.bottom, `is`(flexboxLayout.bottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_parentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_align_items_parent_padding_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(textView1.bottom, `is`(flexboxLayout.bottom - flexboxLayout.paddingBottom))
+        assertThat(textView2.bottom, `is`(flexboxLayout.bottom - flexboxLayout.paddingBottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_parentPadding_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_align_items_parent_padding_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(textView1.right, `is`(flexboxLayout.right - flexboxLayout.paddingRight))
+        assertThat(textView2.right, `is`(flexboxLayout.right - flexboxLayout.paddingRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        // All TextView's heights are the same. No issues should be found if using the first
+        // TextView to calculate the space above and below
+        val spaceAboveAndBelow = (flexLineSize - textView1.height) / 2
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.top, isEqualAllowingError(spaceAboveAndBelow))
+        assertThat(textView2.top, isEqualAllowingError(spaceAboveAndBelow))
+        assertThat(textView3.top, isEqualAllowingError(flexLineSize + spaceAboveAndBelow))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_wrapReverse() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.top, isEqualAllowingError(flexboxLayout.height - flexLineSize))
+        assertThat(textView2.top, isEqualAllowingError(flexboxLayout.height - flexLineSize))
+        assertThat(textView3.top, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center_wrapReverse() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        // All TextView's heights are the same. No issues should be found if using the first
+        // TextView to calculate the space above and below
+        val spaceAboveAndBelow = (flexLineSize - textView1.height) / 2
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.bottom, isEqualAllowingError(flexboxLayout.height - spaceAboveAndBelow))
+        assertThat(textView2.bottom, isEqualAllowingError(flexboxLayout.height - spaceAboveAndBelow))
+        assertThat(textView3.bottom,
+                isEqualAllowingError(flexboxLayout.height - flexLineSize - spaceAboveAndBelow))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexStart_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_START))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView3.left, isEqualAllowingError(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.right, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.right, isEqualAllowingError(flexLineSize))
+        assertThat(textView3.right, `is`(flexboxLayout.right))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        // All TextView's widths are the same. No issues should be found if using the first
+        // TextView to calculate the space left and right
+        val spaceLeftAndRight = (flexLineSize - textView1.width) / 2
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.left, isEqualAllowingError(spaceLeftAndRight))
+        assertThat(textView2.left, isEqualAllowingError(spaceLeftAndRight))
+        assertThat(textView3.left, isEqualAllowingError(flexLineSize + spaceLeftAndRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_wrapReverse_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.left, isEqualAllowingError(flexboxLayout.width - flexLineSize))
+        assertThat(textView2.left, isEqualAllowingError(flexboxLayout.width - flexLineSize))
+        assertThat(textView3.left, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center_wrapReverse_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        // All TextView's widths are the same. No issues should be found if using the first
+        // TextView to calculate the space above and below
+        val spaceLeftAndRight = (flexLineSize - textView1.width) / 2
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.right, isEqualAllowingError(flexboxLayout.width - spaceLeftAndRight))
+        assertThat(textView2.right, isEqualAllowingError(flexboxLayout.width - spaceLeftAndRight))
+        assertThat(textView3.right,
+                isEqualAllowingError(flexboxLayout.width - flexLineSize - spaceLeftAndRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_baseline() {
+        val activity = activityRule.activity
+        createFlexboxLayout(R.layout.activity_align_items_baseline_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val topPluBaseline1 = textView1.top + textView1.baseline
+        val topPluBaseline2 = textView2.top + textView2.baseline
+        val topPluBaseline3 = textView3.top + textView3.baseline
+
+        assertThat(topPluBaseline1, `is`(topPluBaseline2))
+        assertThat(topPluBaseline2, `is`(topPluBaseline3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_baseline_wrapContent() {
+        // This test verifies the issue that baseline calculation is broken on API level +24
+        // https://github.com/google/flexbox-layout/issues/341
+        val activity = activityRule.activity
+        val layout = createFlexboxLayout(R.layout.activity_align_items_baseline_wrap_content)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val topPluBaseline1 = textView1.top + textView1.baseline
+        val topPluBaseline2 = textView2.top + textView2.baseline
+        val topPluBaseline3 = textView3.top + textView3.baseline
+
+        assertThat(topPluBaseline1, `is`(topPluBaseline2))
+        assertThat(topPluBaseline2, `is`(topPluBaseline3))
+        assertThat(layout.flexLines.size, `is`(1))
+        assertTrue(layout.flexLines[0].crossSize > textView1.height)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_baseline_wrapReverse() {
+        val activity = activityRule.activity
+        createFlexboxLayout(R.layout.activity_align_items_baseline_test, object : Configuration {
+            override fun apply(flexboxLayout: FlexboxLayout) {
+                flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+            }
+        })
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val bottomPluBaseline1 = textView1.bottom + textView1.baseline
+        val bottomPluBaseline2 = textView2.bottom + textView2.baseline
+        val bottomPluBaseline3 = textView3.bottom + textView3.baseline
+
+        assertThat(bottomPluBaseline1, `is`(bottomPluBaseline2))
+        assertThat(bottomPluBaseline2, `is`(bottomPluBaseline3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_row_reverse() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.ROW_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+
+        // The layout direction should be right to left
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_column_reverse() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_wrap() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_flex_basis_percent_test)
+
+        // The text1 length is 50%, the text2 length is 60% and the wrap property is WRAP,
+        // the text2 should be on the second flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val lp1 = textView1.layoutParams as FlexboxLayout.LayoutParams
+        val lp2 = textView2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(textView1.width, `is`(Math.round(flexboxLayout.width * lp1.flexBasisPercent)))
+        assertThat(textView2.width, `is`(Math.round(flexboxLayout.width * lp2.flexBasisPercent)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_nowrap() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_basis_percent_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                    }
+                })
+
+        // The text1 length is 50%, the text2 length is 60% and the text3 has the fixed width,
+        // but the flex wrap attribute is NOWRAP, and flexShrink attributes for all
+        // children are the default value (1), three text views are shrank to fit in a single flex
+        // line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val totalWidth = textView1.width + textView2.width + textView3.width
+        // Allowing minor different length with the flex container since the sum of the three text
+        // views width is not always the same as the flex container's main size caused by round
+        // errors in calculating the percent lengths.
+        assertThat(flexboxLayout.width, isEqualAllowingError(totalWidth))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_wrap_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_basis_percent_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        // The text1 length is 50%, the text2 length is 60% and the wrap property is WRAP,
+        // the text2 should be on the second flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val lp1 = textView1.layoutParams as FlexboxLayout.LayoutParams
+        val lp2 = textView2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(textView1.height, `is`(Math.round(flexboxLayout.height * lp1.flexBasisPercent)))
+        assertThat(textView2.height, `is`(Math.round(flexboxLayout.height * lp2.flexBasisPercent)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_nowrap_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_basis_percent_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        // The text1 length is 50%, the text2 length is 60% and the text3 has the fixed height,
+        // but the flex wrap attribute is NOWRAP, and flexShrink attributes for all
+        // children are the default value (1), three text views are shrank to fit in a single
+        // flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val totalHeight = textView1.height + textView2.height + textView3.height
+        // Allowing minor different length with the flex container since the sum of the three text
+        // views width is not always the same as the flex container's main size caused by round
+        // errors in calculating the percent lengths.
+        assertThat(flexboxLayout.height, isEqualAllowingError(totalHeight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinWidth_initial_width_less_than_minWidth() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minWidth attribute works as a minimum constraint
+        // If the initial view width is less than the value of minWidth.
+        // The textView1's layout_width is set to wrap_content and its text is "1" apparently
+        // the initial measured width is less than the value of layout_minWidth (100dp)
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minwidth_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val minWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).minWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(minWidth))
+        onView(withId(R.id.text2)).check(hasWidth(flexboxLayout.width - minWidth))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinWidth_works_as_lower_bound_shrink_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minWidth attribute works as a lower bound
+        // when the view would shrink less than the minWidth if the minWidth weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minwidth_lower_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val minWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).minWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(minWidth))
+        assertEquals(flexboxLayout.width, textView1.width + textView2.width + textView3.width +
+                textView4.width)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinHeight_initial_height_less_than_minHeight() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minHeight attribute works as a minimum constraint
+        // If the initial view height is less than the value of minHeight.
+        // The textView1's layout_height is set to wrap_content and its text is "1" apparently
+        // the initial measured height is less than the value of layout_minHeight (100dp)
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minheight_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val minHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).minHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(minHeight))
+        onView(withId(R.id.text2)).check(hasHeight(flexboxLayout.height - minHeight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinHeight_works_as_lower_bound_shrink_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minHeight attribute works as a lower bound
+        // when the view would shrink less than the minHeight if the minHeight weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minheight_lower_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val minHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).minHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(minHeight))
+        assertEquals(flexboxLayout.height, textView1.height + textView2.height + textView3.height +
+                textView4.height)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxWidth_initial_width_more_than_maxWidth() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxWidth attribute works as a maximum constraint
+        // ff the initial view width is more than the value of maxWidth.
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxwidth_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val maxWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(maxWidth))
+        onView(withId(R.id.text2)).check(hasWidth(flexboxLayout.width - maxWidth))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxWidth_works_as_upper_bound_expand_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxWidth attribute works as a upper bound
+        // when the view would expand more than the maxWidth if the maxWidth weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxwidth_upper_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val maxWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(maxWidth))
+        assertEquals(flexboxLayout.width, textView1.width + textView2.width)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxHeight_initial_height_more_than_maxHeight() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxHeight attribute works as a maximum constraint
+        // ff the initial view height is more than the value of maxHeight.
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxheight_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val maxHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(maxHeight))
+        onView(withId(R.id.text2)).check(hasHeight(flexboxLayout.height - maxHeight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxHeight_works_as_lower_bound_expand_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxHeight attribute works as a upper bound
+        // when the view would expand more than the maxHeight if the maxHeight weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxheight_upper_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val maxHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(maxHeight))
+        assertEquals(flexboxLayout.height, textView1.height + textView2.height)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_gone() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_views_visibility_gone)
+
+        // The text1 and text2's visibility are gone, so the visible view starts from text3
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text4)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text4)).check(isCompletelyRightOf(withId(R.id.text3)))
+        onView(withId(R.id.text5)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text5)).check(isCompletelyBelow(withId(R.id.text3)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val textView5 = activity.findViewById<TextView>(R.id.text5)
+        assertThat(textView1.visibility, `is`(View.GONE))
+        assertThat(textView2.visibility, `is`(View.GONE))
+        assertThat(textView4.left, `is`(textView3.right))
+        assertThat(textView5.top, `is`(textView3.bottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_gone_first_item_in_flex_line_horizontal() {
+        // This test verifies if the FlexboxLayout is visible when the visibility of the first
+        // flex item in the second flex line (or arbitrary flex lines other than the first flex
+        // line) is set to "gone"
+        // There was an issue reported for that
+        // https://github.com/google/flexbox-layout/issues/47
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_visibility_gone_first_item_in_flex_line_row)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertTrue(flexboxLayout.height > 0)
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_gone_first_item_in_flex_line_vertical() {
+        // This test verifies if the FlexboxLayout is visible when the visibility of the first
+        // flex item in the second flex line (or arbitrary flex lines other than the first flex
+        // line) is set to "gone"
+        // There was an issue reported for that
+        // https://github.com/google/flexbox-layout/issues/47
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_visibility_gone_first_item_in_flex_line_column)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertTrue(flexboxLayout.width > 0)
+        assertThat(flexboxLayout.width, `is`(textView1.width + textView3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_invisible() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_views_visibility_invisible)
+
+        // The text1 and text2's visibility are invisible, these views take space like visible views
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.visibility, `is`(View.INVISIBLE))
+        assertThat(textView2.visibility, `is`(View.INVISIBLE))
+        assertThat(textView3.top, `is`(textView1.bottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrapBefore() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_before_test)
+
+        // layout_wrapBefore for the text2 and text3 are set to true, the text2 and text3 should
+        // be the first item for each flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView2.height + textView3.height))
+
+        activityRule.runOnUiThread {
+            val lp2 = textView2.layoutParams as FlexboxLayout.LayoutParams
+            lp2.isWrapBefore = false
+            textView2.layoutParams = lp2
+        }
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrapBefore_nowrap() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_before_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                    }
+                })
+
+        // layout_wrapBefore for the text2 and text3 are set to true, but the flexWrap is set to
+        // NOWRAP, three text views should not be wrapped.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_parentPadding_horizontal() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_parent_padding_horizontal_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // parent padding, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(flexboxLayout.height, `is`(flexboxLayout.paddingTop + flexboxLayout.paddingBottom +
+                text1.height + text2.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_parentPadding_vertical() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_parent_padding_vertical_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        // The sum of height of TextView1 and TextView2 is not enough for wrapping, but considering
+        // parent padding, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(flexboxLayout.width, `is`(flexboxLayout.paddingLeft + flexboxLayout.paddingRight +
+                text1.width + text2.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_childMargin_horizontal() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_child_margin_horizontal_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin for the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val lp2 = text2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(flexboxLayout.height, `is`(text1.height + text2.height + lp2.topMargin +
+                lp2.bottomMargin))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstItemLarge_horizontal() {
+        // This test verifies a empty flex line is not added when the first flex item is large
+        // and judged wrapping is required with the first item.
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_first_item_large_horizontal_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin for the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.height, `is`(text1.height + text2.height + text3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstItemLarge_vertical() {
+        // This test verifies a empty flex line is not added when the first flex item is large
+        // and judged wrapping is required with the first item.
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_first_item_large_vertical_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin for the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.width, `is`(text1.width + text2.width + text3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_childMargin_vertical() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_child_margin_vertical_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        // The sum of height of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin of the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val lp2 = text2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(flexboxLayout.width,
+                `is`(text1.width + text2.width + lp2.leftMargin + lp2.rightMargin))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testEmptyChildren() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children)
+
+        assertThat(flexboxLayout.childCount, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalBeginning() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_divider_test_direction_row)
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth
+        assertThat(text3.right, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 (divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                    }
+                }
+        )
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        // Three text views are placed in the first row, thus two vertical middle dividers should
+        // be placed
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth * 2
+        assertThat(text3.right, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 * 2(divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        // Three text views are placed in the first row, thus two vertical middle dividers should
+        // be placed
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth
+        assertThat(text3.right + divider.intrinsicWidth, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 (divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        // Three text views are placed in the first row, thus two vertical middle dividers should
+        // be placed
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth * 4
+        assertThat(text3.right + divider.intrinsicWidth, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 * 4 (divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(310)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 * 3 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(310)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalBeginning() {
+        val activity = activityRule.activity
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight
+        assertThat(text4.bottom, `is`(heightSum))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // There is a horizontal divider at the beginning. Top and bottom coordinates are shifted
+        // by the amount of 15
+        // The right should be 90 * 3
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight
+        assertThat(text4.bottom, `is`(heightSum))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // There is a horizontal divider at the middle. Top and bottom coordinates are shifted
+        // by the amount of 15
+        val flexLine2 = flexLines[1]
+        // The right should be 140
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight
+        assertThat(text4.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // There is a horizontal divider at the middle. Top and bottom coordinates are shifted
+        // by the amount of 15
+        val flexLine2 = flexLines[1]
+        // The right should be 140
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight * 3
+        assertThat(text4.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_all_thickDivider() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val thickDivider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider_thick, null)
+                        flexboxLayout.dividerDrawableVertical = thickDivider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider_thick, null)
+        // The sum of three text views and the sum of thick dividers don't fit in one line.
+        // The last text view should be placed to the next line.
+        assertNotNull(divider)
+        val widthSumFirstRow = text1.width + text2.width + divider!!.intrinsicWidth * 3
+        assertThat(text2.right + divider.intrinsicWidth, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        assertThat(text3.bottom, `is`(text1.height + text2.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalBeginning() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_divider_test_direction_column)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight
+        assertThat(text3.bottom, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(285)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(295)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight * 2
+        assertThat(text3.bottom, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15 * 2
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(300)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(295)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight
+        assertThat(text3.bottom + divider.intrinsicHeight, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(285)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(295)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight * 4
+        assertThat(text3.bottom + divider.intrinsicHeight, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15 * 4
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(330)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15 * 3
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(325)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalBeginning() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableVertical = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth
+        assertThat(text4.right, `is`(widthSum))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableVertical = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth
+        assertThat(text4.right, `is`(widthSum))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth
+        assertThat(text4.right + divider.intrinsicWidth, `is`(widthSum))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableVertical = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth * 3
+        assertThat(text4.right + divider.intrinsicWidth, `is`(widthSum))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_vertical_horizontal_All() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.setDividerDrawable(divider)
+                        flexboxLayout.setShowDivider(
+                                FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END)
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text2.height + text3.height + divider!!.intrinsicHeight * 4
+        val widthSum = text1.width + text4.width + divider.intrinsicWidth * 3
+        assertThat(text3.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text4.right + divider.intrinsicWidth, `is`(widthSum))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_all_thickDivider() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val thickDivider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider_thick, null)
+                        flexboxLayout.dividerDrawableHorizontal = thickDivider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider_thick, null)
+        // The sum of three text views and the sum of thick dividers don't fit in one line.
+        // The last text view should be placed to the next line.
+        assertNotNull(divider)
+        val heightSum = text1.height + text2.height + divider!!.intrinsicHeight * 3
+        assertThat(text2.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        assertThat(text3.right, `is`(text1.width + text3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testZeroWidth_wrapContentHeight_positiveFlexGrow() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_zero_width_positive_flexgrow)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        // Both text view's layout_width is set to 0dp, layout_height is set to wrap_content and
+        // layout_flexGrow is set to 1. And the text2 has a longer text than the text1.
+        // So if the cross size calculation (height) is wrong, the height of two text view do not
+        // match because text2 is trying to expand vertically.
+        // This assertion verifies that isn't happening. Finally both text views expand horizontally
+        // enough to contain their texts in one line.
+        assertThat(text1.height, `is`(text2.height))
+        assertThat(text1.width + text2.width, isEqualAllowingError(flexboxLayout.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testZeroHeight_wrapContentWidth_positiveFlexGrow() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_zero_height_positive_flexgrow)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(text1.width, `is`(not(text2.width)))
+        assertThat(text1.height + text2.height, isEqualAllowingError(flexboxLayout.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_row_alignItems_center_margin_oneSide() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_direction_row_align_items_center_margin_oneside)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        assertThat(text1.top, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(flexboxLayout.bottom - text1.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_column_alignItems_center_margin_oneSide() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_direction_column_align_items_center_margin_oneside)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        assertThat(text1.left, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(flexboxLayout.right - text1.right, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildBottomMarginIncluded_flexContainerWrapContent_directionRow_flexGrow() {
+        // This test is to verify the case where:
+        //   - layout_height is set to wrap_content for the FlexboxLayout
+        //   - Bottom (or top) margin is set to a child
+        //   - The child which the has the bottom (top) margin has the largest height in the
+        //     same flex line (or only a single child exists)
+        //   - The child has a positive layout_flexGrow attribute set
+        //  If these conditions were met, the height of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_row_grow)
+
+        // layout_height for text1: 24dp, layout_marginBottom: 12dp
+        assertThat(flexboxLayout.height, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildEndMarginIncluded_flexContainerWrapContent_directionColumn_flexGrow() {
+        // This test is to verify the case where:
+        //   - layout_width is set to wrap_content for the FlexboxLayout
+        //   - End (or start) margin is set to a child
+        //   - The child which the has the end (start) margin has the largest width in the
+        //     same flex line (or only a single child exists)
+        //   - The child has a positive layout_flexGrow attribute set
+        //  If these conditions were met, the width of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_column_grow)
+
+        // layout_width for text1: 24dp, layout_marginEnd: 12dp
+        assertThat(flexboxLayout.width, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildBottomMarginIncluded_flexContainerWrapContent_directionRow_flexShrink() {
+        // This test is to verify the case where:
+        //   - layout_height is set to wrap_content for the FlexboxLayout
+        //   - flex_wrap is set to nowrap for the FlexboxLayout
+        //   - Bottom (or top) margin is set to a child
+        //   - The child which the has the bottom (top) margin has the largest height in the
+        //     same flex line
+        //   - The child has a positive layout_flexShrink attribute set
+        //   - The sum of children width overflows parent's width (shrink will happen)
+        //  If these conditions were met, the height of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_row_shrink)
+
+        // layout_height for text1: 24dp, layout_marginBottom: 12dp
+        assertThat(flexboxLayout.height, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildBottomMarginIncluded_flexContainerWrapContent_directionColumn_flexShrink() {
+        // This test is to verify the case where:
+        //   - layout_width is set to wrap_content for the FlexboxLayout
+        //   - flex_wrap is set to nowrap for the FlexboxLayout
+        //   - End (or start) margin is set to a child
+        //   - The child which the has the end (start) margin has the largest width in the
+        //     same flex line
+        //   - The child has a positive layout_flexShrink attribute set
+        //   - The sum of children height overflows parent's height (shrink will happen)
+        //  If these conditions were met, the height of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_column_shrink)
+
+        // layout_width for text1: 24dp, layout_marginEnd: 12dp
+        assertThat(flexboxLayout.width, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildNeedsRemeasure_row() {
+        createFlexboxLayout(R.layout.activity_child_needs_remeasure_row)
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildNeedsRemeasure_column() {
+        createFlexboxLayout(R.layout.activity_child_needs_remeasure_column)
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_firstLineSingleItem_row() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view is in the next flex line. In that case, the second view's position is misplaced.
+        // https://github.com/google/flexbox-layout/issues/283
+        createFlexboxLayout(R.layout.activity_first_view_gone_first_line_single_item)
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_firstLineSingleItem_column() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view is in the next flex line. In that case, the second view's position is misplaced.
+        // https://github.com/google/flexbox-layout/issues/283
+        createFlexboxLayout(R.layout.activity_first_view_gone_first_line_single_item,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexGrowSetForRestOfItems_row() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view and third view have the layout_flexGrow attribute set. In that case, the second
+        // view's position is misplaced and the third view becomes invisible .
+        // https://github.com/google/flexbox-layout/issues/303
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_grow_set_for_rest)
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexGrowSetForRestOfItems_column() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view and third view have the layout_flexGrow attribute set. In that case, the second
+        // view's position is misplaced and the third view becomes invisible .
+        // https://github.com/google/flexbox-layout/issues/303
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_grow_set_for_rest,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexShrinkSetForRestOfItems_row() {
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_shrink_set_for_rest)
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexShrinkSetForRestOfItems_column() {
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_shrink_set_for_rest,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddItemProgrammatically_withMarginLayoutParams() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children,
+        object : Configuration {
+            override fun apply(flexboxLayout: FlexboxLayout) {
+                flexboxLayout.alignItems = AlignItems.FLEX_START
+                val first = createTextView(activity, "1", 0)
+                val second = createTextView(activity, "2", 0)
+                val lp1 = ViewGroup.MarginLayoutParams(100, 100)
+                lp1.setMargins(10, 10, 10, 10)
+                val lp2 = ViewGroup.MarginLayoutParams(100, 100)
+                lp2.setMargins(20, 20, 20, 20)
+                first.layoutParams = lp1
+                second.layoutParams = lp2
+                flexboxLayout.addView(first)
+                flexboxLayout.addView(second)
+            }
+        })
+
+        assertThat(flexboxLayout.childCount, `is`(2))
+        val view1 = flexboxLayout.getChildAt(0)
+        val view2 = flexboxLayout.getChildAt(1)
+        // Assert the coordinates of the views added programmatically with margins
+        assertThat(view1.left, `is`(10))
+        assertThat(view1.top, `is`(10))
+        assertThat(view1.bottom, `is`(110))
+        assertThat(view1.right, `is`(110))
+        assertThat(view2.left, `is`(140))
+        assertThat(view2.top, `is`(20))
+        assertThat(view2.bottom, `is`(120))
+        assertThat(view2.right, `is`(240))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddItemProgrammatically_withFlexboxLayoutLayoutParams() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_START
+                        val first = createTextView(activity, "1", 0)
+                        val second = createTextView(activity, "2", 0)
+                        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+                        lp1.setMargins(10, 10, 10, 10)
+                        val lp2 = FlexboxLayout.LayoutParams(100, 100)
+                        lp2.setMargins(20, 20, 20, 20)
+                        first.layoutParams = lp1
+                        second.layoutParams = lp2
+                        flexboxLayout.addView(first)
+                        flexboxLayout.addView(second)
+                    }
+                })
+
+        assertThat(flexboxLayout.childCount, `is`(2))
+        val view1 = flexboxLayout.getChildAt(0)
+        val view2 = flexboxLayout.getChildAt(1)
+        // Assert the coordinates of the views added programmatically with margins
+        assertThat(view1.left, `is`(10))
+        assertThat(view1.top, `is`(10))
+        assertThat(view1.bottom, `is`(110))
+        assertThat(view1.right, `is`(110))
+        assertThat(view2.left, `is`(140))
+        assertThat(view2.top, `is`(20))
+        assertThat(view2.bottom, `is`(120))
+        assertThat(view2.right, `is`(240))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxLines() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.maxLine = 3
+                        for (i in 1..50) {
+                            val textView = createTextView(activity, i.toString(), 0)
+                            val lp = FlexboxLayout.LayoutParams(100, 100)
+                            lp.flexShrink = 0f
+                            textView.layoutParams = lp
+                            flexboxLayout.addView(textView)
+                        }
+                    }
+                })
+        assertThat(flexboxLayout.childCount, `is`(50))
+        assertThat(flexboxLayout.flexLines.size, `is`(3))
+    }
+
+    @Throws(Throwable::class)
+    private fun createFlexboxLayout(@LayoutRes activityLayoutResId: Int,
+                                    configuration: Configuration = Configuration.EMPTY): FlexboxLayout {
+        val activity = activityRule.activity
+        activityRule.runOnUiThread {
+            activity.setContentView(activityLayoutResId)
+            val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+            configuration.apply(flexboxLayout)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        return activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+    }
+
+    private fun createTextView(context: Context, text: String, order: Int): TextView {
+        val textView = TextView(context)
+        textView.text = text
+        val lp = FlexboxLayout.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        lp.order = order
+        textView.layoutParams = lp
+        return textView
+    }
+
+    private fun hasWidth(width: Int): ViewAssertion {
+        return matches(object : TypeSafeMatcher<View>() {
+            override fun describeTo(description: Description) {
+                description.appendText("expected width: $width")
+            }
+
+            override fun describeMismatchSafely(item: View, mismatchDescription: Description) {
+                mismatchDescription.appendText("actual width: " + item.width)
+            }
+
+            override fun matchesSafely(item: View) = item.width == width
+        })
+    }
+
+    private fun hasHeight(height: Int): ViewAssertion {
+        return matches(object : TypeSafeMatcher<View>() {
+            override fun describeTo(description: Description) {
+                description.appendText("expected height: $height")
+            }
+
+            override fun describeMismatchSafely(item: View, mismatchDescription: Description) {
+                mismatchDescription.appendText("actual height: " + item.height)
+            }
+
+            override fun matchesSafely(item: View) = item.height == height
+        })
+    }
+
+    private interface Configuration {
+
+        fun apply(flexboxLayout: FlexboxLayout)
+
+        companion object {
+            val EMPTY: Configuration = object : Configuration {
+                override fun apply(flexboxLayout: FlexboxLayout) = Unit
+            }
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerConfigChangeTest.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerConfigChangeTest.kt
new file mode 100755
index 0000000..e21a458
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerConfigChangeTest.kt
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+import android.content.pm.ActivityInfo
+import android.content.res.Configuration
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.*
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexboxLayoutManager
+import org.hamcrest.Matchers.`is`
+import org.hamcrest.core.IsNot.not
+import org.junit.Assert.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [FlexboxLayoutManager] with the Activity that handles configuration
+ * changes manually.
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class FlexboxLayoutManagerConfigChangeTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(ConfigChangeActivity::class.java)
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexLinesDiscardedOnOrientationChange_direction_row() {
+        // Verifies the case that the calculated Flex lines are correctly discarded when a
+        // orientation happens with an Activity that handles configuration changes manually
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            // This test assumes that the screen width and the height are different.
+            recyclerView.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            recyclerView.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..99) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstLine = layoutManager.flexLines[0]
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(0) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val firstLineAfterRotation = layoutManager.flexLines[0]
+        assertThat(firstLine.mainSize, `is`(not(firstLineAfterRotation.mainSize)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexLinesDiscardedOnOrientationChange_direction_column() {
+        // Verifies the case that the calculated Flex lines are correctly discarded when a
+        // orientation happens with an Activity that handles configuration changes manually
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            // This test assumes that the screen width and the height are different.
+            recyclerView.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            recyclerView.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..99) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstLine = layoutManager.flexLines[0]
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(0) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val firstLineAfterRotation = layoutManager.flexLines[0]
+        assertThat(firstLine.mainSize, `is`(not(firstLineAfterRotation.mainSize)))
+    }
+
+    /**
+     * Creates a new flex item.
+     *
+     * @param context the context
+     * @param width   in DP
+     * @param height  in DP
+     * @return the created [FlexboxLayoutManager.LayoutParams] instance
+     */
+    private fun createLayoutParams(context: Context, width: Int,
+                                   height: Int): FlexboxLayoutManager.LayoutParams {
+        return FlexboxLayoutManager.LayoutParams(context.dpToPixel(width), context.dpToPixel(height))
+    }
+
+    private fun swipe(from: CoordinatesProvider, to: CoordinatesProvider): ViewAction {
+        return GeneralSwipeAction(Swipe.FAST, from, to, Press.FINGER)
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt
new file mode 100755
index 0000000..26e6da6
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt
@@ -0,0 +1,3503 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+import android.content.pm.ActivityInfo
+import android.content.res.Configuration
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.CoordinatesProvider
+import androidx.test.espresso.action.GeneralLocation
+import androidx.test.espresso.action.GeneralSwipeAction
+import androidx.test.espresso.action.Press
+import androidx.test.espresso.action.Swipe
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.AlignSelf
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxItemDecoration
+import com.google.android.flexbox.FlexboxItemDecoration.HORIZONTAL
+import com.google.android.flexbox.FlexboxItemDecoration.VERTICAL
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.google.android.flexbox.JustifyContent
+import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
+import org.hamcrest.Matchers.`is`
+import org.hamcrest.Matchers.instanceOf
+import org.hamcrest.Matchers.lessThan
+import org.hamcrest.Matchers.notNullValue
+import org.hamcrest.core.IsNot.not
+import org.junit.Assert.assertThat
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [FlexboxLayoutManager].
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class FlexboxLayoutManagerTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(FlexboxTestActivity::class.java)
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLoadFromXml() {
+        val activity = activityRule.activity
+        activityRule.runOnUiThread { activity.setContentView(R.layout.recyclerview_reverse) }
+        val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        val layoutManager = recyclerView.layoutManager
+        assertThat(recyclerView, `is`(notNullValue()))
+        assertThat(layoutManager, `is`(instanceOf<Any>(FlexboxLayoutManager::class.java)))
+        val flexboxLayoutManager = layoutManager as FlexboxLayoutManager
+        assertThat(flexboxLayoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(flexboxLayoutManager.flexWrap, `is`(FlexWrap.WRAP))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChangeAttributesFromCode() {
+        val activity = activityRule.activity
+        activityRule.runOnUiThread { activity.setContentView(R.layout.recyclerview_reverse) }
+        val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        val layoutManager = recyclerView.layoutManager
+        assertThat(recyclerView, `is`(notNullValue()))
+        assertThat(layoutManager, `is`(instanceOf<Any>(FlexboxLayoutManager::class.java)))
+        val flexboxLayoutManager = layoutManager as FlexboxLayoutManager
+        assertThat(flexboxLayoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(flexboxLayoutManager.flexWrap, `is`(FlexWrap.WRAP))
+
+        flexboxLayoutManager.flexDirection = FlexDirection.COLUMN
+        flexboxLayoutManager.flexWrap = FlexWrap.NOWRAP
+        flexboxLayoutManager.justifyContent = JustifyContent.CENTER
+        flexboxLayoutManager.alignItems = AlignItems.FLEX_END
+        assertThat(flexboxLayoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayoutManager.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(flexboxLayoutManager.alignItems, `is`(AlignItems.FLEX_END))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_not_wrapped() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.flexWrap, `is`(FlexWrap.WRAP))
+        // Only 2 items are added and all items should be attached (visible). So both
+        // getChildCount and getFlexItemCount(including detached items) should return the same value
+        assertThat(layoutManager.flexItemCount, `is`(2))
+        assertThat(layoutManager.childCount, `is`(2))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_wrapped() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // 4 items are added and all items should be attached (visible). So both
+        // getChildCount and getFlexItemCount(including detached items) should return the same value
+        assertThat(layoutManager.flexItemCount, `is`(4))
+        assertThat(layoutManager.childCount, `is`(4))
+        assertThat(layoutManager.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_partOfItems_detached() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 320, height: 450
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items follow aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_scrollVertically() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 320, height: 450
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items follow aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        // The RecyclerView is swiped to top until it reaches the bottom of the view.
+        // The number of the visible views should be 5
+        assertThat(layoutManager.childCount, `is`(5))
+        // Since the RecyclerView is swiped to the bottom, all flex lines should be calculated
+        // by now
+        assertThat(layoutManager.flexLines.size, `is`(5))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 150, 130)
+            lp1.flexGrow = 1.0f
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 150, 130)
+            lp2.flexGrow = 1.0f
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 150, 130)
+            lp3.flexGrow = 1.0f
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // The flexGrow parameters for all LayoutParams are set to 1.0, expecting each child to
+        // fill the horizontal remaining space
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(2))
+        assertThat(layoutManager.getChildAt(0)!!.width, isEqualAllowingError(activity.dpToPixel(160)))
+        assertThat(layoutManager.getChildAt(1)!!.width, isEqualAllowingError(activity.dpToPixel(160)))
+        assertThat(layoutManager.getChildAt(2)!!.width, isEqualAllowingError(activity.dpToPixel(320)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_column_partOfItems_detached() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 450, height: 240
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items after aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_column_scrollHorizontally() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 500, height: 240
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items follow aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        // The RecyclerView is swiped to top until it reaches the right edge of the view.
+        // The number of the visible views should be 5
+        assertThat(layoutManager.childCount, `is`(5))
+        // Since the RecyclerView is swiped to the bottom, all flex lines should be calculated
+        // by now
+        assertThat(layoutManager.flexLines.size, `is`(5))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(150)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(170)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(220)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(220)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(320)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(85)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(235)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(28)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(78)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(242)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(292)))
+    }
+
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(43)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(93)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(228)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(278)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(320)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(320)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(220)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(170)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(220)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(150)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(235)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(85)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(135)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(242)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(292)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(28)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(78)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(228)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(278)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(43)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(93)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(320)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(150)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(90)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(140)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(140)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(45)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(195)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(15)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(65)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(175)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(225)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(23)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(73)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(167)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(217)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(140)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(90)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(140)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(150)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(195)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(45)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(95)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(175)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(225)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(15)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(65)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(167)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(217)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(23)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(73)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLargeItem_scrollFast_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..199) {
+                val lp = createLayoutParams(activity, 100, 50)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // Should be scrolled to the bottom by now
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        // Should be scrolled to the top
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLargeItem_scrollFast_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..199) {
+                val lp = createLayoutParams(activity, 70, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+
+        // Should be scrolled to the right edge by now
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        // Should be scrolled to the left edge by now
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_stretch_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 70, 80)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 70, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 70, 30)
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify all items heights are stretched
+        assertThat(layoutManager.getChildAt(0)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(2)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_stretch_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 80, 70)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 70)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 30, 70)
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify all items widths are stretched
+        assertThat(layoutManager.getChildAt(0)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(2)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 70, 80)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 70, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 70, 30)
+            lp3.alignSelf = AlignSelf.STRETCH
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify the item whose align self is set to stretch is stretched
+        assertThat(layoutManager.getChildAt(0)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.height, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(layoutManager.getChildAt(2)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 80, 70)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 70)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 30, 70)
+            lp3.alignSelf = AlignSelf.STRETCH
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify the item whose align self is set to stretch is stretched
+        assertThat(layoutManager.getChildAt(0)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.width, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(layoutManager.getChildAt(2)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testStretchViews_from_middle_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        activityRule.runOnUiThread {
+            layoutManager.alignItems = AlignItems.STRETCH
+            val lp = createLayoutParams(activity, 70, 20)
+            // Add an item whose height is less than the other items.
+            // But with alignItems set to stretch, the height of the item should be stretched
+            adapter.addItem(lp)
+            adapter.notifyDataSetChanged()
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.getChildAt(layoutManager.childCount - 1)!!.height,
+                isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testStretchViews_from_middle_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 50)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        activityRule.runOnUiThread {
+            layoutManager.alignItems = AlignItems.STRETCH
+            val lp = createLayoutParams(activity, 20, 50)
+            // Add an item whose width is less than the other items.
+            // But with alignItems set to stretch, the width of the item should be stretched
+            adapter.addItem(lp)
+            adapter.notifyDataSetChanged()
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.getChildAt(layoutManager.childCount - 1)!!.width,
+                isEqualAllowingError(activity.dpToPixel(70)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToTop_middleItem_as_anchorPosition() {
+        // There was an issue that the anchor position was based on the first item in the first
+        // visible flex line when scrolling to top. But the anchor position should be based on the
+        // flex line position (view which has the minimum top position in the same flex line)
+        // This test verifies the issue is fixed.
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val positionInSecondLine = 6
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                var lp = createLayoutParams(activity, 70, 80)
+                if (i == positionInSecondLine) {
+                    // Change the height from other items in the second line, not the first item
+                    // in the second line
+                    lp = createLayoutParams(activity, 70, 130)
+                }
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (320 / 70) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // Now scrolling to the top to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        assertThat(layoutManager.getChildAt(positionInSecondLine)!!.bottom,
+                isEqualAllowingError(activity.dpToPixel(210))) // 80 + 130
+        // Verify that the view in the same line's cross axis position is correct
+        assertThat(layoutManager.getChildAt(positionInSecondLine - 1)!!.bottom,
+                isEqualAllowingError(activity.dpToPixel(160))) // 80 + 80
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToLeft_middleItem_as_anchorPosition() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val positionInSecondLine = 6
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                var lp = createLayoutParams(activity, 80, 50)
+                if (i == positionInSecondLine) {
+                    // Change the width from other items in the second line, not the first item
+                    // in the second line
+                    lp = createLayoutParams(activity, 130, 50)
+                }
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (240 / 50) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        // By this moment reached to the right edge
+
+        // Now scrolling to the left to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+
+        assertThat(layoutManager.getChildAt(positionInSecondLine)!!.right,
+                isEqualAllowingError(activity.dpToPixel(210))) // 80 + 130
+        // Verify that the view in the same line's cross axis position is correct
+        assertThat(layoutManager.getChildAt(positionInSecondLine - 1)!!.right,
+                isEqualAllowingError(activity.dpToPixel(160))) // 80 + 80
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToBottom_middleItem_as_anchorPosition() {
+        // There was an issue that the anchor position was based on the last item in the last
+        // visible flex line when scrolling to bottom. But the anchor position should be based on
+        // the flex line position (view which has the maximum bottom position in the same flex line)
+        // This test verifies the issue is fixed.
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val positionInSecondBottomLine = 45
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                var lp = createLayoutParams(activity, 70, 80)
+                if (i == positionInSecondBottomLine) {
+                    // Change the height from other items in the second bottom line
+                    lp = createLayoutParams(activity, 70, 130)
+                }
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (320 / 70) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // 4 comes from the number of flex items - positionInSecondBottomLine
+        val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        val anchorView = layoutManager.getChildAt(layoutManager.childCount - 4)
+        assertThat(recyclerView.bottom - anchorView!!.top,
+                isEqualAllowingError(activity.dpToPixel(210))) // 80 + 130
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToTop_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (320 / 70) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // Now scrolling to the top to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        assertThat((layoutManager.getChildAt(0) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_only_oneItem_has_positive_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..3) {
+                val lp = createLayoutParams(activity, 100, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 1 item
+            // Give the second item in the first line a positive flex grow
+            adapter.getItemAt(0).setHeight(activity.dpToPixel(140))
+            adapter.getItemAt(1).flexGrow = 1.0f
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        // Verify the vertical position (cross size) of the second line is correctly positioned
+        assertThat(layoutManager.getChildAt(3)!!.top, isEqualAllowingError(activity.dpToPixel(140)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_only_oneItem_has_positive_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..3) {
+                val lp = createLayoutParams(activity, 70, 70)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 1 item
+            // Give the second item in the first line a positive flex grow
+            adapter.getItemAt(0).setWidth(activity.dpToPixel(120))
+            adapter.getItemAt(1).flexGrow = 1.0f
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        // Verify the horizontal position (cross size) of the second line is correctly positioned
+        assertThat(layoutManager.getChildAt(3)!!.left, isEqualAllowingError(activity.dpToPixel(120)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstReferenceView_middleOf_line_used_as_anchor() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_END
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp1)
+            // The second view in the first line has the maximum height in the same line
+            val lp2 = createLayoutParams(activity, 100, 180)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp3)
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // Now scrolling to the top to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        // The top coordinate of the first view should be the height of the second view minus the
+        // height of the first view (180 - 80)
+        assertThat(layoutManager.getChildAt(0)!!.top, isEqualAllowingError(activity.dpToPixel(100)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLastReferenceView_middleOf_line_used_as_anchor() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 80)
+                adapter.addItem(lp)
+            }
+            val lp1 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp1)
+            // The second view in the last line has the maximum height in the same line
+            val lp2 = createLayoutParams(activity, 100, 180)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        // The bottom coordinate of the first view in the last line should be the height of the
+        // second view in the last line minus the height of the first view in the last line
+        // (180 - 80)
+        assertThat(layoutManager.getChildAt(layoutManager.childCount - 2)!!.bottom
+                - layoutManager.getChildAt(layoutManager.childCount - 3)!!.bottom,
+                isEqualAllowingError(activity.dpToPixel(100)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testRotateScreen_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.CENTER))
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        val anchorView = layoutManager.getChildAt(0)
+        val offset = anchorView!!.top
+        assertTrue(offset < 0)
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Verify that offset position is preserved for the first visible view after the rotation
+        val anchorAfterRotate = layoutManager.getChildAt(0)
+        assertTrue(anchorAfterRotate!!.top < 0)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testRotateScreen_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER))
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        val anchorView = layoutManager.getChildAt(0)
+        val offset = anchorView!!.left
+        assertTrue(offset < 0)
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Verify that offset position is preserved for the first visible view after the rotation
+        val anchorAfterRotate = layoutManager.getChildAt(0)
+        assertTrue(anchorAfterRotate!!.left < 0)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        var view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view2!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        var view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view3!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+        var view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        var view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width)
+        assertThat(view2!!.left, isEqualAllowingError(activity.dpToPixel(90)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 90(view width)
+        assertThat(view3!!.left, isEqualAllowingError(activity.dpToPixel(180)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view2!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view3!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 100 (view height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        var view1 = layoutManager.getChildAt(0)
+        var view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view1!!.right - view2!!.right, isEqualAllowingError(activity.dpToPixel(100)))
+        var view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view1.right - view3!!.right, isEqualAllowingError(activity.dpToPixel(200)))
+        var view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        var view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width)
+        assertThat(view1!!.right - view2!!.right, isEqualAllowingError(activity.dpToPixel(90)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 90(view width)
+        assertThat(view1.right - view3!!.right, isEqualAllowingError(activity.dpToPixel(180)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view1!!.right - view2!!.right,
+                isEqualAllowingError(activity.dpToPixel(100)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view1.right - view3!!.right,
+                isEqualAllowingError(activity.dpToPixel(200)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 100 (view height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        var view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        var view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        var view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        var view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(90)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 90 (view width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(180)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height)
+        assertThat(view2!!.top, isEqualAllowingError(activity.dpToPixel(65)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 65 (view height)
+        assertThat(view3!!.top, isEqualAllowingError(activity.dpToPixel(130)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        var view1 = layoutManager.getChildAt(0)
+        var view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view1!!.top - view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        var view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view1.top - view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        var view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        var view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view1!!.top - view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view1.top - view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(90)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 90 (view width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(180)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height)
+        assertThat(view1!!.top - view2!!.top, isEqualAllowingError(activity.dpToPixel(65)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 65 (view height)
+        assertThat(view1.top - view3!!.top, isEqualAllowingError(activity.dpToPixel(130)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..149) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+            // ....
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        val scrollTo = 42
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Each flex line should have 3 items in this test's configuration.
+        // After scrolling to the position of 42 (% 3 == 0), the first visible item should
+        // be the 42'th item
+        assertThat((layoutManager.getChildAt(0) as TextView).text.toString(),
+                `is`((scrollTo + 1).toString()))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // Scroll enough that 42'th item becomes off screen to the top
+
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // The 42'th item should be at the bottom of the screen.
+        // The last visible item should be 42 + 3 since the last visible item is at the last
+        // of the bottom flex line
+        assertThat((layoutManager.getChildAt(layoutManager.childCount - 1) as TextView).text.toString(),
+                `is`((scrollTo + 3).toString()))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..149) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+            // ....
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val scrollTo = 42
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Each flex line should have 3 items in this test's configuration.
+        // After scrolling to the position of 42 (% 3 == 0), the first visible item should
+        // be the 42'th item
+        assertThat((layoutManager.getChildAt(0) as TextView).text.toString(),
+                `is`((scrollTo + 1).toString()))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        // Scroll enough that 42'th item becomes off screen to the left
+
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // The 42'th item should be at the bottom of the screen.
+        // The last item should be the (42 + 3)'th item since it should be also the last item in the
+        // bottom flex line
+        assertThat((layoutManager.getChildAt(layoutManager.childCount - 1) as TextView).text.toString(),
+                `is`((scrollTo + 3).toString()))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_scrollToNewItem_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..5) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // There should be 2 lines
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 100, 70)
+            adapter.addItem(lp)
+            layoutManager.scrollToPosition(adapter.itemCount - 1)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // ChildCount (visible views) should be 6 + 1,
+        // which before fixing https://github.com/google/flexbox-layout/issues/206, only the new
+        // item was visible
+        assertThat(layoutManager.childCount, `is`(7))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_scrollToNewItem_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..5) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // There should be 2 lines
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 100, 70)
+            adapter.addItem(lp)
+            layoutManager.scrollToPosition(adapter.itemCount - 1)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // ChildCount (visible views) should be 6 + 1,
+        // which before fixing https://github.com/google/flexbox-layout/issues/206, only the new
+        // item was visible
+        assertThat(layoutManager.childCount, `is`(7))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToStart_secondLineHasMoreItemThanFirst() {
+        // This test verifies the case that the first line disappears as the user first scrolls to
+        // the bottom enough that the first line becomes invisible then the user scrolls toward
+        // start on the condition that the second line has more items than the first line
+        // https://github.com/google/flexbox-layout/issues/228
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val first = FlexboxLayoutManager.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, activity.dpToPixel(70))
+            adapter.addItem(first)
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // The first line has 1 item, the following lines have more than 1 items
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 1 items
+            // Flex line 2: 3 items
+            // Flex line 3: 3 items
+            // ...
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // At this moment, the first item should become invisible
+        var firstView = layoutManager.getChildAt(0)
+        assertThat((firstView as TextView).text.toString(), `is`(not("1")))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        // The first visible item should be "1", which before fixing the issue
+        // https://github.com/google/flexbox-layout/issues/228, the first line disappeared.
+        firstView = layoutManager.getChildAt(0)
+        assertThat((firstView as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNestedRecyclerViews_direction_row() {
+        // This test verifies the nested RecyclerViews.
+        // The outer RecyclerView scrolls vertical using LinearLayoutManager.
+        // The inner RecyclerViews use FlexboxLayoutManager with flexDirection == ROW and
+        // height of the RecyclerView is set to "wrap_content", which before fixing
+        // https://github.com/google/flexbox-layout/issues/208, the height of the inner
+        // RecyclerViews were set to 0.
+        val activity = activityRule.activity
+        val outerLayoutManager = LinearLayoutManager(activity)
+
+        // Give the inner adapter item count enough so that inner RecyclerView with
+        // FlexboxLayoutManager wraps its items
+        val innerAdapterItemCount = 20
+        val adapter = NestedOuterAdapter(FlexDirection.ROW,
+                innerAdapterItemCount, R.layout.viewholder_inner_recyclerview)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            outerLayoutManager.orientation = LinearLayoutManager.VERTICAL
+            recyclerView.layoutManager = outerLayoutManager
+            recyclerView.adapter = adapter
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val viewHolder = adapter.getViewHolder(0)
+        val innerRecyclerView = viewHolder.innerRecyclerView
+        assertThat(innerRecyclerView.height, `is`(not(0)))
+
+        // This assertion verifies that inner RecyclerView displays the entire items including
+        // wrapped lines to verify the issue that nested RecyclerView with FlexboxLayoutManager
+        // only displayed one line https://github.com/google/flexbox-layout/issues/290
+        assertThat((innerRecyclerView.layoutManager as FlexboxLayoutManager).findLastVisibleItemPosition(),
+                `is`(innerAdapterItemCount - 1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNestedRecyclerViews_direction_column() {
+        // This test verifies the nested RecyclerViews.
+        // The outer RecyclerView scrolls horizontally using LinearLayoutManager.
+        // The inner RecyclerViews use FlexboxLayoutManager with flexDirection == COLUMN and
+        // width of the RecyclerView is set to "wrap_content", which before fixing
+        // https://github.com/google/flexbox-layout/issues/208, the width of the inner
+        // RecyclerViews were set to 0.
+        val activity = activityRule.activity
+        val outerLayoutManager = LinearLayoutManager(activity)
+
+        // Give the inner adapter item count enough so that inner RecyclerView with
+        // FlexboxLayoutManager wraps its items
+        val innerAdapterItemCount = 20
+        val adapter = NestedOuterAdapter(FlexDirection.COLUMN,
+                innerAdapterItemCount, R.layout.viewholder_inner_recyclerview_wrap_horizontally)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            outerLayoutManager.orientation = LinearLayoutManager.HORIZONTAL
+            recyclerView.layoutManager = outerLayoutManager
+            recyclerView.adapter = adapter
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val viewHolder = adapter.getViewHolder(0)
+        val innerRecyclerView = viewHolder.innerRecyclerView
+        assertThat(innerRecyclerView.width, `is`(not(0)))
+
+        // This assertion verifies that inner RecyclerView displays the entire items including
+        // wrapped lines to verify the issue that nested RecyclerView with FlexboxLayoutManager
+        // only displayed one line https://github.com/google/flexbox-layout/issues/290
+        assertThat((innerRecyclerView.layoutManager as FlexboxLayoutManager).findLastVisibleItemPosition(),
+                `is`(innerAdapterItemCount - 1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFindVisibleChild_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // At first three completely visible lines.
+            // Flex line 1, item count 3 (0, 1, 2)
+            // Flex line 2, item count 3 (3, 4, 5)
+            // Flex line 3, item count 3 (6, 7, 8)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(8))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(11))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(42))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(39))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(49))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(49))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFindVisibleChild_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // At first three completely visible lines.
+            // Flex line 1, item count 3 (0, 1, 2)
+            // Flex line 2, item count 3 (3, 4, 5)
+            // Flex line 3, item count 3 (6, 7, 8)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(8))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(11))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(42))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(39))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(49))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(49))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDrawDirtyFlexLine_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // First scroll to the bottom, then add a new item that isn't visible at this moment.
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 40, 75)
+            adapter.addItem(0, lp)
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstVisible = layoutManager.getChildAt(0)
+        assertThat(firstVisible!!.width, isEqualAllowingError(activity.dpToPixel(40)))
+        assertThat(firstVisible.height, isEqualAllowingError(activity.dpToPixel(75)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDrawDirtyFlexLine_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // First scroll to the bottom, then add a new item that isn't visible at this moment.
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 100, 120)
+            adapter.addItem(0, lp)
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstVisible = layoutManager.getChildAt(0)
+        assertThat(firstVisible!!.width, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(firstVisible.height, isEqualAllowingError(activity.dpToPixel(120)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDrawDirtyFlexLine_multi_viewTypes_direction_row() {
+        // This test verifies https://github.com/google/flexbox-layout/issues/280
+        // the position of the view type is shifted if a new item is inserted before the
+        // view which has the special viewType and that view isn't visible at the time the item
+        // was inserted.
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapterMultiViewTypes()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val parent = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        var matchParentText = layoutManager
+                .getChildAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT) as TextView
+        assertThat(matchParentText.width, `is`(parent.width))
+        assertThat(matchParentText.text.toString(),
+                `is`<String>((TestAdapterMultiViewTypes.POSITION_MATCH_PARENT + 1).toString()))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+
+        val insertedValue = 10
+        activityRule.runOnUiThread {
+            val item = TestAdapterMultiViewTypes.Item()
+            item.value = insertedValue
+            // Insert an item before the position that has a special viewType
+            adapter.addItemAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT - 1, item)
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Since a new item is inserted before the position, the index at the view who has the
+        // special viewType should be shifted.
+        matchParentText = layoutManager
+                .getChildAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT + 1) as TextView
+        assertThat(matchParentText.width, `is`(parent.width))
+        assertThat(matchParentText.text.toString(),
+                `is`<String>((TestAdapterMultiViewTypes.POSITION_MATCH_PARENT + 1).toString()))
+
+        // The position of this view is the old position who had the special viewType, but
+        // now the viewType should be a normal one
+        val textView = layoutManager
+                .getChildAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT - 1) as TextView
+        assertThat(textView.width, lessThan(parent.width))
+        assertThat(textView.text.toString(), `is`(insertedValue.toString()))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildrenSizeWithMargin() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp = createLayoutParams(activity, 100, 30)
+            lp.setMargins(10, 30, 20, 40)
+            adapter.addItem(lp)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val text = layoutManager.getChildAt(0) as TextView
+        val lp = text.layoutParams as FlexboxLayoutManager.LayoutParams
+        assertThat(text.height, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(text.width, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(lp.marginLeft, isEqualAllowingError(10))
+        assertThat(lp.marginRight, isEqualAllowingError(20))
+        assertThat(lp.marginTop, isEqualAllowingError(30))
+        assertThat(lp.marginBottom, isEqualAllowingError(40))
+        activityRule.runOnUiThread { layoutManager.flexDirection = FlexDirection.COLUMN }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val text2 = layoutManager.getChildAt(0) as TextView
+        assertThat(text2.height, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(text2.width, isEqualAllowingError(activity.dpToPixel(100)))
+
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testItemDecoration_withScrolling_direction_row() {
+        // This test verifies the case that the item decoration set through FlexboxItemDecoration
+        // is misplaced after the user scrolls the RecyclerView
+        // https://github.com/google/flexbox-layout/issues/285
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val decorationDrawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val decoration = FlexboxItemDecoration(activity)
+            decoration.setDrawable(decorationDrawable)
+            recyclerView.addItemDecoration(decoration)
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // The first line has 1 item, the following lines have more than 1 items
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 1 items
+            // Flex line 2: 3 items
+            // Flex line 3: 3 items
+            // ...
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getLeftDecorationWidth(it), `is`(0)) }
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        // Verify even after the scrolling, decoration values are set correctly
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getLeftDecorationWidth(it), `is`(0)) }
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testItemDecoration_withScrolling_direction_column() {
+        // This test verifies the case that the item decoration set through FlexboxItemDecoration
+        // is misplaced after the user scrolls the RecyclerView
+        // https://github.com/google/flexbox-layout/issues/285
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val decorationDrawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val decoration = FlexboxItemDecoration(activity)
+            decoration.setDrawable(decorationDrawable)
+            recyclerView.addItemDecoration(decoration)
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // The first line has 1 item, the following lines have more than 1 items
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 1 items
+            // Flex line 2: 3 items
+            // Flex line 3: 3 items
+            // ...
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getTopDecorationHeight(it), `is`(0)) }
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+
+        // Verify even after the scrolling, decoration values are set correctly
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getTopDecorationHeight(it), `is`(0)) }
+    }
+
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNotifyItemChange_withPayload() {
+        // This test verifies the payload is correctly passed to the Adapter in the case
+        // that notifying an item with payload
+        // https://github.com/google/flexbox-layout/issues/297
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp = createLayoutParams(activity, 100, 70)
+            adapter.addItem(lp)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(adapter.payloads.size, `is`(0))
+
+        val payload = "payload"
+        activityRule.runOnUiThread { adapter.changeItemWithPayload(0, payload) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(adapter.payloads.size, `is`(1))
+        assertThat(adapter.payloads[0] as String, `is`(payload))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollAlongManAxis_direction_row() {
+        // This test verifies the scroll along the main axis if the width of the RecyclerView is
+        // larger than its parent when the main axis direction is horizontal (row)
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.wrapped_recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view = layoutManager.getChildAt(0)!!
+        assertThat(view.left, `is`(0))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        assertThat(view.left, `is`(not(0)))
+
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        assertThat(view.left, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollAlongManAxis_direction_column() {
+        // This test verifies the scroll along the main axis if the height of the RecyclerView is
+        // larger than its parent when the main axis direction is vertical (column).
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.wrapped_recyclerview_scroll_vertical)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 100)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view = layoutManager.getChildAt(0)!!
+        assertThat(view.top, `is`(0))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        assertThat(view.top, `is`(not(0)))
+
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        assertThat(view.top, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxLine() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.maxLine = 3
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 1..50) {
+                val lp = createLayoutParams(activity, 100, 70)
+                lp.flexShrink = 0f
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexLines.size, `is`(3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNowrap_justifyContentCenter_directionRow() {
+        // This is to fix https://github.com/google/flexbox-layout/issues/469
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val height = 70
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.flexWrap = FlexWrap.NOWRAP
+            layoutManager.justifyContent = JustifyContent.CENTER
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 1..3) {
+                val lp = createLayoutParams(activity, 100, height)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view1Bottom= layoutManager.getChildAt(0)!!.bottom
+        val view2Bottom = layoutManager.getChildAt(1)!!.bottom
+        val view3Bottom = layoutManager.getChildAt(2)!!.bottom
+        assertThat(view1Bottom, `is`(activity.dpToPixel(height)))
+        assertThat(view2Bottom, `is`(activity.dpToPixel(height)))
+        assertThat(view3Bottom, `is`(activity.dpToPixel(height)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNowrap_justifyContentCenter_directionColumn() {
+        // This is to fix https://github.com/google/flexbox-layout/issues/469
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val width = 100
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.flexWrap = FlexWrap.NOWRAP
+            layoutManager.justifyContent = JustifyContent.CENTER
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 1..3) {
+                val lp = createLayoutParams(activity, width, 70)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view1Right= layoutManager.getChildAt(0)!!.right
+        val view2Right = layoutManager.getChildAt(1)!!.right
+        val view3Right = layoutManager.getChildAt(2)!!.right
+        assertThat(view1Right, `is`(activity.dpToPixel(width)))
+        assertThat(view2Right, `is`(activity.dpToPixel(width)))
+        assertThat(view3Right, `is`(activity.dpToPixel(width)))
+    }
+
+    /**
+     * Creates a new flex item.
+     *
+     * @param context the context
+     * @param width   in DP
+     * @param height  in DP
+     * @return the created [FlexboxLayoutManager.LayoutParams] instance
+     */
+    private fun createLayoutParams(context: Context, width: Int,
+                                   height: Int): FlexboxLayoutManager.LayoutParams {
+        return FlexboxLayoutManager.LayoutParams(context.dpToPixel(width), context.dpToPixel(height))
+    }
+
+    private fun swipe(from: CoordinatesProvider, to: CoordinatesProvider): ViewAction {
+        return GeneralSwipeAction(Swipe.FAST, from, to, Press.FINGER)
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxTestActivity.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxTestActivity.kt
new file mode 100755
index 0000000..b7b81f0
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxTestActivity.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.app.Activity
+import com.google.android.flexbox.FlexboxLayout
+
+/**
+ * Activity for testing the [FlexboxLayout].
+ */
+class FlexboxTestActivity : Activity()
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/IsEqualAllowingError.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/IsEqualAllowingError.kt
new file mode 100755
index 0000000..68c74e8
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/IsEqualAllowingError.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import org.hamcrest.BaseMatcher
+import org.hamcrest.Description
+import org.hamcrest.Factory
+import org.hamcrest.Matcher
+import java.util.*
+
+/**
+ * Custom [BaseMatcher] that expects [Number] value allowing some errors to allow
+ * such as rounding errors.
+ */
+class IsEqualAllowingError<T : Number> private constructor(private val expected: Number, private val errorAllowed: Int) : BaseMatcher<T>() {
+
+    override fun matches(item: Any): Boolean {
+        if (item !is Number) {
+            return false
+        }
+        return expected.toInt() - errorAllowed <= item.toInt() && item.toInt() <= expected.toInt() + errorAllowed
+    }
+
+    override fun describeTo(description: Description) {
+        description.appendText(
+                String.format(Locale.US, "expected value is <%s> allowing error of <%s>.", expected,
+                        errorAllowed))
+    }
+
+    companion object {
+
+        @Factory
+        fun <T : Number> isEqualAllowingError(expected: T): Matcher<T> {
+            return IsEqualAllowingError(expected, 2)
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedInnerAdapter.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedInnerAdapter.kt
new file mode 100755
index 0000000..ea673cb
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedInnerAdapter.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * Adapter for the tests for nested RecyclerViews.
+ * This Adapter is used for the inner RecyclerView.
+ */
+internal class NestedInnerAdapter(private val innerPosition: Int, private val itemCount: Int)
+    : RecyclerView.Adapter<NestedInnerAdapter.InnerViewHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NestedInnerAdapter.InnerViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.viewholder_textview, parent, false)
+        return InnerViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: InnerViewHolder, position: Int) {
+        holder.textView.text = holder.textView.resources.getString(R.string.item_description, innerPosition, position)
+    }
+
+    override fun getItemCount() = itemCount
+
+    internal class InnerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        val textView: TextView = itemView.findViewById(R.id.textview)
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedOuterAdapter.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedOuterAdapter.kt
new file mode 100755
index 0000000..72e3cc8
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedOuterAdapter.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * Adapter for the tests for nested RecyclerViews.
+ * This Adapter is used for the outer RecyclerView.
+ */
+internal class NestedOuterAdapter(
+        @param:FlexDirection private val flexDirection: Int, private val innerAdapterItemCount: Int,
+        @param:LayoutRes private val viewHolderResId: Int
+) : RecyclerView.Adapter<NestedOuterAdapter.OuterViewHolder>() {
+
+    private val viewHolderList = mutableListOf<OuterViewHolder>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OuterViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(viewHolderResId, parent, false)
+        val holder = OuterViewHolder(view)
+        viewHolderList.add(holder)
+        return holder
+    }
+
+    override fun onBindViewHolder(holder: OuterViewHolder, position: Int) {
+        val layoutManager = FlexboxLayoutManager(holder.itemView.context)
+        layoutManager.flexDirection = flexDirection
+        holder.innerRecyclerView.layoutManager = layoutManager
+        holder.innerRecyclerView.adapter = NestedInnerAdapter(position, innerAdapterItemCount)
+    }
+
+    fun getViewHolder(position: Int) = viewHolderList[position]
+
+    override fun getItemCount() = ITEM_COUNT
+
+    internal class OuterViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val innerRecyclerView: RecyclerView = itemView.findViewById(R.id.recyclerview_inner)
+    }
+
+    companion object {
+        private const val ITEM_COUNT = 4
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt
new file mode 100755
index 0000000..361463e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * [RecyclerView.Adapter] implementation for [TestViewHolder].
+ */
+internal class TestAdapter private constructor(
+        private val layoutParams: MutableList<FlexboxLayoutManager.LayoutParams>)
+    : RecyclerView.Adapter<TestViewHolder>() {
+
+    private val receivedPayloads = mutableListOf<Any>()
+
+    constructor() : this(mutableListOf<FlexboxLayoutManager.LayoutParams>())
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TestViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.recyclerview_viewholder, parent, false)
+        return TestViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: TestViewHolder, position: Int) {
+        holder.textView.text = (position + 1).toString()
+        holder.textView.setBackgroundResource(R.drawable.flex_item_background)
+        holder.textView.gravity = Gravity.CENTER
+        holder.textView.layoutParams = layoutParams[position]
+    }
+
+    override fun onBindViewHolder(holder: TestViewHolder, position: Int, payloads: List<Any>) {
+        receivedPayloads.addAll(payloads)
+        onBindViewHolder(holder, position)
+    }
+
+    fun addItem(position: Int, flexItem: FlexboxLayoutManager.LayoutParams) {
+        layoutParams.add(position, flexItem)
+        notifyItemInserted(position)
+    }
+
+    fun addItem(flexItem: FlexboxLayoutManager.LayoutParams) {
+        layoutParams.add(flexItem)
+        notifyItemInserted(layoutParams.size - 1)
+    }
+
+    fun changeItemWithPayload(position: Int, payload: Any) {
+        notifyItemChanged(position, payload)
+    }
+
+    val payloads get() = receivedPayloads.toList()
+
+    fun getItemAt(index: Int) = layoutParams[index]
+
+    override fun getItemCount() = layoutParams.size
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapterMultiViewTypes.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapterMultiViewTypes.kt
new file mode 100755
index 0000000..aa2cb13
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapterMultiViewTypes.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * [RecyclerView.Adapter] implementation for [TestViewHolder], which has multiple
+ * view types.
+ */
+internal class TestAdapterMultiViewTypes : RecyclerView.Adapter<TestViewHolder>() {
+
+    private val items = mutableListOf<Item>()
+
+    init {
+        for (i in 0 until ITEMS) {
+            val item = Item()
+            if (i == POSITION_MATCH_PARENT) {
+                item.viewType = VIEW_TYPE_MATCH_PARENT
+            }
+            item.value = i + 1
+            items.add(item)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TestViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.recyclerview_viewholder, parent, false)
+        if (viewType == VIEW_TYPE_MATCH_PARENT) {
+            val flexboxLp = view.layoutParams as FlexboxLayoutManager.LayoutParams
+            flexboxLp.flexBasisPercent = 90f
+            flexboxLp.flexGrow = 1f
+        }
+        return TestViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: TestViewHolder, position: Int) {
+        holder.textView.text = items[position].value.toString()
+        holder.textView.setBackgroundResource(R.drawable.flex_item_background)
+        holder.textView.gravity = Gravity.CENTER
+    }
+
+    override fun getItemViewType(position: Int) = items[position].viewType
+
+    fun addItemAt(position: Int, item: Item) {
+        items.add(position, item)
+        notifyItemInserted(position)
+    }
+
+    override fun getItemCount() = items.size
+
+    internal class Item {
+        internal var viewType = VIEW_TYPE_NORMAL
+        internal var value = 0
+    }
+
+    companion object {
+
+        internal const val POSITION_MATCH_PARENT = 3
+        private const val ITEMS = 50
+
+        private const val VIEW_TYPE_NORMAL = 0
+        private const val VIEW_TYPE_MATCH_PARENT = 1
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestUtil.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestUtil.kt
new file mode 100755
index 0000000..92c3c43
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestUtil.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+
+internal fun Context.dpToPixel(dp: Int): Int {
+    val displayMetrics = this.resources.displayMetrics
+    return if (dp < 0) dp else Math.round(dp * displayMetrics.density)
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestViewHolder.kt b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestViewHolder.kt
new file mode 100755
index 0000000..ded6c44
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestViewHolder.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * ViewHolder implementation for a flex item for testing.
+ */
+internal class TestViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    val textView: TextView = itemView.findViewById(R.id.textview)
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider.xml
new file mode 100755
index 0000000..ec793d2
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size
+        android:width="10dp"
+        android:height="15dp" />
+    <solid android:color="#44A444" />
+</shape>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider_thick.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider_thick.xml
new file mode 100755
index 0000000..8148332
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider_thick.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size
+        android:width="40dp"
+        android:height="42dp" />
+    <solid android:color="#44A444" />
+</shape>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/flex_item_background.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/flex_item_background.xml
new file mode 100755
index 0000000..e743ee1
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/flex_item_background.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="#11aabb" />
+    <stroke android:width="1dp" android:color="#888888"/>
+</shape>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test.xml
new file mode 100755
index 0000000..83103c5
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test_overflowed.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test_overflowed.xml
new file mode 100755
index 0000000..585c6f9
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test_overflowed.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap_reverse"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="5" />
+
+    <TextView
+        android:id="@+id/text6"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="6" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_test.xml
new file mode 100755
index 0000000..032f71c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_test.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="baseline">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="1"
+        android:gravity="bottom" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="2"
+        android:gravity="top" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="3"
+        android:paddingTop="20dp"
+        android:gravity="center" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_wrap_content.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_wrap_content.xml
new file mode 100755
index 0000000..486b41d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_wrap_content.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="baseline">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="1"
+        android:gravity="bottom" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="2"
+        android:gravity="top" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="3"
+        android:paddingTop="20dp"
+        android:gravity="center" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_parent_padding_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_parent_padding_test.xml
new file mode 100755
index 0000000..fca45a4
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_parent_padding_test.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    android:padding="16dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_end">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_test.xml
new file mode 100755
index 0000000..3b056b0
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="stretch"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_self_stretch_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_self_stretch_test.xml
new file mode 100755
index 0000000..097230b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_self_stretch_test.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1"
+        app:layout_alignSelf="stretch" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_column.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_column.xml
new file mode 100755
index 0000000..7c44604
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_column.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_flexGrow="1.0" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_wrapBefore="true" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_row.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_row.xml
new file mode 100755
index 0000000..3e4903b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_row.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        android:text="1"
+        app:layout_flexGrow="1.0" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:text="2"
+        app:layout_wrapBefore="true" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_column_align_items_center_margin_oneside.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_column_align_items_center_margin_oneside.xml
new file mode 100755
index 0000000..8cf9e46
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_column_align_items_center_margin_oneside.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="100dp"
+    android:layout_height="20dp"
+    app:flexDirection="column">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="20dp"
+        android:layout_height="match_parent"
+        android:layout_marginRight="20dp"
+        android:text="1"
+        app:layout_alignSelf="center" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_row_align_items_center_margin_oneside.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_row_align_items_center_margin_oneside.xml
new file mode 100755
index 0000000..f6d560c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_row_align_items_center_margin_oneside.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="20dp"
+    android:layout_height="100dp"
+    app:flexDirection="row">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:layout_marginBottom="20dp"
+        android:text="1"
+        app:layout_alignSelf="center" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_column.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_column.xml
new file mode 100755
index 0000000..840521b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_column.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:dividerDrawableHorizontal="@drawable/divider"
+    app:showDividerHorizontal="beginning">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="80dp"
+        android:layout_height="90dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="80dp"
+        android:layout_height="90dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="80dp"
+        android:layout_height="90dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="80dp"
+        android:layout_height="140dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="80dp"
+        android:layout_height="140dp"
+        android:text="5" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_row.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_row.xml
new file mode 100755
index 0000000..652ff7d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_row.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:dividerDrawableVertical="@drawable/divider"
+    app:showDividerVertical="beginning">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="90dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="90dp"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="90dp"
+        android:layout_height="80dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="5" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_empty_children.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_empty_children.xml
new file mode 100755
index 0000000..55ae135
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_empty_children.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexWrap="wrap">
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_horizontal_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_horizontal_test.xml
new file mode 100755
index 0000000..0777747
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_horizontal_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="500dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="300dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_vertical_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_vertical_test.xml
new file mode 100755
index 0000000..7f3938c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_vertical_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="500dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="6dp"
+        android:layout_height="300dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_first_line_single_item.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_first_line_single_item.xml
new file mode 100755
index 0000000..6de3ed9
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_first_line_single_item.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!--
+This layout verifies the case where the first view's visibility is gone and the second view is
+in the next flex line by setting the layout_wrapBefore="true"
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2"
+        app:layout_wrapBefore="true"
+    />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_wrapBefore="true"
+    />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_grow_set_for_rest.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_grow_set_for_rest.xml
new file mode 100755
index 0000000..228c916
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_grow_set_for_rest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!--
+This layout verifies the case where the first view's visibility is gone and the second view is
+in the next flex line by setting the layout_wrapBefore="true"
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2"
+        app:layout_wrapBefore="true"
+        app:layout_flexGrow="1" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_flexGrow="1"
+        app:layout_wrapBefore="true" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_shrink_set_for_rest.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_shrink_set_for_rest.xml
new file mode 100755
index 0000000..423614b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_shrink_set_for_rest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!--
+This layout verifies the case where the first view's visibility is gone and the second view is
+in the next flex line by setting the layout_wrapBefore="true"
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2"
+        app:layout_wrapBefore="true"
+        app:layout_flexShrink="1" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_flexShrink="1"
+        app:layout_wrapBefore="true" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_basis_percent_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_basis_percent_test.xml
new file mode 100755
index 0000000..d75a1eb
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_basis_percent_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_flexBasisPercent="50%"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_flexBasisPercent="60%"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_grow_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_grow_test.xml
new file mode 100755
index 0000000..0616b39
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_grow_test.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent.xml
new file mode 100755
index 0000000..877fa74
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent_direction_column.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent_direction_column.xml
new file mode 100755
index 0000000..edcfc02
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent_direction_column.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_wrap_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_wrap_test.xml
new file mode 100755
index 0000000..a10ce38
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_wrap_test.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="300dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="1"
+        app:layout_flexShrink="0" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="2"
+        app:layout_flexShrink="0" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="3"
+        app:layout_flexShrink="0" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrap_content.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrap_content.xml
new file mode 100755
index 0000000..a2abbbb
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrap_content.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  --><!-- Set the layout_width and layout_height as wrap_content to test the behavior of
+     the situation MeasureSpec.AT_MOST is set as width/height mode -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_horizontalscrollview.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_horizontalscrollview.xml
new file mode 100755
index 0000000..137e6fd
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_horizontalscrollview.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!-- Wrap the FlexboxLayout with a Scrollview to test
+     the situation MeasureSpec.UNSPECIFIED is set as height mode -->
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.flexbox.FlexboxLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/flexbox_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="400dp"
+        app:flexDirection="column"
+        app:flexWrap="wrap">
+
+        <TextView
+            android:id="@+id/text1"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:text="1" />
+
+        <TextView
+            android:id="@+id/text2"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:text="2" />
+
+        <TextView
+            android:id="@+id/text3"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:text="3" />
+    </com.google.android.flexbox.FlexboxLayout>
+</HorizontalScrollView>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_scrollview.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_scrollview.xml
new file mode 100755
index 0000000..0d5d2f0
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_scrollview.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!-- Wrap the FlexboxLayout with a Scrollview to test
+     the situation MeasureSpec.UNSPECIFIED is set as height mode -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.flexbox.FlexboxLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/flexbox_layout"
+        android:layout_width="360dp"
+        android:layout_height="wrap_content"
+        app:flexDirection="row"
+        app:flexWrap="wrap">
+
+        <TextView
+            android:id="@+id/text1"
+            android:layout_width="140dp"
+            android:layout_height="500dp"
+            android:text="1" />
+
+        <TextView
+            android:id="@+id/text2"
+            android:layout_width="140dp"
+            android:layout_height="500dp"
+            android:text="2" />
+
+        <TextView
+            android:id="@+id/text3"
+            android:layout_width="140dp"
+            android:layout_height="500dp"
+            android:text="3" />
+    </com.google.android.flexbox.FlexboxLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_test.xml
new file mode 100755
index 0000000..4e72278
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_test.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:justifyContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_gone.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_gone.xml
new file mode 100755
index 0000000..e90f2e5
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_gone.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:justifyContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="2"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_parent_padding.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_parent_padding.xml
new file mode 100755
index 0000000..102f352
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_parent_padding.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/frame_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="24dp">
+
+    <com.google.android.flexbox.FlexboxLayout
+        android:id="@+id/flexbox_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="8dp"
+        app:flexDirection="row"
+        app:justifyContent="flex_start">
+
+        <TextView
+            android:id="@+id/text1"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:text="1" />
+
+        <TextView
+            android:id="@+id/text2"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:text="2" />
+
+        <TextView
+            android:id="@+id/text3"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:text="3" />
+    </com.google.android.flexbox.FlexboxLayout>
+</FrameLayout>
+
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_test.xml
new file mode 100755
index 0000000..031d2ae
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_test.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="150dp"
+        android:text="1"
+        app:layout_maxHeight="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_upper_bound_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_upper_bound_test.xml
new file mode 100755
index 0000000..a31320a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_upper_bound_test.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        android:text="1"
+        app:layout_flexGrow="1"
+        app:layout_maxHeight="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        app:layout_flexGrow="1"
+        android:text="2" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_test.xml
new file mode 100755
index 0000000..949697b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_maxWidth="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_upper_bound_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_upper_bound_test.xml
new file mode 100755
index 0000000..bb12f5b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_upper_bound_test.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_flexGrow="1"
+        app:layout_maxWidth="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        app:layout_flexGrow="1"
+        android:text="2" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_lower_bound_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_lower_bound_test.xml
new file mode 100755
index 0000000..f42af2f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_lower_bound_test.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="1"
+        app:layout_minHeight="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="4" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_test.xml
new file mode 100755
index 0000000..da613e4
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_test.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_minHeight="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_lower_bound_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_lower_bound_test.xml
new file mode 100755
index 0000000..c6e21ad
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_lower_bound_test.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_minWidth="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="4" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_test.xml
new file mode 100755
index 0000000..405144a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_minWidth="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_order_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_order_test.xml
new file mode 100755
index 0000000..a5b6977
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_order_test.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_order="2" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_order="-1" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="3"
+        app:layout_order="0" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="4" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_simple.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_simple.xml
new file mode 100755
index 0000000..b88e0c5
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_simple.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row_reverse"
+    app:justifyContent="center"
+    app:alignContent="center"
+    app:alignItems="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_order="2"
+        app:layout_flexGrow="1"
+        app:layout_alignSelf="stretch" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_stretch_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_stretch_test.xml
new file mode 100755
index 0000000..78496cf
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_stretch_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="360dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_gone.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_gone.xml
new file mode 100755
index 0000000..ac02713
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_gone.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="300dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="2"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="5" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_invisible.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_invisible.xml
new file mode 100755
index 0000000..a5e2151
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_invisible.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="300dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="1"
+        android:visibility="invisible" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="2"
+        android:visibility="invisible" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_column.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_column.xml
new file mode 100755
index 0000000..011294c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_column.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="360dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="160dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="160dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="160dp"
+        android:visibility="gone"
+        android:text="3" />
+
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_row.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_row.xml
new file mode 100755
index 0000000..84f50e7
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_row.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="wrap_content"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="wrap_content"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:text="3" />
+
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_before_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_before_test.xml
new file mode 100755
index 0000000..0df906c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_before_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="2"
+        app:layout_wrapBefore="true" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="3"
+        app:layout_wrapBefore="true" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_horizontal_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_horizontal_test.xml
new file mode 100755
index 0000000..d95ab70
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_horizontal_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="280dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:layout_margin="32dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_vertical_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_vertical_test.xml
new file mode 100755
index 0000000..5e26469
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_vertical_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="360dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="80dp"
+        android:layout_height="280dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="80dp"
+        android:layout_height="30dp"
+        android:layout_margin="32dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_grow.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_grow.xml
new file mode 100755
index 0000000..e25531c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_grow.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="24dp"
+        android:layout_height="0dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginRight="12dp"
+        android:text="1"
+        app:layout_flexBasisPercent="50%"
+        app:layout_flexGrow="1"
+        app:layout_flexShrink="0" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_shrink.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_shrink.xml
new file mode 100755
index 0000000..4cc389b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_shrink.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="200dp"
+    app:flexDirection="column"
+    app:flexWrap="nowrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="24dp"
+        android:layout_height="150dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginRight="12dp"
+        android:text="1"
+        app:layout_flexShrink="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="12dp"
+        android:layout_height="100dp"
+        android:text="2"
+        app:layout_flexShrink="1" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_grow.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_grow.xml
new file mode 100755
index 0000000..5207d6a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_grow.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexWrap="wrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="0dp"
+        android:layout_height="24dp"
+        android:layout_marginBottom="12dp"
+        android:text="test"
+        app:layout_flexBasisPercent="50%"
+        app:layout_flexGrow="1"
+        app:layout_flexShrink="0" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_shrink.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_shrink.xml
new file mode 100755
index 0000000..05be02a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_shrink.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="200dp"
+    android:layout_height="wrap_content"
+    app:flexWrap="nowrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="150dp"
+        android:layout_height="24dp"
+        android:layout_marginBottom="12dp"
+        android:text="test1"
+        app:layout_flexShrink="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="100dp"
+        android:layout_height="12dp"
+        android:text="test2"
+        app:layout_flexShrink="1" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_horizontal_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_horizontal_test.xml
new file mode 100755
index 0000000..c4ac440
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_horizontal_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    android:padding="32dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="280dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_vertical_test.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_vertical_test.xml
new file mode 100755
index 0000000..69641cb
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_vertical_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="360dp"
+    android:padding="32dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="80dp"
+        android:layout_height="280dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="80dp"
+        android:layout_height="30dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_height_positive_flexgrow.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_height_positive_flexgrow.xml
new file mode 100755
index 0000000..4caeef7
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_height_positive_flexgrow.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="column"
+    app:alignItems="flex_start" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="1"
+        app:layout_flexGrow="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="2-some long text"
+        app:layout_flexGrow="1" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_width_positive_flexgrow.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_width_positive_flexgrow.xml
new file mode 100755
index 0000000..cd420b7
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_width_positive_flexgrow.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:alignItems="flex_start" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_flexGrow="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="2-some long text"
+        app:layout_flexGrow="1" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview.xml
new file mode 100755
index 0000000..1db3834
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- Some APIs in espresso requires the view being performed is at least 90% visible to the
+     user, using the small width so that low resolution devices are covered-->
+<androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="320dp"
+    android:layout_height="240dp" />
+
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_reverse.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_reverse.xml
new file mode 100755
index 0000000..9f5ba82
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_reverse.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    app:reverseLayout="true"
+    app:stackFromEnd="true"
+    app:layoutManager="com.google.android.flexbox.FlexboxLayoutManager" />
+
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_viewholder.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_viewholder.xml
new file mode 100755
index 0000000..f0f1f77
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_viewholder.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textview"
+    android:layout_width="120dp"
+    android:layout_height="80dp" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview.xml
new file mode 100755
index 0000000..48b633e
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- The nested RecyclerViews tests verify the wrap_content behavior -->
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recyclerview_inner"
+    android:layout_width="200dp"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="8dp" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview_wrap_horizontally.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview_wrap_horizontally.xml
new file mode 100755
index 0000000..294028c
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview_wrap_horizontally.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- The nested RecyclerViews tests verify the wrap_content behavior -->
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recyclerview_inner"
+    android:layout_width="wrap_content"
+    android:layout_height="200dp"
+    android:layout_marginBottom="8dp" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_textview.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_textview.xml
new file mode 100755
index 0000000..213409d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_textview.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textview"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="4dp" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview.xml
new file mode 100755
index 0000000..3522d99
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- Some APIs in espresso requires the view being performed is at least 90% visible to the
+     user, using the small width so that low resolution devices are covered-->
+<FrameLayout android:id="@+id/container"
+             xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="320dp"
+             android:layout_height="240dp">
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+                                            android:layout_width="600dp"
+                                            android:layout_height="match_parent"/>
+</FrameLayout>
+
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview_scroll_vertical.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview_scroll_vertical.xml
new file mode 100755
index 0000000..797fdf2
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview_scroll_vertical.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- Some APIs in espresso requires the view being performed is at least 90% visible to the
+     user, using the small width so that low resolution devices are covered-->
+<FrameLayout android:id="@+id/container"
+             xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="320dp"
+             android:layout_height="240dp">
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+                                            android:layout_width="match_parent"
+                                            android:layout_height="600dp"/>
+</FrameLayout>
+
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/values/strings.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/values/strings.xml
new file mode 100755
index 0000000..706faa4
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/androidTest/res/values/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <string name="item_description">%1$s - %2$s</string>
+</resources>
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..beebcea
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<manifest package="com.google.android.flexbox" />
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignContent.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignContent.java
new file mode 100755
index 0000000..ac5e199
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignContent.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/** This attribute controls the alignment of the flex lines in the flex container. */
+@IntDef({AlignContent.FLEX_START, AlignContent.FLEX_END, AlignContent.CENTER,
+        AlignContent.SPACE_BETWEEN, AlignContent.SPACE_AROUND, AlignContent.STRETCH})
+@Retention(RetentionPolicy.SOURCE)
+public @interface AlignContent {
+
+    /** Flex lines are packed to the start of the flex container. */
+    int FLEX_START = 0;
+
+    /** Flex lines are packed to the end of the flex container. */
+    int FLEX_END = 1;
+
+    /** Flex lines are centered in the flex container. */
+    int CENTER = 2;
+
+    /**
+     * Flex lines are evenly distributed in the flex container. The first flex line is
+     * placed at the start of the flex container, the last flex line is placed at the
+     * end of the flex container.
+     */
+    int SPACE_BETWEEN = 3;
+
+    /**
+     * Flex lines are evenly distributed in the flex container with the same amount of spaces
+     * between the flex lines.
+     */
+    int SPACE_AROUND = 4;
+
+    /**
+     * Flex lines are stretched to fill the remaining space along the cross axis.
+     */
+    int STRETCH = 5;
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignItems.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignItems.java
new file mode 100755
index 0000000..8392ed1
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignItems.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/** This attribute controls the alignment along the cross axis. */
+@IntDef({AlignItems.FLEX_START, AlignItems.FLEX_END, AlignItems.CENTER,
+        AlignItems.BASELINE, AlignItems.STRETCH})
+@Retention(RetentionPolicy.SOURCE)
+public @interface AlignItems {
+
+    /** Flex item's edge is placed on the cross start line. */
+    int FLEX_START = 0;
+
+    /** Flex item's edge is placed on the cross end line. */
+    int FLEX_END = 1;
+
+    /** Flex item's edge is centered along the cross axis. */
+    int CENTER = 2;
+
+    /** Flex items are aligned based on their text's baselines. */
+    int BASELINE = 3;
+
+    /** Flex items are stretched to fill the flex line's cross size. */
+    int STRETCH = 4;
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignSelf.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignSelf.java
new file mode 100755
index 0000000..dff3fde
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignSelf.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/**
+ * This attribute controls the alignment along the cross axis.
+ * The alignment in the same direction can be determined by the {@link AlignItems} attribute in the
+ * parent, but if this is set to other than {@link AlignSelf#AUTO},
+ * the cross axis alignment is overridden for this child.
+ */
+@IntDef({AlignItems.FLEX_START, AlignItems.FLEX_END, AlignItems.CENTER,
+        AlignItems.BASELINE, AlignItems.STRETCH, AlignSelf.AUTO})
+@Retention(RetentionPolicy.SOURCE)
+public @interface AlignSelf {
+
+    /**
+     * The default value for the AlignSelf attribute, which means use the inherit
+     * the {@link AlignItems} attribute from its parent.
+     */
+    int AUTO = -1;
+
+    /** This item's edge is placed on the cross start line. */
+    int FLEX_START = AlignItems.FLEX_START;
+
+    /** This item's edge is placed on the cross end line. */
+    int FLEX_END = AlignItems.FLEX_END;
+
+    /** This item's edge is centered along the cross axis. */
+    int CENTER = AlignItems.CENTER;
+
+    /** This items is aligned based on their text's baselines. */
+    int BASELINE = AlignItems.BASELINE;
+
+    /** This item is stretched to fill the flex line's cross size. */
+    int STRETCH = AlignItems.STRETCH;
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexContainer.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexContainer.java
new file mode 100755
index 0000000..3421119
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexContainer.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.view.View;
+
+import java.util.List;
+
+/**
+ * An interface that has the common behavior as the flex container such as {@link FlexboxLayout}
+ * and {@link FlexboxLayoutManager}.
+ */
+interface FlexContainer {
+
+    int NOT_SET = -1;
+
+    /**
+     * @return the number of flex items contained in the flex container.
+     */
+    int getFlexItemCount();
+
+    /**
+     * Returns a flex item as a View at the given index.
+     *
+     * @param index the index
+     * @return the view at the index
+     */
+    View getFlexItemAt(int index);
+
+    /**
+     * Returns a flex item as a View, which is reordered by taking the order attribute into
+     * account.
+     *
+     * @param index the index of the view
+     * @return the reordered view, which order attribute is taken into account.
+     * If the index is negative or out of bounds of the number of contained views,
+     * returns {@code null}.
+     * @see FlexItem#getOrder()
+     */
+    View getReorderedFlexItemAt(int index);
+
+    /**
+     * Adds the view to the flex container as a flex item.
+     *
+     * @param view the view to be added
+     */
+    void addView(View view);
+
+    /**
+     * Adds the view to the specified index of the flex container.
+     *
+     * @param view  the view to be added
+     * @param index the index for the view to be added
+     */
+    void addView(View view, int index);
+
+    /**
+     * Removes all the views contained in the flex container.
+     */
+    void removeAllViews();
+
+    /**
+     * Removes the view at the specified index.
+     *
+     * @param index the index from which the view is removed.
+     */
+    void removeViewAt(int index);
+
+    /**
+     * @return the flex direction attribute of the flex container.
+     * @see FlexDirection
+     */
+    @FlexDirection
+    int getFlexDirection();
+
+    /**
+     * Sets the given flex direction attribute to the flex container.
+     *
+     * @param flexDirection the flex direction value
+     * @see FlexDirection
+     */
+    void setFlexDirection(@FlexDirection int flexDirection);
+
+    /**
+     * @return the flex wrap attribute of the flex container.
+     * @see FlexWrap
+     */
+    @FlexWrap
+    int getFlexWrap();
+
+    /**
+     * Sets the given flex wrap attribute to the flex container.
+     *
+     * @param flexWrap the flex wrap value
+     * @see FlexWrap
+     */
+    void setFlexWrap(@FlexWrap int flexWrap);
+
+    /**
+     * @return the justify content attribute of the flex container.
+     * @see JustifyContent
+     */
+    @JustifyContent
+    int getJustifyContent();
+
+    /**
+     * Sets the given justify content attribute to the flex container.
+     *
+     * @param justifyContent the justify content value
+     * @see JustifyContent
+     */
+    void setJustifyContent(@JustifyContent int justifyContent);
+
+    /**
+     * @return the align content attribute of the flex container.
+     * @see AlignContent
+     */
+    @AlignContent
+    int getAlignContent();
+
+    /**
+     * Sets the given align content attribute to the flex container.
+     *
+     * @param alignContent the align content value
+     */
+    void setAlignContent(@AlignContent int alignContent);
+
+    /**
+     * @return the align items attribute of the flex container.
+     * @see AlignItems
+     */
+    @AlignItems
+    int getAlignItems();
+
+    /**
+     * Sets the given align items attribute to the flex container.
+     *
+     * @param alignItems the align items value
+     * @see AlignItems
+     */
+    void setAlignItems(@AlignItems int alignItems);
+
+    /**
+     * @return the flex lines composing this flex container. The overridden method should return a
+     * copy of the original list excluding a dummy flex line (flex line that doesn't have any flex
+     * items in it but used for the alignment along the cross axis) so that any changes of the
+     * returned list are not reflected to the original list.
+     */
+    List<FlexLine> getFlexLines();
+
+    /**
+     * Returns true if the main axis is horizontal, false otherwise.
+     *
+     * @return true if the main axis is horizontal, false otherwise
+     */
+    boolean isMainAxisDirectionHorizontal();
+
+    /**
+     * Returns the length of decoration (such as dividers) of the flex item along the main axis.
+     *
+     * @param view            the view from which the length of the decoration is retrieved
+     * @param index           the absolute index of the flex item within the flex container
+     * @param indexInFlexLine the relative index of the flex item within the flex line
+     * @return the length of the decoration. Note that the length of the flex item itself is not
+     * included in the result.
+     */
+    int getDecorationLengthMainAxis(View view, int index, int indexInFlexLine);
+
+    /**
+     * Returns the length of decoration (such as dividers) of the flex item along the cross axis.
+     *
+     * @param view the view from which the length of the decoration is retrieved
+     * @return the length of the decoration. Note that the length of the flex item itself is not
+     * included in the result.
+     */
+    int getDecorationLengthCrossAxis(View view);
+
+    /**
+     * @return the top padding of the flex container.
+     */
+    int getPaddingTop();
+
+    /**
+     * @return the left padding of the flex container.
+     */
+    int getPaddingLeft();
+
+    /**
+     * @return the right padding of the flex container.
+     */
+    int getPaddingRight();
+
+    /**
+     * @return the bottom padding of the flex container.
+     */
+    int getPaddingBottom();
+
+    /**
+     * @return the start padding of this view depending on its resolved layout direction.
+     */
+    int getPaddingStart();
+
+    /**
+     * @return the end padding of this view depending on its resolved layout direction.
+     */
+    int getPaddingEnd();
+
+    /**
+     * Returns the child measure spec for its width.
+     *
+     * @param widthSpec      the measure spec for the width imposed by the parent
+     * @param padding        the padding along the width for the parent
+     * @param childDimension the value of the child dimension
+     */
+    int getChildWidthMeasureSpec(int widthSpec, int padding, int childDimension);
+
+    /**
+     * Returns the child measure spec for its height.
+     *
+     * @param heightSpec     the measure spec for the height imposed by the parent
+     * @param padding        the padding along the height for the parent
+     * @param childDimension the value of the child dimension
+     */
+    int getChildHeightMeasureSpec(int heightSpec, int padding, int childDimension);
+
+    /**
+     * @return the largest main size of all flex lines including decorator lengths.
+     */
+    int getLargestMainSize();
+
+    /**
+     * @return the sum of the cross sizes of all flex lines including decorator lengths.
+     */
+    int getSumOfCrossSize();
+
+    /**
+     * Callback when a new flex item is added to the current container
+     *
+     * @param view            the view as a flex item which is added
+     * @param index           the absolute index of the flex item added
+     * @param indexInFlexLine the relative index of the flex item added within the flex line
+     * @param flexLine        the flex line where the new flex item is added
+     */
+    void onNewFlexItemAdded(View view, int index, int indexInFlexLine, FlexLine flexLine);
+
+    /**
+     * Callback when a new flex line is added to the current container
+     *
+     * @param flexLine the new added flex line
+     */
+    void onNewFlexLineAdded(FlexLine flexLine);
+
+    /**
+     * Sets the list of the flex lines that compose the flex container to the one received as an
+     * argument.
+     *
+     * @param flexLines the list of flex lines
+     */
+    void setFlexLines(List<FlexLine> flexLines);
+
+    /**
+     * @return the current value of the maximum number of flex lines. If not set, {@link #NOT_SET}
+     * is returned.
+     */
+    int getMaxLine();
+
+    /**
+     *
+     * @param maxLine the int value, which specifies the maximum number of flex lines
+     */
+    void setMaxLine(int maxLine);
+
+    /**
+     * @return the list of the flex lines including dummy flex lines (flex line that doesn't have
+     * any flex items in it but used for the alignment along the cross axis), which aren't included
+     * in the {@link FlexContainer#getFlexLines()}.
+     */
+    List<FlexLine> getFlexLinesInternal();
+
+    /**
+     * Update the view cache in the flex container.
+     *
+     * @param position the position of the view to be updated
+     * @param view     the view instance
+     */
+    void updateViewCache(int position, View view);
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexDirection.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexDirection.java
new file mode 100755
index 0000000..a7b94d2
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexDirection.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/**
+ * The direction children items are placed inside the flex container, it determines the
+ * direction of the main axis (and the cross axis, perpendicular to the main axis).
+ */
+@IntDef({FlexDirection.ROW, FlexDirection.ROW_REVERSE, FlexDirection.COLUMN,
+        FlexDirection.COLUMN_REVERSE})
+@Retention(RetentionPolicy.SOURCE)
+public @interface FlexDirection {
+
+    /**
+     * Main axis direction -> horizontal. Main start to
+     * main end -> Left to right (in LTR languages).
+     * Cross start to cross end -> Top to bottom
+     */
+    int ROW = 0;
+
+    /**
+     * Main axis direction -> horizontal. Main start
+     * to main end -> Right to left (in LTR languages). Cross start to cross end ->
+     * Top to bottom.
+     */
+    int ROW_REVERSE = 1;
+
+    /**
+     * Main axis direction -> vertical. Main start
+     * to main end -> Top to bottom. Cross start to cross end ->
+     * Left to right (In LTR languages).
+     */
+    int COLUMN = 2;
+
+    /**
+     * Main axis direction -> vertical. Main start
+     * to main end -> Bottom to top. Cross start to cross end -> Left to right
+     * (In LTR languages)
+     */
+    int COLUMN_REVERSE = 3;
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexItem.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexItem.java
new file mode 100755
index 0000000..6258c9f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexItem.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.os.Parcelable;
+import android.view.View;
+
+/**
+ * An interface that has the common behavior as a flex item contained in a flex container.
+ * Known classes that implement this interface are {@link FlexboxLayout.LayoutParams} and
+ * {@link FlexboxLayoutManager.LayoutParams}.
+ */
+interface FlexItem extends Parcelable {
+
+    /** The default value for the order attribute */
+    int ORDER_DEFAULT = 1;
+
+    /** The default value for the flex grow attribute */
+    float FLEX_GROW_DEFAULT = 0f;
+
+    /** The default value for the flex shrink attribute */
+    float FLEX_SHRINK_DEFAULT = 1f;
+
+    /** The value representing the flex shrink attribute is not set  */
+    float FLEX_SHRINK_NOT_SET = 0f;
+
+    /** The default value for the flex basis percent attribute */
+    float FLEX_BASIS_PERCENT_DEFAULT = -1f;
+
+    /** The maximum size of the max width and max height attributes */
+    int MAX_SIZE = Integer.MAX_VALUE & View.MEASURED_SIZE_MASK;
+
+    /**
+     * @return the width attribute of the flex item.
+     *
+     * The attribute is about how wide the view wants to be. Can be one of the
+     * constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    int getWidth();
+
+    /**
+     * Sets the width attribute of the flex item.
+     *
+     * @param width the width attribute. Can be one of the
+     *              constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    void setWidth(int width);
+
+    /**
+     * @return the height attribute of the flex item.
+     *
+     * The attribute is about how wide the view wants to be. Can be one of the
+     * constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    int getHeight();
+
+    /**
+     * Sets the height attribute of the flex item.
+     *
+     * @param height the height attribute. Can be one of the
+     *               constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    void setHeight(int height);
+
+    /**
+     * @return the order attribute of the flex item.
+     *
+     * The attribute can change the ordering of the children views are laid out.
+     * By default, children are displayed and laid out in the same order as they appear in the
+     * layout XML. If not specified, {@link #ORDER_DEFAULT} is set as a default value.
+     */
+    int getOrder();
+
+    /**
+     * Sets the order attribute to the flex item
+     *
+     * @param order the order attribute
+     */
+    void setOrder(int order);
+
+    /**
+     * @return the flex grow attribute of the flex item
+     *
+     * The attribute determines how much this child will grow if positive free space is
+     * distributed relative to the rest of other flex items included in the same flex line.
+     * If not specified, {@link #FLEX_GROW_DEFAULT} is set as a default value.
+     */
+    float getFlexGrow();
+
+    /**
+     * Sets the flex grow attribute to the flex item
+     *
+     * @param flexGrow the flex grow attribute
+     */
+    void setFlexGrow(float flexGrow);
+
+    /**
+     * @return the flex shrink attribute of the flex item
+     *
+     * The attribute determines how much this child will shrink if negative free space is
+     * distributed relative to the rest of other flex items included in the same flex line.
+     * If not specified, {@link #FLEX_SHRINK_DEFAULT} is set as a default value.
+     */
+    float getFlexShrink();
+
+    /**
+     * Sets the flex shrink attribute to the flex item
+     *
+     * @param flexShrink the flex shrink attribute
+     */
+    void setFlexShrink(float flexShrink);
+
+    /**
+     * @return the align self attribute of the flex item
+     *
+     * The attribute determines the alignment along the cross axis (perpendicular to the
+     * main axis). The alignment in the same direction can be determined by the
+     * align items attribute in the parent, but if this is set to other than
+     * {@link AlignSelf#AUTO}, the cross axis alignment is overridden for this child.
+     * The value needs to be one of the values in ({@link AlignSelf#AUTO},
+     * {@link AlignItems#STRETCH}, {@link AlignItems#FLEX_START}, {@link
+     * AlignItems#FLEX_END}, {@link AlignItems#CENTER}, or {@link AlignItems#BASELINE}).
+     * If not specified, {@link AlignSelf#AUTO} is set as a default value.
+     */
+    @AlignSelf
+    int getAlignSelf();
+
+    /**
+     * Sets the align self attribute to the flex item
+     *
+     * @param alignSelf the order attribute
+     */
+    void setAlignSelf(@AlignSelf int alignSelf);
+
+    /**
+     * @return the minimum width attribute of the flex item
+     *
+     * The attribute determines the minimum width the child can shrink to.
+     */
+    int getMinWidth();
+
+    /**
+     * Sets the minimum width attribute to the flex item
+     *
+     * @param minWidth the order attribute
+     */
+    void setMinWidth(int minWidth);
+
+    /**
+     * @return the minimum height attribute of the flex item
+     *
+     * The attribute determines the minimum height the child can shrink to.
+     */
+    int getMinHeight();
+
+    /**
+     * Sets the minimum height attribute to the flex item
+     *
+     * @param minHeight the order attribute
+     */
+    void setMinHeight(int minHeight);
+
+    /**
+     * @return the maximum width attribute of the flex item
+     *
+     * The attribute determines the maximum width the child can expand to.
+     */
+    int getMaxWidth();
+
+    /**
+     * Sets the maximum width attribute to the flex item
+     *
+     * @param maxWidth the order attribute
+     */
+    void setMaxWidth(int maxWidth);
+
+    /**
+     * @return the maximum height attribute of the flex item
+     */
+    int getMaxHeight();
+
+    /**
+     * Sets the maximum height attribute to the flex item
+     *
+     * @param maxHeight the order attribute
+     */
+    void setMaxHeight(int maxHeight);
+
+    /**
+     * @return the wrapBefore attribute of the flex item
+     *
+     * The attribute forces a flex line wrapping. i.e. if this is set to {@code true} for a
+     * flex item, the item will become the first item of the new flex line. (A wrapping happens
+     * regardless of the flex items being processed in the the previous flex line)
+     * This attribute is ignored if the flex_wrap attribute is set as nowrap.
+     * The equivalent attribute isn't defined in the original CSS Flexible Box Module
+     * specification, but having this attribute is useful for Android developers to flatten
+     * the layouts when building a grid like layout or for a situation where developers want
+     * to put a new flex line to make a semantic difference from the previous one, etc.
+     */
+    boolean isWrapBefore();
+
+    /**
+     * Sets the wrapBefore attribute to the flex item
+     *
+     * @param wrapBefore the order attribute
+     */
+    void setWrapBefore(boolean wrapBefore);
+
+    /**
+     * @return the flexBasisPercent attribute of the flex item
+     *
+     * The attribute determines the initial flex item length in a fraction format relative to its
+     * parent.
+     * The initial main size of this child View is trying to be expanded as the specified
+     * fraction against the parent main size.
+     * If this value is set, the length specified from layout_width
+     * (or layout_height) is overridden by the calculated value from this attribute.
+     * This attribute is only effective when the parent's MeasureSpec mode is
+     * MeasureSpec.EXACTLY. The default value is -1, which means not set.
+     */
+    float getFlexBasisPercent();
+
+    /**
+     * Sets the flex basis percent attribute to the flex item
+     *
+     * @param flexBasisPercent the order attribute
+     */
+    void setFlexBasisPercent(float flexBasisPercent);
+
+    /**
+     * @return the left margin of the flex item.
+     */
+    int getMarginLeft();
+
+    /**
+     * @return the top margin of the flex item.
+     */
+    int getMarginTop();
+
+    /**
+     * @return the right margin of the flex item.
+     */
+    int getMarginRight();
+
+    /**
+     * @return the bottom margin of the flex item.
+     */
+    int getMarginBottom();
+
+    /**
+     * @return the start margin of the flex item depending on its resolved layout direction.
+     */
+    int getMarginStart();
+
+    /**
+     * @return the end margin of the flex item depending on its resolved layout direction.
+     */
+    int getMarginEnd();
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexLine.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexLine.java
new file mode 100755
index 0000000..efb8f39
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexLine.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.view.View;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Holds properties related to a single flex line. This class is not expected to be changed outside
+ * of the {@link FlexboxLayout}, thus only exposing the getter methods that may be useful for
+ * other classes using the {@link FlexboxLayout}.
+ */
+public class FlexLine {
+
+    FlexLine() {
+    }
+
+    int mLeft = Integer.MAX_VALUE;
+
+    int mTop = Integer.MAX_VALUE;
+
+    int mRight = Integer.MIN_VALUE;
+
+    int mBottom = Integer.MIN_VALUE;
+
+    /** @see #getMainSize() */
+    int mMainSize;
+
+    /**
+     * The sum of the lengths of dividers along the main axis. This value should be lower
+     * than the value of {@link #mMainSize}.
+     */
+    int mDividerLengthInMainSize;
+
+    /** @see #getCrossSize() */
+    int mCrossSize;
+
+    /** @see #getItemCount() */
+    int mItemCount;
+
+    /** Holds the count of the views whose visibilities are gone */
+    int mGoneItemCount;
+
+    /** @see #getTotalFlexGrow() */
+    float mTotalFlexGrow;
+
+    /** @see #getTotalFlexShrink() */
+    float mTotalFlexShrink;
+
+    /**
+     * The largest value of the individual child's baseline (obtained by View#getBaseline()
+     * if the {@link FlexContainer#getAlignItems()} value is not {@link AlignItems#BASELINE}
+     * or the flex direction is vertical, this value is not used.
+     * If the alignment direction is from the bottom to top,
+     * (e.g. flexWrap == WRAP_REVERSE and flexDirection == ROW)
+     * store this value from the distance from the bottom of the view minus baseline.
+     * (Calculated as view.getMeasuredHeight() - view.getBaseline - LayoutParams.bottomMargin)
+     */
+    int mMaxBaseline;
+
+    /**
+     * The sum of the cross size used before this flex line.
+     */
+    int mSumCrossSizeBefore;
+
+    /**
+     * Store the indices of the children views whose alignSelf property is stretch.
+     * The stored indices are the absolute indices including all children in the Flexbox,
+     * not the relative indices in this flex line.
+     */
+    List<Integer> mIndicesAlignSelfStretch = new ArrayList<>();
+
+    int mFirstIndex;
+
+    int mLastIndex;
+
+    /**
+     * Set to true if any {@link FlexItem}s in this line have {@link FlexItem#getFlexGrow()}
+     * attributes set (have the value other than {@link FlexItem#FLEX_GROW_DEFAULT})
+     */
+    boolean mAnyItemsHaveFlexGrow;
+
+    /**
+     * Set to true if any {@link FlexItem}s in this line have {@link FlexItem#getFlexShrink()}
+     * attributes set (have the value other than {@link FlexItem#FLEX_SHRINK_NOT_SET})
+     */
+    boolean mAnyItemsHaveFlexShrink;
+
+    /**
+     * @return the size of the flex line in pixels along the main axis of the flex container.
+     */
+    public int getMainSize() {
+        return mMainSize;
+    }
+
+    /**
+     * @return the size of the flex line in pixels along the cross axis of the flex container.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int getCrossSize() {
+        return mCrossSize;
+    }
+
+    /**
+     * @return the count of the views contained in this flex line.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int getItemCount() {
+        return mItemCount;
+    }
+
+    /**
+     * @return the count of the views whose visibilities are not gone in this flex line.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int getItemCountNotGone() {
+        return mItemCount - mGoneItemCount;
+    }
+
+    /**
+     * @return the sum of the flexGrow properties of the children included in this flex line
+     */
+    @SuppressWarnings("WeakerAccess")
+    public float getTotalFlexGrow() {
+        return mTotalFlexGrow;
+    }
+
+    /**
+     * @return the sum of the flexShrink properties of the children included in this flex line
+     */
+    @SuppressWarnings("WeakerAccess")
+    public float getTotalFlexShrink() {
+        return mTotalFlexShrink;
+    }
+
+    /**
+     * @return the first view's index included in this flex line.
+     */
+    public int getFirstIndex() {
+        return mFirstIndex;
+    }
+
+    /**
+     * Updates the position of the flex line from the contained view.
+     *
+     * @param view             the view contained in this flex line
+     * @param leftDecoration   the length of the decoration on the left of the view
+     * @param topDecoration    the length of the decoration on the top of the view
+     * @param rightDecoration  the length of the decoration on the right of the view
+     * @param bottomDecoration the length of the decoration on the bottom of the view
+     */
+    void updatePositionFromView(View view, int leftDecoration, int topDecoration,
+            int rightDecoration, int bottomDecoration) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        mLeft = Math.min(mLeft, view.getLeft() - flexItem.getMarginLeft() - leftDecoration);
+        mTop = Math.min(mTop, view.getTop() - flexItem.getMarginTop() - topDecoration);
+        mRight = Math.max(mRight, view.getRight() + flexItem.getMarginRight() + rightDecoration);
+        mBottom = Math
+                .max(mBottom, view.getBottom() + flexItem.getMarginBottom() + bottomDecoration);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexWrap.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexWrap.java
new file mode 100755
index 0000000..6604f33
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexWrap.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/**
+ * This attribute controls whether the flex container is single-line or multi-line, and the
+ * direction of the cross axis.
+ */
+@IntDef({FlexWrap.NOWRAP, FlexWrap.WRAP, FlexWrap.WRAP_REVERSE})
+@Retention(RetentionPolicy.SOURCE)
+public @interface FlexWrap {
+
+    /** The flex container is single-line. */
+    int NOWRAP = 0;
+
+    /** The flex container is multi-line. */
+    int WRAP = 1;
+
+    /**
+     * The flex container is multi-line. The direction of the
+     * cross axis is opposed to the direction as the {@link #WRAP}
+     */
+    int WRAP_REVERSE = 2;
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java
new file mode 100755
index 0000000..e271d8f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java
@@ -0,0 +1,2065 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import static com.google.android.flexbox.FlexContainer.NOT_SET;
+import static com.google.android.flexbox.FlexItem.FLEX_BASIS_PERCENT_DEFAULT;
+import static com.google.android.flexbox.FlexItem.FLEX_GROW_DEFAULT;
+import static com.google.android.flexbox.FlexItem.FLEX_SHRINK_NOT_SET;
+
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
+
+import android.graphics.drawable.Drawable;
+import android.util.SparseIntArray;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.view.MarginLayoutParamsCompat;
+import androidx.core.widget.CompoundButtonCompat;
+
+/**
+ * Offers various calculations for Flexbox to use the common logic between the classes such as
+ * {@link FlexboxLayout} and {@link FlexboxLayoutManager}.
+ */
+class FlexboxHelper {
+
+    private static final int INITIAL_CAPACITY = 10;
+
+    private static final long MEASURE_SPEC_WIDTH_MASK = 0xffffffffL;
+
+    private final FlexContainer mFlexContainer;
+
+    /**
+     * Holds the 'frozen' state of children during measure. If a view is frozen it will no longer
+     * expand or shrink regardless of flex grow/flex shrink attributes.
+     */
+    private boolean[] mChildrenFrozen;
+
+    /**
+     * Map the view index to the flex line which contains the view represented by the index to
+     * look for a flex line from a given view index in a constant time.
+     * Key: index of the view
+     * Value: index of the flex line that contains the given view
+     *
+     * E.g. if we have following flex lines,
+     * <p>
+     * FlexLine(0): itemCount 3
+     * FlexLine(1): itemCount 2
+     * </p>
+     * this instance should have following entries
+     * <p>
+     * [0, 0, 0, 1, 1, ...]
+     * </p>
+     */
+    @Nullable
+    int[] mIndexToFlexLine;
+
+    /**
+     * Cache the measured spec. The first 32 bit represents the height measure spec, the last
+     * 32 bit represents the width measure spec of each flex item.
+     * E.g. an entry is created like {@code (long) heightMeasureSpec << 32 | widthMeasureSpec}
+     *
+     * To retrieve a widthMeasureSpec, call {@link #extractLowerInt(long)} or
+     * {@link #extractHigherInt(long)} for a heightMeasureSpec.
+     */
+    @Nullable
+    long[] mMeasureSpecCache;
+
+    /**
+     * Cache a flex item's measured width and height. The first 32 bit represents the height, the
+     * last 32 bit represents the width of each flex item.
+     * E.g. an entry is created like the following code.
+     * {@code (long) view.getMeasuredHeight() << 32 | view.getMeasuredWidth()}
+     *
+     * To retrieve a width value, call {@link #extractLowerInt(long)} or
+     * {@link #extractHigherInt(long)} for a height value.
+     */
+    @Nullable
+    private long[] mMeasuredSizeCache;
+
+    FlexboxHelper(FlexContainer flexContainer) {
+        mFlexContainer = flexContainer;
+    }
+
+    /**
+     * Create an array, which indicates the reordered indices that
+     * {@link FlexItem#getOrder()} attributes are taken into account.
+     * This method takes a View before that is added as the parent ViewGroup's children.
+     *
+     * @param viewBeforeAdded          the View instance before added to the array of children
+     *                                 Views of the parent ViewGroup
+     * @param indexForViewBeforeAdded  the index for the View before added to the array of the
+     *                                 parent ViewGroup
+     * @param paramsForViewBeforeAdded the layout parameters for the View before added to the array
+     *                                 of the parent ViewGroup
+     * @return an array which have the reordered indices
+     */
+    int[] createReorderedIndices(View viewBeforeAdded, int indexForViewBeforeAdded,
+            ViewGroup.LayoutParams paramsForViewBeforeAdded, SparseIntArray orderCache) {
+        int childCount = mFlexContainer.getFlexItemCount();
+        List<Order> orders = createOrders(childCount);
+        Order orderForViewToBeAdded = new Order();
+        if (viewBeforeAdded != null
+                && paramsForViewBeforeAdded instanceof FlexItem) {
+            orderForViewToBeAdded.order = ((FlexItem)
+                    paramsForViewBeforeAdded).getOrder();
+        } else {
+            orderForViewToBeAdded.order = FlexItem.ORDER_DEFAULT;
+        }
+
+        if (indexForViewBeforeAdded == -1 || indexForViewBeforeAdded == childCount) {
+            orderForViewToBeAdded.index = childCount;
+        } else if (indexForViewBeforeAdded < mFlexContainer.getFlexItemCount()) {
+            orderForViewToBeAdded.index = indexForViewBeforeAdded;
+            for (int i = indexForViewBeforeAdded; i < childCount; i++) {
+                orders.get(i).index++;
+            }
+        } else {
+            // This path is not expected since OutOfBoundException will be thrown in the ViewGroup
+            // But setting the index for fail-safe
+            orderForViewToBeAdded.index = childCount;
+        }
+        orders.add(orderForViewToBeAdded);
+
+        return sortOrdersIntoReorderedIndices(childCount + 1, orders, orderCache);
+    }
+
+    /**
+     * Create an array, which indicates the reordered indices that
+     * {@link FlexItem#getOrder()} attributes are taken into account.
+     *
+     * @return @return an array which have the reordered indices
+     */
+    int[] createReorderedIndices(SparseIntArray orderCache) {
+        int childCount = mFlexContainer.getFlexItemCount();
+        List<Order> orders = createOrders(childCount);
+        return sortOrdersIntoReorderedIndices(childCount, orders, orderCache);
+    }
+
+    @NonNull
+    private List<Order> createOrders(int childCount) {
+        List<Order> orders = new ArrayList<>(childCount);
+        for (int i = 0; i < childCount; i++) {
+            View child = mFlexContainer.getFlexItemAt(i);
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+            Order order = new Order();
+            order.order = flexItem.getOrder();
+            order.index = i;
+            orders.add(order);
+        }
+        return orders;
+    }
+
+    /**
+     * Returns if any of the children's {@link FlexItem#getOrder()} attributes are
+     * changed from the last measurement.
+     *
+     * @return {@code true} if changed from the last measurement, {@code false} otherwise.
+     */
+    boolean isOrderChangedFromLastMeasurement(SparseIntArray orderCache) {
+        int childCount = mFlexContainer.getFlexItemCount();
+        if (orderCache.size() != childCount) {
+            return true;
+        }
+        for (int i = 0; i < childCount; i++) {
+            View view = mFlexContainer.getFlexItemAt(i);
+            if (view == null) {
+                continue;
+            }
+            FlexItem flexItem = (FlexItem) view.getLayoutParams();
+            if (flexItem.getOrder() != orderCache.get(i)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private int[] sortOrdersIntoReorderedIndices(int childCount, List<Order> orders,
+            SparseIntArray orderCache) {
+        Collections.sort(orders);
+        orderCache.clear();
+        int[] reorderedIndices = new int[childCount];
+        int i = 0;
+        for (Order order : orders) {
+            reorderedIndices[i] = order.index;
+            orderCache.append(order.index, order.order);
+            i++;
+        }
+        return reorderedIndices;
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method should calculate all the flex lines from the existing flex items.
+     *
+     * @see #calculateFlexLines(FlexLinesResult, int, int, int, int, int, List)
+     */
+    void calculateHorizontalFlexLines(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec) {
+        calculateFlexLines(result, widthMeasureSpec, heightMeasureSpec, Integer.MAX_VALUE,
+                0, NO_POSITION, null);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * Stop calculating it if the calculated amount along the cross size reaches the argument
+     * as the needsCalcAmount.
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param fromIndex         the index of the child from which the calculation starts
+     * @param existingLines     If not null, calculated flex lines will be added to this instance
+     */
+    void calculateHorizontalFlexLines(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int fromIndex,
+            @Nullable List<FlexLine> existingLines) {
+        calculateFlexLines(result, widthMeasureSpec, heightMeasureSpec, needsCalcAmount,
+                fromIndex, NO_POSITION, existingLines);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method calculates the amount of pixels as the {@code needsCalcAmount} in addition to
+     * the
+     * flex lines which includes the view who has the index as the {@code toIndex} argument.
+     * (First calculate to the toIndex, then calculate the amount of pixels as needsCalcAmount)
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param toIndex           the index of the child to which the calculation ends (until the
+     *                          flex line which include the which who has that index). If this
+     *                          and needsCalcAmount are both set, first flex lines are calculated
+     *                          to the index, calculate the amount of pixels as the needsCalcAmount
+     *                          argument in addition to that
+     */
+    void calculateHorizontalFlexLinesToIndex(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int toIndex, List<FlexLine> existingLines) {
+        calculateFlexLines(result, widthMeasureSpec, heightMeasureSpec, needsCalcAmount,
+                0, toIndex, existingLines);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method should calculate all the flex lines from the existing flex items.
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @see #calculateFlexLines(FlexLinesResult, int, int, int, int, int, List)
+     */
+    void calculateVerticalFlexLines(FlexLinesResult result, int widthMeasureSpec, int heightMeasureSpec) {
+        calculateFlexLines(result, heightMeasureSpec, widthMeasureSpec, Integer.MAX_VALUE,
+                0, NO_POSITION, null);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * Stop calculating it if the calculated amount along the cross size reaches the argument
+     * as the needsCalcAmount.
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param fromIndex         the index of the child from which the calculation starts
+     * @param existingLines     If not null, calculated flex lines will be added to this instance
+     */
+    void calculateVerticalFlexLines(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int fromIndex,
+            @Nullable List<FlexLine> existingLines) {
+        calculateFlexLines(result, heightMeasureSpec, widthMeasureSpec, needsCalcAmount,
+                fromIndex, NO_POSITION, existingLines);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method calculates the amount of pixels as the {@code needsCalcAmount} in addition to
+     * the
+     * flex lines which includes the view who has the index as the {@code toIndex} argument.
+     * (First calculate to the toIndex, then calculate the amount of pixels as needsCalcAmount)
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param toIndex           the index of the child to which the calculation ends (until the
+     *                          flex line which include the which who has that index). If this
+     *                          and needsCalcAmount are both set, first flex lines are calculated
+     *                          to the index, calculate the amount of pixels as the needsCalcAmount
+     *                          argument in addition to that
+     */
+    void calculateVerticalFlexLinesToIndex(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int toIndex, List<FlexLine> existingLines) {
+        calculateFlexLines(result, heightMeasureSpec, widthMeasureSpec, needsCalcAmount,
+                0, toIndex, existingLines);
+    }
+
+
+    /**
+     * Calculates how many flex lines are needed in the flex container layout by measuring each
+     * child.
+     * Expanding or shrinking the flex items depending on the flex grow and flex shrink
+     * attributes are done in a later procedure, so the views' measured width and measured
+     * height may be changed in a later process.
+     *
+     * @param result           an instance of {@link FlexLinesResult} that is going to contain a
+     *                         list of flex lines and the child state used by
+     *                         {@link View#setMeasuredDimension(int, int)}.
+     * @param mainMeasureSpec  the main axis measure spec imposed by the flex container,
+     *                         width for horizontal direction, height otherwise
+     * @param crossMeasureSpec the cross axis measure spec imposed by the flex container,
+     *                         height for horizontal direction, width otherwise
+     * @param needsCalcAmount  the amount of pixels where flex line calculation should be stopped
+     *                         this is needed to avoid the expensive calculation if the
+     *                         calculation is needed only the small part of the entire flex
+     *                         container. (E.g. If the flex container is the
+     *                         {@link FlexboxLayoutManager}, the calculation only needs the
+     *                         visible area, imposing the entire calculation may cause bad
+     *                         performance
+     * @param fromIndex        the index of the child from which the calculation starts
+     * @param toIndex          the index of the child to which the calculation ends (until the
+     *                         flex line which include the which who has that index). If this
+     *                         and needsCalcAmount are both set, first flex lines are calculated
+     *                         to the index, calculate the amount of pixels as the needsCalcAmount
+     *                         argument in addition to that
+     * @param existingLines    If not null, calculated flex lines will be added to this instance
+     */
+    void calculateFlexLines(FlexLinesResult result, int mainMeasureSpec,
+            int crossMeasureSpec, int needsCalcAmount, int fromIndex, int toIndex,
+            @Nullable List<FlexLine> existingLines) {
+
+        boolean isMainHorizontal = mFlexContainer.isMainAxisDirectionHorizontal();
+
+        int mainMode = View.MeasureSpec.getMode(mainMeasureSpec);
+        int mainSize = View.MeasureSpec.getSize(mainMeasureSpec);
+
+        int childState = 0;
+
+        List<FlexLine> flexLines;
+        if (existingLines == null) {
+            flexLines = new ArrayList<>();
+        } else {
+            flexLines = existingLines;
+        }
+
+        result.mFlexLines = flexLines;
+
+        boolean reachedToIndex = toIndex == NO_POSITION;
+
+        int mainPaddingStart = getPaddingStartMain(isMainHorizontal);
+        int mainPaddingEnd = getPaddingEndMain(isMainHorizontal);
+        int crossPaddingStart = getPaddingStartCross(isMainHorizontal);
+        int crossPaddingEnd = getPaddingEndCross(isMainHorizontal);
+
+        int largestSizeInCross = Integer.MIN_VALUE;
+
+        // The amount of cross size calculated in this method call.
+        int sumCrossSize = 0;
+
+        // The index of the view in the flex line.
+        int indexInFlexLine = 0;
+
+        FlexLine flexLine = new FlexLine();
+        flexLine.mFirstIndex = fromIndex;
+        flexLine.mMainSize = mainPaddingStart + mainPaddingEnd;
+
+        int childCount = mFlexContainer.getFlexItemCount();
+        for (int i = fromIndex; i < childCount; i++) {
+            View child = mFlexContainer.getReorderedFlexItemAt(i);
+
+            if (child == null) {
+                if (isLastFlexItem(i, childCount, flexLine)) {
+                    addFlexLine(flexLines, flexLine, i, sumCrossSize);
+                }
+                continue;
+            } else if (child.getVisibility() == View.GONE) {
+                flexLine.mGoneItemCount++;
+                flexLine.mItemCount++;
+                if (isLastFlexItem(i, childCount, flexLine)) {
+                    addFlexLine(flexLines, flexLine, i, sumCrossSize);
+                }
+                continue;
+            } else if (child instanceof CompoundButton) {
+                evaluateMinimumSizeForCompoundButton((CompoundButton) child);
+            }
+
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+
+            if (flexItem.getAlignSelf() == AlignItems.STRETCH) {
+                flexLine.mIndicesAlignSelfStretch.add(i);
+            }
+
+            int childMainSize = getFlexItemSizeMain(flexItem, isMainHorizontal);
+
+            if (flexItem.getFlexBasisPercent() != FLEX_BASIS_PERCENT_DEFAULT
+                    && mainMode == View.MeasureSpec.EXACTLY) {
+                childMainSize = Math.round(mainSize * flexItem.getFlexBasisPercent());
+                // Use the dimension from the layout if the mainMode is not
+                // MeasureSpec.EXACTLY even if any fraction value is set to
+                // layout_flexBasisPercent.
+            }
+
+            int childMainMeasureSpec;
+            int childCrossMeasureSpec;
+            if (isMainHorizontal) {
+                childMainMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(mainMeasureSpec,
+                        mainPaddingStart + mainPaddingEnd +
+                                getFlexItemMarginStartMain(flexItem, true) +
+                                getFlexItemMarginEndMain(flexItem, true),
+                        childMainSize);
+                childCrossMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(crossMeasureSpec,
+                        crossPaddingStart + crossPaddingEnd +
+                                getFlexItemMarginStartCross(flexItem, true) +
+                                getFlexItemMarginEndCross(flexItem, true)
+                                + sumCrossSize,
+                        getFlexItemSizeCross(flexItem, true));
+                child.measure(childMainMeasureSpec, childCrossMeasureSpec);
+                updateMeasureCache(i, childMainMeasureSpec, childCrossMeasureSpec, child);
+            } else {
+                childCrossMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(crossMeasureSpec,
+                        crossPaddingStart + crossPaddingEnd +
+                                getFlexItemMarginStartCross(flexItem, false) +
+                                getFlexItemMarginEndCross(flexItem, false) + sumCrossSize,
+                        getFlexItemSizeCross(flexItem, false));
+                childMainMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(mainMeasureSpec,
+                        mainPaddingStart + mainPaddingEnd +
+                                getFlexItemMarginStartMain(flexItem, false) +
+                                getFlexItemMarginEndMain(flexItem, false),
+                        childMainSize);
+                child.measure(childCrossMeasureSpec, childMainMeasureSpec);
+                updateMeasureCache(i, childCrossMeasureSpec, childMainMeasureSpec, child);
+            }
+            mFlexContainer.updateViewCache(i, child);
+
+            // Check the size constraint after the first measurement for the child
+            // To prevent the child's width/height violate the size constraints imposed by the
+            // {@link FlexItem#getMinWidth()}, {@link FlexItem#getMinHeight()},
+            // {@link FlexItem#getMaxWidth()} and {@link FlexItem#getMaxHeight()} attributes.
+            // E.g. When the child's layout_width is wrap_content the measured width may be
+            // less than the min width after the first measurement.
+            checkSizeConstraints(child, i);
+
+            childState = View.combineMeasuredStates(
+                    childState, child.getMeasuredState());
+
+            if (isWrapRequired(child, mainMode, mainSize, flexLine.mMainSize,
+                    getViewMeasuredSizeMain(child, isMainHorizontal)
+                            + getFlexItemMarginStartMain(flexItem, isMainHorizontal) +
+                            getFlexItemMarginEndMain(flexItem, isMainHorizontal),
+                    flexItem, i, indexInFlexLine, flexLines.size())) {
+                if (flexLine.getItemCountNotGone() > 0) {
+                    addFlexLine(flexLines, flexLine, i > 0 ? i - 1 : 0, sumCrossSize);
+                    sumCrossSize += flexLine.mCrossSize;
+                }
+
+                if (isMainHorizontal) {
+                    if (flexItem.getHeight() == ViewGroup.LayoutParams.MATCH_PARENT) {
+                        // This case takes care of the corner case where the cross size of the
+                        // child is affected by the just added flex line.
+                        // E.g. when the child's layout_height is set to match_parent, the height
+                        // of that child needs to be determined taking the total cross size used
+                        // so far into account. In that case, the height of the child needs to be
+                        // measured again note that we don't need to judge if the wrapping occurs
+                        // because it doesn't change the size along the main axis.
+                        childCrossMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(
+                                crossMeasureSpec,
+                                mFlexContainer.getPaddingTop() + mFlexContainer.getPaddingBottom()
+                                        + flexItem.getMarginTop()
+                                        + flexItem.getMarginBottom() + sumCrossSize,
+                                flexItem.getHeight());
+                        child.measure(childMainMeasureSpec, childCrossMeasureSpec);
+                        checkSizeConstraints(child, i);
+                    }
+                } else {
+                    if (flexItem.getWidth() == ViewGroup.LayoutParams.MATCH_PARENT) {
+                        // This case takes care of the corner case where the cross size of the
+                        // child is affected by the just added flex line.
+                        // E.g. when the child's layout_width is set to match_parent, the width
+                        // of that child needs to be determined taking the total cross size used
+                        // so far into account. In that case, the width of the child needs to be
+                        // measured again note that we don't need to judge if the wrapping occurs
+                        // because it doesn't change the size along the main axis.
+                        childCrossMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(
+                                crossMeasureSpec,
+                                mFlexContainer.getPaddingLeft() + mFlexContainer.getPaddingRight()
+                                        + flexItem.getMarginLeft()
+                                        + flexItem.getMarginRight() + sumCrossSize,
+                                flexItem.getWidth());
+                        child.measure(childCrossMeasureSpec, childMainMeasureSpec);
+                        checkSizeConstraints(child, i);
+                    }
+                }
+
+                flexLine = new FlexLine();
+                flexLine.mItemCount = 1;
+                flexLine.mMainSize = mainPaddingStart + mainPaddingEnd;
+                flexLine.mFirstIndex = i;
+                indexInFlexLine = 0;
+                largestSizeInCross = Integer.MIN_VALUE;
+            } else {
+                flexLine.mItemCount++;
+                indexInFlexLine++;
+            }
+            flexLine.mAnyItemsHaveFlexGrow |= flexItem.getFlexGrow() != FLEX_GROW_DEFAULT;
+            flexLine.mAnyItemsHaveFlexShrink |= flexItem.getFlexShrink() != FLEX_SHRINK_NOT_SET;
+
+            if (mIndexToFlexLine != null) {
+                mIndexToFlexLine[i] = flexLines.size();
+            }
+            flexLine.mMainSize += getViewMeasuredSizeMain(child, isMainHorizontal)
+                    + getFlexItemMarginStartMain(flexItem, isMainHorizontal) +
+                    getFlexItemMarginEndMain(flexItem, isMainHorizontal);
+            flexLine.mTotalFlexGrow += flexItem.getFlexGrow();
+            flexLine.mTotalFlexShrink += flexItem.getFlexShrink();
+
+            mFlexContainer.onNewFlexItemAdded(child, i, indexInFlexLine, flexLine);
+
+            largestSizeInCross = Math.max(largestSizeInCross,
+                    getViewMeasuredSizeCross(child, isMainHorizontal) +
+                            getFlexItemMarginStartCross(flexItem, isMainHorizontal) +
+                            getFlexItemMarginEndCross(flexItem, isMainHorizontal) +
+                            mFlexContainer.getDecorationLengthCrossAxis(child));
+            // Temporarily set the cross axis length as the largest child in the flexLine
+            // Expand along the cross axis depending on the mAlignContent property if needed
+            // later
+            flexLine.mCrossSize = Math.max(flexLine.mCrossSize, largestSizeInCross);
+
+            if (isMainHorizontal) {
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    flexLine.mMaxBaseline = Math.max(flexLine.mMaxBaseline,
+                            child.getBaseline() + flexItem.getMarginTop());
+                } else {
+                    // if the flex wrap property is WRAP_REVERSE, calculate the
+                    // baseline as the distance from the cross end and the baseline
+                    // since the cross size calculation is based on the distance from the cross end
+                    flexLine.mMaxBaseline = Math.max(flexLine.mMaxBaseline,
+                            child.getMeasuredHeight() - child.getBaseline()
+                                    + flexItem.getMarginBottom());
+                }
+            }
+
+            if (isLastFlexItem(i, childCount, flexLine)) {
+                addFlexLine(flexLines, flexLine, i, sumCrossSize);
+                sumCrossSize += flexLine.mCrossSize;
+            }
+
+            if (toIndex != NO_POSITION
+                    && flexLines.size() > 0
+                    && flexLines.get(flexLines.size() - 1).mLastIndex >= toIndex
+                    && i >= toIndex
+                    && !reachedToIndex) {
+                // Calculated to include a flex line which includes the flex item having the
+                // toIndex.
+                // Let the sumCrossSize start from the negative value of the last flex line's
+                // cross size because otherwise flex lines aren't calculated enough to fill the
+                // visible area.
+                sumCrossSize = -flexLine.getCrossSize();
+                reachedToIndex = true;
+            }
+            if (sumCrossSize > needsCalcAmount && reachedToIndex) {
+                // Stop the calculation if the sum of cross size calculated reached to the point
+                // beyond the needsCalcAmount value to avoid unneeded calculation in a
+                // RecyclerView.
+                // To be precise, the decoration length may be added to the sumCrossSize,
+                // but we omit adding the decoration length because even without the decorator
+                // length, it's guaranteed that calculation is done at least beyond the
+                // needsCalcAmount
+                break;
+            }
+        }
+
+        result.mChildState = childState;
+    }
+
+    /**
+     * Compound buttons (ex. {{@link android.widget.CheckBox}}, {@link android.widget.ToggleButton})
+     * have a button drawable with minimum height and width specified for them.
+     * To align the behavior with CSS Flexbox we want to respect these minimum measurement to avoid
+     * these drawables from being cut off during calculation. When the compound button has a minimum
+     * width or height already specified we will not make any change since we assume those were
+     * voluntarily set by the user.
+     *
+     * @param compoundButton the compound button that need to be evaluated
+     */
+    private void evaluateMinimumSizeForCompoundButton(CompoundButton compoundButton) {
+        FlexItem flexItem = (FlexItem) compoundButton.getLayoutParams();
+        int minWidth = flexItem.getMinWidth();
+        int minHeight = flexItem.getMinHeight();
+
+        Drawable drawable = CompoundButtonCompat.getButtonDrawable(compoundButton);
+        int drawableMinWidth = drawable == null ? 0 : drawable.getMinimumWidth();
+        int drawableMinHeight = drawable == null ? 0 : drawable.getMinimumHeight();
+        flexItem.setMinWidth(minWidth == NOT_SET ? drawableMinWidth : minWidth);
+        flexItem.setMinHeight(minHeight == NOT_SET ? drawableMinHeight : minHeight);
+    }
+
+    /**
+     * Returns the container's start padding in the main axis. Either start or top.
+     *
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the start padding in the main axis
+     */
+    private int getPaddingStartMain(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingStart();
+        }
+
+        return mFlexContainer.getPaddingTop();
+    }
+
+    /**
+     * Returns the container's end padding in the main axis. Either end or bottom.
+     *
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the end padding in the main axis
+     */
+    private int getPaddingEndMain(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingEnd();
+        }
+
+        return mFlexContainer.getPaddingBottom();
+    }
+
+    /**
+     * Returns the container's start padding in the cross axis. Either start or top.
+     *
+     * @param isMainHorizontal is the main axis horizontal.
+     * @return the start padding in the cross axis
+     */
+    private int getPaddingStartCross(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingTop();
+        }
+
+        return mFlexContainer.getPaddingStart();
+    }
+
+    /**
+     * Returns the container's end padding in the cross axis. Either end or bottom.
+     *
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the end padding in the cross axis
+     */
+    private int getPaddingEndCross(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingBottom();
+        }
+
+        return mFlexContainer.getPaddingEnd();
+    }
+
+    /**
+     * Returns the view's measured size in the main axis. Either width or height.
+     *
+     * @param view             the view
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the view's measured size in the main axis
+     */
+    private int getViewMeasuredSizeMain(View view, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return view.getMeasuredWidth();
+        }
+
+        return view.getMeasuredHeight();
+    }
+
+    /**
+     * Returns the view's measured size in the cross axis. Either width or height.
+     *
+     * @param view             the view
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the view's measured size in the cross axis
+     */
+    private int getViewMeasuredSizeCross(View view, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return view.getMeasuredHeight();
+        }
+
+        return view.getMeasuredWidth();
+    }
+
+    /**
+     * Returns the flexItem's size in the main axis. Either width or height.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's size in the main axis
+     */
+    private int getFlexItemSizeMain(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getWidth();
+        }
+
+        return flexItem.getHeight();
+    }
+
+    /**
+     * Returns the flexItem's size in the cross axis. Either width or height.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's size in the cross axis
+     */
+    private int getFlexItemSizeCross(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getHeight();
+        }
+
+        return flexItem.getWidth();
+    }
+
+    /**
+     * Returns the flexItem's start margin in the main axis. Either start or top.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginLeft} (ViewGroup.MarginLayoutParams#getMarginStart isn't available
+     * in API level < 17). Thus this method needs to be used with {@link #getFlexItemMarginEndMain}
+     * not to misuse the margin in RTL.
+     *
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's start margin in the main axis
+     */
+    private int getFlexItemMarginStartMain(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginLeft();
+        }
+
+        return flexItem.getMarginTop();
+    }
+
+    /**
+     * Returns the flexItem's end margin in the main axis. Either end or bottom.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginRight} (ViewGroup.MarginLayoutParams#getMarginEnd isn't available
+     * in API level < 17). Thus this method needs to be used with
+     * {@link #getFlexItemMarginStartMain} not to misuse the margin in RTL.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's end margin in the main axis
+     */
+    private int getFlexItemMarginEndMain(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginRight();
+        }
+
+        return flexItem.getMarginBottom();
+    }
+
+    /**
+     * Returns the flexItem's start margin in the cross axis. Either start or top.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginLeft} (ViewGroup.MarginLayoutParams#getMarginStart isn't available
+     * in API level < 17). Thus this method needs to be used with
+     * {@link #getFlexItemMarginEndCross} to not to misuse the margin in RTL.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's start margin in the cross axis
+     */
+    private int getFlexItemMarginStartCross(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginTop();
+        }
+
+        return flexItem.getMarginLeft();
+    }
+
+    /**
+     * Returns the flexItem's end margin in the cross axis. Either end or bottom.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginRight} (ViewGroup.MarginLayoutParams#getMarginEnd isn't available
+     * in API level < 17). Thus this method needs to be used with
+     * {@link #getFlexItemMarginStartCross} to not to misuse the margin in RTL.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's end margin in the cross axis
+     */
+    private int getFlexItemMarginEndCross(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginBottom();
+        }
+
+        return flexItem.getMarginRight();
+    }
+
+    /**
+     * Determine if a wrap is required (add a new flex line).
+     *
+     * @param view          the view being judged if the wrap required
+     * @param mode          the width or height mode along the main axis direction
+     * @param maxSize       the max size along the main axis direction
+     * @param currentLength the accumulated current length
+     * @param childLength   the length of a child view which is to be collected to the flex line
+     * @param flexItem      the LayoutParams for the view being determined whether a new flex line
+     *                      is needed
+     * @param index         the index of the view being added within the entire flex container
+     * @param indexInFlexLine the index of the view being added within the current flex line
+     * @param flexLinesSize the number of the existing flexlines size
+     * @return {@code true} if a wrap is required, {@code false} otherwise
+     * @see FlexContainer#getFlexWrap()
+     * @see FlexContainer#setFlexWrap(int)
+     */
+    private boolean isWrapRequired(View view, int mode, int maxSize, int currentLength,
+            int childLength, FlexItem flexItem, int index, int indexInFlexLine, int flexLinesSize) {
+        if (mFlexContainer.getFlexWrap() == FlexWrap.NOWRAP) {
+            return false;
+        }
+        if (flexItem.isWrapBefore()) {
+            return true;
+        }
+        if (mode == View.MeasureSpec.UNSPECIFIED) {
+            return false;
+        }
+        int maxLine = mFlexContainer.getMaxLine();
+        // Judge the condition by adding 1 to the current flexLinesSize because the flex line
+        // being computed isn't added to the flexLinesSize.
+        if (maxLine != NOT_SET && maxLine <= flexLinesSize + 1) {
+            return false;
+        }
+        int decorationLength =
+                mFlexContainer.getDecorationLengthMainAxis(view, index, indexInFlexLine);
+        if (decorationLength > 0) {
+            childLength += decorationLength;
+        }
+        return maxSize < currentLength + childLength;
+    }
+
+    private boolean isLastFlexItem(int childIndex, int childCount,
+            FlexLine flexLine) {
+        return childIndex == childCount - 1 && flexLine.getItemCountNotGone() != 0;
+    }
+
+    private void addFlexLine(List<FlexLine> flexLines, FlexLine flexLine, int viewIndex,
+            int usedCrossSizeSoFar) {
+        flexLine.mSumCrossSizeBefore = usedCrossSizeSoFar;
+        mFlexContainer.onNewFlexLineAdded(flexLine);
+        flexLine.mLastIndex = viewIndex;
+        flexLines.add(flexLine);
+    }
+
+    /**
+     * Checks if the view's width/height don't violate the minimum/maximum size constraints imposed
+     * by the {@link FlexItem#getMinWidth()}, {@link FlexItem#getMinHeight()},
+     * {@link FlexItem#getMaxWidth()} and {@link FlexItem#getMaxHeight()} attributes.
+     *
+     * @param view  the view to be checked
+     * @param index index of the view
+     */
+    private void checkSizeConstraints(View view, int index) {
+        boolean needsMeasure = false;
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int childWidth = view.getMeasuredWidth();
+        int childHeight = view.getMeasuredHeight();
+
+        if (childWidth < flexItem.getMinWidth()) {
+            needsMeasure = true;
+            childWidth = flexItem.getMinWidth();
+        } else if (childWidth > flexItem.getMaxWidth()) {
+            needsMeasure = true;
+            childWidth = flexItem.getMaxWidth();
+        }
+
+        if (childHeight < flexItem.getMinHeight()) {
+            needsMeasure = true;
+            childHeight = flexItem.getMinHeight();
+        } else if (childHeight > flexItem.getMaxHeight()) {
+            needsMeasure = true;
+            childHeight = flexItem.getMaxHeight();
+        }
+        if (needsMeasure) {
+            int widthSpec = View.MeasureSpec.makeMeasureSpec(childWidth, View.MeasureSpec.EXACTLY);
+            int heightSpec = View.MeasureSpec
+                    .makeMeasureSpec(childHeight, View.MeasureSpec.EXACTLY);
+            view.measure(widthSpec, heightSpec);
+            updateMeasureCache(index, widthSpec, heightSpec, view);
+            mFlexContainer.updateViewCache(index, view);
+        }
+    }
+
+    /**
+     * @see #determineMainSize(int, int, int)
+     */
+    void determineMainSize(int widthMeasureSpec, int heightMeasureSpec) {
+        determineMainSize(widthMeasureSpec, heightMeasureSpec, 0);
+    }
+
+    /**
+     * Determine the main size by expanding (shrinking if negative remaining free space is given)
+     * an individual child in each flex line if any children's mFlexGrow (or mFlexShrink if
+     * remaining
+     * space is negative) properties are set to non-zero.
+     *
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexContainer#getFlexDirection()
+     */
+    void determineMainSize(int widthMeasureSpec, int heightMeasureSpec, int fromIndex) {
+        ensureChildrenFrozen(mFlexContainer.getFlexItemCount());
+        if (fromIndex >= mFlexContainer.getFlexItemCount()) {
+            return;
+        }
+        int mainSize;
+        int paddingAlongMainAxis;
+        int flexDirection = mFlexContainer.getFlexDirection();
+        switch (mFlexContainer.getFlexDirection()) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                int widthMode = View.MeasureSpec.getMode(widthMeasureSpec);
+                int widthSize = View.MeasureSpec.getSize(widthMeasureSpec);
+                int largestMainSize = mFlexContainer.getLargestMainSize();
+                if (widthMode == View.MeasureSpec.EXACTLY) {
+                    mainSize = widthSize;
+                } else {
+                    mainSize = Math.min(largestMainSize, widthSize);
+                }
+                paddingAlongMainAxis = mFlexContainer.getPaddingLeft()
+                        + mFlexContainer.getPaddingRight();
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                int heightMode = View.MeasureSpec.getMode(heightMeasureSpec);
+                int heightSize = View.MeasureSpec.getSize(heightMeasureSpec);
+                if (heightMode == View.MeasureSpec.EXACTLY) {
+                    mainSize = heightSize;
+                } else {
+                    mainSize = mFlexContainer.getLargestMainSize();
+                }
+                paddingAlongMainAxis = mFlexContainer.getPaddingTop()
+                        + mFlexContainer.getPaddingBottom();
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid flex direction: " + flexDirection);
+        }
+
+        int flexLineIndex = 0;
+        if (mIndexToFlexLine != null) {
+            flexLineIndex = mIndexToFlexLine[fromIndex];
+        }
+        List<FlexLine> flexLines = mFlexContainer.getFlexLinesInternal();
+        for (int i = flexLineIndex, size = flexLines.size(); i < size; i++) {
+            FlexLine flexLine = flexLines.get(i);
+            if (flexLine.mMainSize < mainSize && flexLine.mAnyItemsHaveFlexGrow) {
+                expandFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine,
+                        mainSize, paddingAlongMainAxis, false);
+            } else if (flexLine.mMainSize > mainSize && flexLine.mAnyItemsHaveFlexShrink) {
+                shrinkFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine,
+                        mainSize, paddingAlongMainAxis, false);
+            }
+        }
+    }
+
+    private void ensureChildrenFrozen(int size) {
+        if (mChildrenFrozen == null) {
+            mChildrenFrozen = new boolean[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mChildrenFrozen.length < size) {
+            int newCapacity = mChildrenFrozen.length * 2;
+            mChildrenFrozen = new boolean[Math.max(newCapacity, size)];
+        } else {
+            Arrays.fill(mChildrenFrozen, false);
+        }
+    }
+
+    /**
+     * Expand the flex items along the main axis based on the individual mFlexGrow attribute.
+     *
+     * @param widthMeasureSpec     the horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec    the vertical space requirements as imposed by the parent
+     * @param flexLine             the flex line to which flex items belong
+     * @param maxMainSize          the maximum main size. Expanded main size will be this size
+     * @param paddingAlongMainAxis the padding value along the main axis
+     * @param calledRecursively    true if this method is called recursively, false otherwise
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexItem#getFlexGrow()
+     */
+    private void expandFlexItems(int widthMeasureSpec, int heightMeasureSpec, FlexLine flexLine,
+            int maxMainSize, int paddingAlongMainAxis, boolean calledRecursively) {
+        if (flexLine.mTotalFlexGrow <= 0 || maxMainSize < flexLine.mMainSize) {
+            return;
+        }
+        int sizeBeforeExpand = flexLine.mMainSize;
+        boolean needsReexpand = false;
+        float unitSpace = (maxMainSize - flexLine.mMainSize) / flexLine.mTotalFlexGrow;
+        flexLine.mMainSize = paddingAlongMainAxis + flexLine.mDividerLengthInMainSize;
+
+        // Setting the cross size of the flex line as the temporal value since the cross size of
+        // each flex item may be changed from the initial calculation
+        // (in the measureHorizontal/measureVertical method) even this method is part of the main
+        // size determination.
+        // E.g. If a TextView's layout_width is set to 0dp, layout_height is set to wrap_content,
+        // and layout_flexGrow is set to 1, the TextView is trying to expand to the vertical
+        // direction to enclose its content (in the measureHorizontal method), but
+        // the width will be expanded in this method. In that case, the height needs to be measured
+        // again with the expanded width.
+        int largestCrossSize = 0;
+        if (!calledRecursively) {
+            flexLine.mCrossSize = Integer.MIN_VALUE;
+        }
+        float accumulatedRoundError = 0;
+        for (int i = 0; i < flexLine.mItemCount; i++) {
+            int index = flexLine.mFirstIndex + i;
+            View child = mFlexContainer.getReorderedFlexItemAt(index);
+            if (child == null || child.getVisibility() == View.GONE) {
+                continue;
+            }
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+            int flexDirection = mFlexContainer.getFlexDirection();
+            if (flexDirection == FlexDirection.ROW || flexDirection == FlexDirection.ROW_REVERSE) {
+                // The direction of the main axis is horizontal
+
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured width from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredWidth returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, the case happens
+                    // frequently
+                    childMeasuredWidth = extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured height from the cache
+                    childMeasuredHeight = extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexGrow() > 0f) {
+                    float rawCalculatedWidth = childMeasuredWidth
+                            + unitSpace * flexItem.getFlexGrow();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedWidth += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newWidth = Math.round(rawCalculatedWidth);
+                    if (newWidth > flexItem.getMaxWidth()) {
+                        // This means the child can't expand beyond the value of the mMaxWidth
+                        // attribute.
+                        // To adjust the flex line length to the size of maxMainSize, remaining
+                        // positive free space needs to be re-distributed to other flex items
+                        // (children views). In that case, invoke this method again with the same
+                        // fromIndex.
+                        needsReexpand = true;
+                        newWidth = flexItem.getMaxWidth();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexGrow -= flexItem.getFlexGrow();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedWidth - newWidth);
+                        if (accumulatedRoundError > 1.0) {
+                            newWidth += 1;
+                            accumulatedRoundError -= 1.0;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newWidth -= 1;
+                            accumulatedRoundError += 1.0;
+                        }
+                    }
+                    int childHeightMeasureSpec = getChildHeightMeasureSpecInternal(
+                            heightMeasureSpec, flexItem, flexLine.mSumCrossSizeBefore);
+                    int childWidthMeasureSpec = View.MeasureSpec.makeMeasureSpec(newWidth,
+                            View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredHeight
+                        + flexItem.getMarginTop() + flexItem.getMarginBottom()
+                        + mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredWidth + flexItem.getMarginLeft()
+                        + flexItem.getMarginRight();
+            } else {
+                // The direction of the main axis is vertical
+
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured height from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredHeight returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, that case happens
+                    // frequently
+                    childMeasuredHeight =
+                            extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured width from the cache
+                    childMeasuredWidth =
+                            extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexGrow() > 0f) {
+                    float rawCalculatedHeight = childMeasuredHeight
+                            + unitSpace * flexItem.getFlexGrow();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedHeight += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newHeight = Math.round(rawCalculatedHeight);
+                    if (newHeight > flexItem.getMaxHeight()) {
+                        // This means the child can't expand beyond the value of the mMaxHeight
+                        // attribute.
+                        // To adjust the flex line length to the size of maxMainSize, remaining
+                        // positive free space needs to be re-distributed to other flex items
+                        // (children views). In that case, invoke this method again with the same
+                        // fromIndex.
+                        needsReexpand = true;
+                        newHeight = flexItem.getMaxHeight();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexGrow -= flexItem.getFlexGrow();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedHeight - newHeight);
+                        if (accumulatedRoundError > 1.0) {
+                            newHeight += 1;
+                            accumulatedRoundError -= 1.0;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newHeight -= 1;
+                            accumulatedRoundError += 1.0;
+                        }
+                    }
+                    int childWidthMeasureSpec = getChildWidthMeasureSpecInternal(widthMeasureSpec,
+                            flexItem, flexLine.mSumCrossSizeBefore);
+                    int childHeightMeasureSpec = View.MeasureSpec.makeMeasureSpec(newHeight,
+                            View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredWidth
+                        + flexItem.getMarginLeft() + flexItem.getMarginRight()
+                        + mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredHeight + flexItem.getMarginTop()
+                        + flexItem.getMarginBottom();
+            }
+            flexLine.mCrossSize = Math.max(flexLine.mCrossSize, largestCrossSize);
+        }
+
+        if (needsReexpand && sizeBeforeExpand != flexLine.mMainSize) {
+            // Re-invoke the method with the same flex line to distribute the positive free space
+            // that wasn't fully distributed (because of maximum length constraint)
+            expandFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine, maxMainSize,
+                    paddingAlongMainAxis, true);
+        }
+    }
+
+    /**
+     * Shrink the flex items along the main axis based on the individual mFlexShrink attribute.
+     *
+     * @param widthMeasureSpec     the horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec    the vertical space requirements as imposed by the parent
+     * @param flexLine             the flex line to which flex items belong
+     * @param maxMainSize          the maximum main size. Shrank main size will be this size
+     * @param paddingAlongMainAxis the padding value along the main axis
+     * @param calledRecursively    true if this method is called recursively, false otherwise
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexItem#getFlexShrink()
+     */
+    private void shrinkFlexItems(int widthMeasureSpec, int heightMeasureSpec, FlexLine flexLine,
+            int maxMainSize, int paddingAlongMainAxis, boolean calledRecursively) {
+        int sizeBeforeShrink = flexLine.mMainSize;
+        if (flexLine.mTotalFlexShrink <= 0 || maxMainSize > flexLine.mMainSize) {
+            return;
+        }
+        boolean needsReshrink = false;
+        float unitShrink = (flexLine.mMainSize - maxMainSize) / flexLine.mTotalFlexShrink;
+        float accumulatedRoundError = 0;
+        flexLine.mMainSize = paddingAlongMainAxis + flexLine.mDividerLengthInMainSize;
+
+        // Setting the cross size of the flex line as the temporal value since the cross size of
+        // each flex item may be changed from the initial calculation
+        // (in the measureHorizontal/measureVertical method) even this method is part of the main
+        // size determination.
+        // E.g. If a TextView's layout_width is set to 0dp, layout_height is set to wrap_content,
+        // and layout_flexGrow is set to 1, the TextView is trying to expand to the vertical
+        // direction to enclose its content (in the measureHorizontal method), but
+        // the width will be expanded in this method. In that case, the height needs to be measured
+        // again with the expanded width.
+        int largestCrossSize = 0;
+        if (!calledRecursively) {
+            flexLine.mCrossSize = Integer.MIN_VALUE;
+        }
+        for (int i = 0; i < flexLine.mItemCount; i++) {
+            int index = flexLine.mFirstIndex + i;
+            View child = mFlexContainer.getReorderedFlexItemAt(index);
+            if (child == null || child.getVisibility() == View.GONE) {
+                continue;
+            }
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+            int flexDirection = mFlexContainer.getFlexDirection();
+            if (flexDirection == FlexDirection.ROW || flexDirection == FlexDirection.ROW_REVERSE) {
+                // The direction of main axis is horizontal
+
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured width from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredWidth returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, the case happens
+                    // frequently
+                    childMeasuredWidth = extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured height from the cache
+                    childMeasuredHeight = extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexShrink() > 0f) {
+                    float rawCalculatedWidth = childMeasuredWidth
+                            - unitShrink * flexItem.getFlexShrink();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedWidth += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newWidth = Math.round(rawCalculatedWidth);
+                    if (newWidth < flexItem.getMinWidth()) {
+                        // This means the child doesn't have enough space to distribute the negative
+                        // free space. To adjust the flex line length down to the maxMainSize,
+                        // remaining
+                        // negative free space needs to be re-distributed to other flex items
+                        // (children views). In that case, invoke this method again with the same
+                        // fromIndex.
+                        needsReshrink = true;
+                        newWidth = flexItem.getMinWidth();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexShrink -= flexItem.getFlexShrink();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedWidth - newWidth);
+                        if (accumulatedRoundError > 1.0) {
+                            newWidth += 1;
+                            accumulatedRoundError -= 1;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newWidth -= 1;
+                            accumulatedRoundError += 1;
+                        }
+                    }
+                    int childHeightMeasureSpec = getChildHeightMeasureSpecInternal(
+                            heightMeasureSpec, flexItem, flexLine.mSumCrossSizeBefore);
+                    int childWidthMeasureSpec =
+                            View.MeasureSpec.makeMeasureSpec(newWidth, View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredHeight +
+                        flexItem.getMarginTop() + flexItem.getMarginBottom() +
+                        mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredWidth + flexItem.getMarginLeft()
+                        + flexItem.getMarginRight();
+            } else {
+                // The direction of main axis is vertical
+
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured height from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredHeight returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, that case happens
+                    // frequently
+                    childMeasuredHeight =
+                            extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured width from the cache
+                    childMeasuredWidth =
+                            extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexShrink() > 0f) {
+                    float rawCalculatedHeight = childMeasuredHeight
+                            - unitShrink * flexItem.getFlexShrink();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedHeight += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newHeight = Math.round(rawCalculatedHeight);
+                    if (newHeight < flexItem.getMinHeight()) {
+                        // Need to invoke this method again like the case flex direction is vertical
+                        needsReshrink = true;
+                        newHeight = flexItem.getMinHeight();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexShrink -= flexItem.getFlexShrink();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedHeight - newHeight);
+                        if (accumulatedRoundError > 1.0) {
+                            newHeight += 1;
+                            accumulatedRoundError -= 1;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newHeight -= 1;
+                            accumulatedRoundError += 1;
+                        }
+                    }
+                    int childWidthMeasureSpec = getChildWidthMeasureSpecInternal(widthMeasureSpec,
+                            flexItem, flexLine.mSumCrossSizeBefore);
+                    int childHeightMeasureSpec =
+                            View.MeasureSpec.makeMeasureSpec(newHeight, View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredWidth +
+                        flexItem.getMarginLeft() + flexItem.getMarginRight() +
+                        mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredHeight + flexItem.getMarginTop()
+                        + flexItem.getMarginBottom();
+            }
+            flexLine.mCrossSize = Math.max(flexLine.mCrossSize, largestCrossSize);
+        }
+
+        if (needsReshrink && sizeBeforeShrink != flexLine.mMainSize) {
+            // Re-invoke the method with the same fromIndex to distribute the negative free space
+            // that wasn't fully distributed (because some views length were not enough)
+            shrinkFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine,
+                    maxMainSize, paddingAlongMainAxis, true);
+        }
+    }
+
+    private int getChildWidthMeasureSpecInternal(int widthMeasureSpec, FlexItem flexItem,
+            int padding) {
+        int childWidthMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(widthMeasureSpec,
+                mFlexContainer.getPaddingLeft() + mFlexContainer.getPaddingRight() +
+                        flexItem.getMarginLeft() + flexItem.getMarginRight() + padding,
+                flexItem.getWidth());
+        int childWidth = View.MeasureSpec.getSize(childWidthMeasureSpec);
+        if (childWidth > flexItem.getMaxWidth()) {
+            childWidthMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMaxWidth(),
+                    View.MeasureSpec.getMode(childWidthMeasureSpec));
+        } else if (childWidth < flexItem.getMinWidth()) {
+            childWidthMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMinWidth(),
+                    View.MeasureSpec.getMode(childWidthMeasureSpec));
+        }
+        return childWidthMeasureSpec;
+    }
+
+    private int getChildHeightMeasureSpecInternal(int heightMeasureSpec, FlexItem flexItem,
+            int padding) {
+        int childHeightMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(heightMeasureSpec,
+                mFlexContainer.getPaddingTop() + mFlexContainer.getPaddingBottom()
+                        + flexItem.getMarginTop() + flexItem.getMarginBottom() + padding,
+                flexItem.getHeight());
+        int childHeight = View.MeasureSpec.getSize(childHeightMeasureSpec);
+        if (childHeight > flexItem.getMaxHeight()) {
+            childHeightMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMaxHeight(),
+                    View.MeasureSpec.getMode(childHeightMeasureSpec));
+        } else if (childHeight < flexItem.getMinHeight()) {
+            childHeightMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMinHeight(),
+                    View.MeasureSpec.getMode(childHeightMeasureSpec));
+        }
+        return childHeightMeasureSpec;
+    }
+
+    /**
+     * Determines the cross size (Calculate the length along the cross axis).
+     * Expand the cross size only if the height mode is MeasureSpec.EXACTLY, otherwise
+     * use the sum of cross sizes of all flex lines.
+     *
+     * @param widthMeasureSpec      horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec     vertical space requirements as imposed by the parent
+     * @param paddingAlongCrossAxis the padding value for the FlexboxLayout along the cross axis
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexContainer#getAlignContent()
+     * @see FlexContainer#setAlignContent(int)
+     */
+    void determineCrossSize(int widthMeasureSpec, int heightMeasureSpec,
+            int paddingAlongCrossAxis) {
+        // The MeasureSpec mode along the cross axis
+        int mode;
+        // The MeasureSpec size along the cross axis
+        int size;
+        int flexDirection = mFlexContainer.getFlexDirection();
+        switch (flexDirection) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                mode = View.MeasureSpec.getMode(heightMeasureSpec);
+                size = View.MeasureSpec.getSize(heightMeasureSpec);
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                mode = View.MeasureSpec.getMode(widthMeasureSpec);
+                size = View.MeasureSpec.getSize(widthMeasureSpec);
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid flex direction: " + flexDirection);
+        }
+        List<FlexLine> flexLines = mFlexContainer.getFlexLinesInternal();
+        if (mode == View.MeasureSpec.EXACTLY) {
+            int totalCrossSize = mFlexContainer.getSumOfCrossSize() + paddingAlongCrossAxis;
+            if (flexLines.size() == 1) {
+                flexLines.get(0).mCrossSize = size - paddingAlongCrossAxis;
+                // alignContent property is valid only if the Flexbox has at least two lines
+            } else if (flexLines.size() >= 2) {
+                switch (mFlexContainer.getAlignContent()) {
+                    case AlignContent.STRETCH: {
+                        if (totalCrossSize >= size) {
+                            break;
+                        }
+                        float freeSpaceUnit = (size - totalCrossSize) / (float) flexLines.size();
+                        float accumulatedError = 0;
+                        for (int i = 0, flexLinesSize = flexLines.size(); i < flexLinesSize; i++) {
+                            FlexLine flexLine = flexLines.get(i);
+                            float newCrossSizeAsFloat = flexLine.mCrossSize + freeSpaceUnit;
+                            if (i == flexLines.size() - 1) {
+                                newCrossSizeAsFloat += accumulatedError;
+                                accumulatedError = 0;
+                            }
+                            int newCrossSize = Math.round(newCrossSizeAsFloat);
+                            accumulatedError += (newCrossSizeAsFloat - newCrossSize);
+                            if (accumulatedError > 1) {
+                                newCrossSize += 1;
+                                accumulatedError -= 1;
+                            } else if (accumulatedError < -1) {
+                                newCrossSize -= 1;
+                                accumulatedError += 1;
+                            }
+                            flexLine.mCrossSize = newCrossSize;
+                        }
+                        break;
+                    }
+                    case AlignContent.SPACE_AROUND: {
+                        if (totalCrossSize >= size) {
+                            // If the size of the content is larger than the flex container, the
+                            // Flex lines should be aligned center like ALIGN_CONTENT_CENTER
+                            mFlexContainer.setFlexLines(
+                                    constructFlexLinesForAlignContentCenter(flexLines, size,
+                                            totalCrossSize));
+                            break;
+                        }
+                        // The value of free space along the cross axis which needs to be put on top
+                        // and below the bottom of each flex line.
+                        int spaceTopAndBottom = size - totalCrossSize;
+                        // The number of spaces along the cross axis
+                        int numberOfSpaces = flexLines.size() * 2;
+                        spaceTopAndBottom = spaceTopAndBottom / numberOfSpaces;
+                        List<FlexLine> newFlexLines = new ArrayList<>();
+                        FlexLine dummySpaceFlexLine = new FlexLine();
+                        dummySpaceFlexLine.mCrossSize = spaceTopAndBottom;
+                        for (FlexLine flexLine : flexLines) {
+                            newFlexLines.add(dummySpaceFlexLine);
+                            newFlexLines.add(flexLine);
+                            newFlexLines.add(dummySpaceFlexLine);
+                        }
+                        mFlexContainer.setFlexLines(newFlexLines);
+                        break;
+                    }
+                    case AlignContent.SPACE_BETWEEN: {
+                        if (totalCrossSize >= size) {
+                            break;
+                        }
+                        // The value of free space along the cross axis between each flex line.
+                        float spaceBetweenFlexLine = size - totalCrossSize;
+                        int numberOfSpaces = flexLines.size() - 1;
+                        spaceBetweenFlexLine = spaceBetweenFlexLine / (float) numberOfSpaces;
+                        float accumulatedError = 0;
+                        List<FlexLine> newFlexLines = new ArrayList<>();
+                        for (int i = 0, flexLineSize = flexLines.size(); i < flexLineSize; i++) {
+                            FlexLine flexLine = flexLines.get(i);
+                            newFlexLines.add(flexLine);
+
+                            if (i != flexLines.size() - 1) {
+                                FlexLine dummySpaceFlexLine = new FlexLine();
+                                if (i == flexLines.size() - 2) {
+                                    // The last dummy space block in the flex container.
+                                    // Adjust the cross size by the accumulated error.
+                                    dummySpaceFlexLine.mCrossSize = Math
+                                            .round(spaceBetweenFlexLine + accumulatedError);
+                                    accumulatedError = 0;
+                                } else {
+                                    dummySpaceFlexLine.mCrossSize = Math
+                                            .round(spaceBetweenFlexLine);
+                                }
+                                accumulatedError += (spaceBetweenFlexLine
+                                        - dummySpaceFlexLine.mCrossSize);
+                                if (accumulatedError > 1) {
+                                    dummySpaceFlexLine.mCrossSize += 1;
+                                    accumulatedError -= 1;
+                                } else if (accumulatedError < -1) {
+                                    dummySpaceFlexLine.mCrossSize -= 1;
+                                    accumulatedError += 1;
+                                }
+                                newFlexLines.add(dummySpaceFlexLine);
+                            }
+                        }
+                        mFlexContainer.setFlexLines(newFlexLines);
+                        break;
+                    }
+                    case AlignContent.CENTER: {
+                        mFlexContainer.setFlexLines(
+                                constructFlexLinesForAlignContentCenter(flexLines, size,
+                                        totalCrossSize));
+                        break;
+                    }
+                    case AlignContent.FLEX_END: {
+                        int spaceTop = size - totalCrossSize;
+                        FlexLine dummySpaceFlexLine = new FlexLine();
+                        dummySpaceFlexLine.mCrossSize = spaceTop;
+                        flexLines.add(0, dummySpaceFlexLine);
+                        break;
+                    }
+                    case AlignContent.FLEX_START:
+                        // No op. Just to cover the available switch statement options
+                        break;
+                }
+            }
+        }
+    }
+
+    private List<FlexLine> constructFlexLinesForAlignContentCenter(List<FlexLine> flexLines,
+            int size, int totalCrossSize) {
+        int spaceAboveAndBottom = size - totalCrossSize;
+        spaceAboveAndBottom = spaceAboveAndBottom / 2;
+        List<FlexLine> newFlexLines = new ArrayList<>();
+        FlexLine dummySpaceFlexLine = new FlexLine();
+        dummySpaceFlexLine.mCrossSize = spaceAboveAndBottom;
+        for (int i = 0, flexLineSize = flexLines.size(); i < flexLineSize; i++) {
+            if (i == 0) {
+                newFlexLines.add(dummySpaceFlexLine);
+            }
+            FlexLine flexLine = flexLines.get(i);
+            newFlexLines.add(flexLine);
+            if (i == flexLines.size() - 1) {
+                newFlexLines.add(dummySpaceFlexLine);
+            }
+        }
+        return newFlexLines;
+    }
+
+    void stretchViews() {
+        stretchViews(0);
+    }
+
+    /**
+     * Expand the view if the {@link FlexContainer#getAlignItems()} attribute is set to {@link
+     * AlignItems#STRETCH} or {@link FlexItem#getAlignSelf()} is set as
+     * {@link AlignItems#STRETCH}.
+     *
+     * @param fromIndex the index from which value, stretch is calculated
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexContainer#getAlignItems()
+     * @see FlexContainer#setAlignItems(int)
+     * @see FlexItem#getAlignSelf()
+     */
+    void stretchViews(int fromIndex) {
+        if (fromIndex >= mFlexContainer.getFlexItemCount()) {
+            return;
+        }
+        int flexDirection = mFlexContainer.getFlexDirection();
+        if (mFlexContainer.getAlignItems() == AlignItems.STRETCH) {
+            int flexLineIndex = 0;
+            if (mIndexToFlexLine != null) {
+                flexLineIndex = mIndexToFlexLine[fromIndex];
+            }
+            List<FlexLine> flexLines = mFlexContainer.getFlexLinesInternal();
+            for (int i = flexLineIndex, size = flexLines.size(); i < size; i++) {
+                FlexLine flexLine = flexLines.get(i);
+                for (int j = 0, itemCount = flexLine.mItemCount; j < itemCount; j++) {
+                    int viewIndex = flexLine.mFirstIndex + j;
+                    if (j >= mFlexContainer.getFlexItemCount()) {
+                        continue;
+                    }
+                    View view = mFlexContainer.getReorderedFlexItemAt(viewIndex);
+                    if (view == null || view.getVisibility() == View.GONE) {
+                        continue;
+                    }
+                    FlexItem flexItem = (FlexItem) view.getLayoutParams();
+                    if (flexItem.getAlignSelf() != AlignSelf.AUTO &&
+                            flexItem.getAlignSelf() != AlignItems.STRETCH) {
+                        continue;
+                    }
+                    switch (flexDirection) {
+                        case FlexDirection.ROW: // Intentional fall through
+                        case FlexDirection.ROW_REVERSE:
+                            stretchViewVertically(view, flexLine.mCrossSize, viewIndex);
+                            break;
+                        case FlexDirection.COLUMN:
+                        case FlexDirection.COLUMN_REVERSE:
+                            stretchViewHorizontally(view, flexLine.mCrossSize, viewIndex);
+                            break;
+                        default:
+                            throw new IllegalArgumentException(
+                                    "Invalid flex direction: " + flexDirection);
+                    }
+                }
+            }
+        } else {
+            for (FlexLine flexLine : mFlexContainer.getFlexLinesInternal()) {
+                for (Integer index : flexLine.mIndicesAlignSelfStretch) {
+                    View view = mFlexContainer.getReorderedFlexItemAt(index);
+                    switch (flexDirection) {
+                        case FlexDirection.ROW: // Intentional fall through
+                        case FlexDirection.ROW_REVERSE:
+                            stretchViewVertically(view, flexLine.mCrossSize, index);
+                            break;
+                        case FlexDirection.COLUMN:
+                        case FlexDirection.COLUMN_REVERSE:
+                            stretchViewHorizontally(view, flexLine.mCrossSize, index);
+                            break;
+                        default:
+                            throw new IllegalArgumentException(
+                                    "Invalid flex direction: " + flexDirection);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Expand the view vertically to the size of the crossSize (considering the view margins)
+     *
+     * @param view      the View to be stretched
+     * @param crossSize the cross size
+     * @param index     the index of the view
+     */
+    private void stretchViewVertically(View view, int crossSize, int index) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int newHeight = crossSize - flexItem.getMarginTop() - flexItem.getMarginBottom() -
+                mFlexContainer.getDecorationLengthCrossAxis(view);
+        newHeight = Math.max(newHeight, flexItem.getMinHeight());
+        newHeight = Math.min(newHeight, flexItem.getMaxHeight());
+        int childWidthSpec;
+        int measuredWidth;
+        if (mMeasuredSizeCache != null) {
+            // Retrieve the measured height from the cache because there
+            // are some cases that the view is re-created from the last measure, thus
+            // View#getMeasuredHeight returns 0.
+            // E.g. if the flex container is FlexboxLayoutManager, that case happens
+            // frequently
+            measuredWidth = extractLowerInt(mMeasuredSizeCache[index]);
+        } else {
+            measuredWidth = view.getMeasuredWidth();
+        }
+        childWidthSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth,
+                View.MeasureSpec.EXACTLY);
+
+        int childHeightSpec = View.MeasureSpec.makeMeasureSpec(newHeight, View.MeasureSpec.EXACTLY);
+        view.measure(childWidthSpec, childHeightSpec);
+
+        updateMeasureCache(index, childWidthSpec, childHeightSpec, view);
+        mFlexContainer.updateViewCache(index, view);
+    }
+
+    /**
+     * Expand the view horizontally to the size of the crossSize (considering the view margins)
+     *
+     * @param view      the View to be stretched
+     * @param crossSize the cross size
+     * @param index     the index of the view
+     */
+    private void stretchViewHorizontally(View view, int crossSize, int index) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int newWidth = crossSize - flexItem.getMarginLeft() - flexItem.getMarginRight()
+                - mFlexContainer.getDecorationLengthCrossAxis(view);
+        newWidth = Math.max(newWidth, flexItem.getMinWidth());
+        newWidth = Math.min(newWidth, flexItem.getMaxWidth());
+        int childHeightSpec;
+        int measuredHeight;
+        if (mMeasuredSizeCache != null) {
+            // Retrieve the measured height from the cache because there
+            // are some cases that the view is re-created from the last measure, thus
+            // View#getMeasuredHeight returns 0.
+            // E.g. if the flex container is FlexboxLayoutManager, that case happens
+            // frequently
+            measuredHeight = extractHigherInt(mMeasuredSizeCache[index]);
+        } else {
+            measuredHeight = view.getMeasuredHeight();
+        }
+        childHeightSpec = View.MeasureSpec.makeMeasureSpec(measuredHeight,
+                View.MeasureSpec.EXACTLY);
+        int childWidthSpec = View.MeasureSpec.makeMeasureSpec(newWidth, View.MeasureSpec.EXACTLY);
+        view.measure(childWidthSpec, childHeightSpec);
+
+        updateMeasureCache(index, childWidthSpec, childHeightSpec, view);
+        mFlexContainer.updateViewCache(index, view);
+    }
+
+    /**
+     * Place a single View when the layout direction is horizontal
+     * ({@link FlexContainer#getFlexDirection()} is either {@link FlexDirection#ROW} or
+     * {@link FlexDirection#ROW_REVERSE}).
+     *
+     * @param view     the View to be placed
+     * @param flexLine the {@link FlexLine} where the View belongs to
+     * @param left     the left position of the View, which the View's margin is already taken
+     *                 into account
+     * @param top      the top position of the flex line where the View belongs to. The actual
+     *                 View's top position is shifted depending on the flexWrap and alignItems
+     *                 attributes
+     * @param right    the right position of the View, which the View's margin is already taken
+     *                 into account
+     * @param bottom   the bottom position of the flex line where the View belongs to. The actual
+     *                 View's bottom position is shifted depending on the flexWrap and alignItems
+     *                 attributes
+     * @see FlexContainer#getAlignItems()
+     * @see FlexContainer#setAlignItems(int)
+     * @see FlexItem#getAlignSelf()
+     */
+    void layoutSingleChildHorizontal(View view, FlexLine flexLine, int left, int top, int right,
+            int bottom) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int alignItems = mFlexContainer.getAlignItems();
+        if (flexItem.getAlignSelf() != AlignSelf.AUTO) {
+            // Expecting the values for alignItems and mAlignSelf match except for ALIGN_SELF_AUTO.
+            // Assigning the mAlignSelf value as alignItems should work.
+            alignItems = flexItem.getAlignSelf();
+        }
+        int crossSize = flexLine.mCrossSize;
+        switch (alignItems) {
+            case AlignItems.FLEX_START: // Intentional fall through
+            case AlignItems.STRETCH:
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    view.layout(left, top + flexItem.getMarginTop(), right,
+                            bottom + flexItem.getMarginTop());
+                } else {
+                    view.layout(left, top - flexItem.getMarginBottom(), right,
+                            bottom - flexItem.getMarginBottom());
+                }
+                break;
+            case AlignItems.BASELINE:
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    int marginTop = flexLine.mMaxBaseline - view.getBaseline();
+                    marginTop = Math.max(marginTop, flexItem.getMarginTop());
+                    view.layout(left, top + marginTop, right, bottom + marginTop);
+                } else {
+                    int marginBottom = flexLine.mMaxBaseline - view.getMeasuredHeight() + view
+                            .getBaseline();
+                    marginBottom = Math.max(marginBottom, flexItem.getMarginBottom());
+                    view.layout(left, top - marginBottom, right, bottom - marginBottom);
+                }
+                break;
+            case AlignItems.FLEX_END:
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    view.layout(left,
+                            top + crossSize - view.getMeasuredHeight() - flexItem.getMarginBottom(),
+                            right, top + crossSize - flexItem.getMarginBottom());
+                } else {
+                    // If the flexWrap == WRAP_REVERSE, the direction of the
+                    // flexEnd is flipped (from top to bottom).
+                    view.layout(left,
+                            top - crossSize + view.getMeasuredHeight() + flexItem.getMarginTop(),
+                            right, bottom - crossSize + view.getMeasuredHeight() + flexItem
+                                    .getMarginTop());
+                }
+                break;
+            case AlignItems.CENTER:
+                int topFromCrossAxis = (crossSize - view.getMeasuredHeight()
+                        + flexItem.getMarginTop() - flexItem.getMarginBottom()) / 2;
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    view.layout(left, top + topFromCrossAxis,
+                            right, top + topFromCrossAxis + view.getMeasuredHeight());
+                } else {
+                    view.layout(left, top - topFromCrossAxis,
+                            right, top - topFromCrossAxis + view.getMeasuredHeight());
+                }
+                break;
+        }
+    }
+
+    /**
+     * Place a single View when the layout direction is vertical
+     * ({@link FlexContainer#getFlexDirection()} is either {@link FlexDirection#COLUMN} or
+     * {@link FlexDirection#COLUMN_REVERSE}).
+     *
+     * @param view     the View to be placed
+     * @param flexLine the {@link FlexLine} where the View belongs to
+     * @param isRtl    {@code true} if the layout direction is right to left, {@code false}
+     *                 otherwise
+     * @param left     the left position of the flex line where the View belongs to. The actual
+     *                 View's left position is shifted depending on the isLayoutRtl and alignItems
+     *                 attributes
+     * @param top      the top position of the View, which the View's margin is already taken
+     *                 into account
+     * @param right    the right position of the flex line where the View belongs to. The actual
+     *                 View's right position is shifted depending on the isLayoutRtl and alignItems
+     *                 attributes
+     * @param bottom   the bottom position of the View, which the View's margin is already taken
+     *                 into account
+     * @see FlexContainer#getAlignItems()
+     * @see FlexContainer#setAlignItems(int)
+     * @see FlexItem#getAlignSelf()
+     */
+    void layoutSingleChildVertical(View view, FlexLine flexLine, boolean isRtl,
+            int left, int top, int right, int bottom) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int alignItems = mFlexContainer.getAlignItems();
+        if (flexItem.getAlignSelf() != AlignSelf.AUTO) {
+            // Expecting the values for alignItems and mAlignSelf match except for ALIGN_SELF_AUTO.
+            // Assigning the mAlignSelf value as alignItems should work.
+            alignItems = flexItem.getAlignSelf();
+        }
+        int crossSize = flexLine.mCrossSize;
+        switch (alignItems) {
+            case AlignItems.FLEX_START: // Intentional fall through
+            case AlignItems.STRETCH: // Intentional fall through
+            case AlignItems.BASELINE:
+                if (!isRtl) {
+                    view.layout(left + flexItem.getMarginLeft(), top,
+                            right + flexItem.getMarginLeft(), bottom);
+                } else {
+                    view.layout(left - flexItem.getMarginRight(), top,
+                            right - flexItem.getMarginRight(), bottom);
+                }
+                break;
+            case AlignItems.FLEX_END:
+                if (!isRtl) {
+                    view.layout(
+                            left + crossSize - view.getMeasuredWidth() - flexItem.getMarginRight(),
+                            top,
+                            right + crossSize - view.getMeasuredWidth() - flexItem.getMarginRight(),
+                            bottom);
+                } else {
+                    // If the flexWrap == WRAP_REVERSE, the direction of the
+                    // flexEnd is flipped (from left to right).
+                    view.layout(
+                            left - crossSize + view.getMeasuredWidth() + flexItem.getMarginLeft(),
+                            top,
+                            right - crossSize + view.getMeasuredWidth() + flexItem.getMarginLeft(),
+                            bottom);
+                }
+                break;
+            case AlignItems.CENTER:
+                ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams)
+                        view.getLayoutParams();
+                int leftFromCrossAxis = (crossSize - view.getMeasuredWidth()
+                        + MarginLayoutParamsCompat.getMarginStart(lp)
+                        - MarginLayoutParamsCompat.getMarginEnd(lp)) / 2;
+                if (!isRtl) {
+                    view.layout(left + leftFromCrossAxis, top, right + leftFromCrossAxis, bottom);
+                } else {
+                    view.layout(left - leftFromCrossAxis, top, right - leftFromCrossAxis, bottom);
+                }
+                break;
+        }
+    }
+
+    void ensureMeasuredSizeCache(int size) {
+        if (mMeasuredSizeCache == null) {
+            mMeasuredSizeCache = new long[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mMeasuredSizeCache.length < size) {
+            int newCapacity = mMeasuredSizeCache.length * 2;
+            newCapacity = Math.max(newCapacity, size);
+            mMeasuredSizeCache = Arrays.copyOf(mMeasuredSizeCache, newCapacity);
+        }
+    }
+
+    void ensureMeasureSpecCache(int size) {
+        if (mMeasureSpecCache == null) {
+            mMeasureSpecCache = new long[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mMeasureSpecCache.length < size) {
+            int newCapacity = mMeasureSpecCache.length * 2;
+            newCapacity = Math.max(newCapacity, size);
+            mMeasureSpecCache = Arrays.copyOf(mMeasureSpecCache, newCapacity);
+        }
+    }
+
+    /**
+     * @param longValue the long value that consists of width and height measure specs
+     * @return the int value which consists from the lower 8 bits
+     * @see #makeCombinedLong(int, int)
+     */
+    int extractLowerInt(long longValue) {
+        return (int) longValue;
+    }
+
+    /**
+     * @param longValue the long value that consists of width and height measure specs
+     * @return the int value which consists from the higher 8 bits
+     * @see #makeCombinedLong(int, int)
+     */
+    int extractHigherInt(long longValue) {
+        return (int) (longValue >> 32);
+    }
+
+    /**
+     * Make a long value from the a width measure spec and a height measure spec.
+     * The first 32 bit is used for the height measure spec and the last 32 bit is used for the
+     * width measure spec.
+     *
+     * @param widthMeasureSpec  the width measure spec to consist the result long value
+     * @param heightMeasureSpec the height measure spec to consist the result long value
+     * @return the combined long value
+     * @see #extractLowerInt(long)
+     * @see #extractHigherInt(long)
+     */
+    @VisibleForTesting
+    long makeCombinedLong(int widthMeasureSpec, int heightMeasureSpec) {
+        // Suppress sign extension for the low bytes
+        return (long) heightMeasureSpec << 32 | (long) widthMeasureSpec & MEASURE_SPEC_WIDTH_MASK;
+    }
+
+    private void updateMeasureCache(int index, int widthMeasureSpec, int heightMeasureSpec,
+            View view) {
+        if (mMeasureSpecCache != null) {
+            mMeasureSpecCache[index] = makeCombinedLong(
+                    widthMeasureSpec,
+                    heightMeasureSpec);
+        }
+        if (mMeasuredSizeCache != null) {
+            mMeasuredSizeCache[index] = makeCombinedLong(
+                    view.getMeasuredWidth(),
+                    view.getMeasuredHeight());
+        }
+    }
+
+    void ensureIndexToFlexLine(int size) {
+        if (mIndexToFlexLine == null) {
+            mIndexToFlexLine = new int[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mIndexToFlexLine.length < size) {
+            int newCapacity = mIndexToFlexLine.length * 2;
+            newCapacity = Math.max(newCapacity, size);
+            mIndexToFlexLine = Arrays.copyOf(mIndexToFlexLine, newCapacity);
+        }
+    }
+
+    /**
+     * Clear the from flex lines and the caches from the index passed as an argument.
+     *
+     * @param flexLines    the flex lines to be cleared
+     * @param fromFlexItem the index from which, flex lines are cleared
+     */
+    void clearFlexLines(List<FlexLine> flexLines, int fromFlexItem) {
+        assert mIndexToFlexLine != null;
+        assert mMeasureSpecCache != null;
+
+        int fromFlexLine = mIndexToFlexLine[fromFlexItem];
+        if (fromFlexLine == NO_POSITION) {
+            fromFlexLine = 0;
+        }
+
+        // Deleting from the last to avoid unneeded copy it happens when deleting the middle of the
+        // item in the ArrayList
+        if (flexLines.size() > fromFlexLine) {
+            flexLines.subList(fromFlexLine, flexLines.size()).clear();
+        }
+
+        int fillTo = mIndexToFlexLine.length - 1;
+        if (fromFlexItem > fillTo) {
+            Arrays.fill(mIndexToFlexLine, NO_POSITION);
+        } else {
+            Arrays.fill(mIndexToFlexLine, fromFlexItem, fillTo, NO_POSITION);
+        }
+
+        fillTo = mMeasureSpecCache.length - 1;
+        if (fromFlexItem > fillTo) {
+            Arrays.fill(mMeasureSpecCache, 0);
+        } else {
+            Arrays.fill(mMeasureSpecCache, fromFlexItem, fillTo, 0);
+        }
+    }
+
+    /**
+     * A class that is used for calculating the view order which view's indices and order
+     * properties from Flexbox are taken into account.
+     */
+    private static class Order implements Comparable<Order> {
+
+        /** {@link View}'s index */
+        int index;
+
+        /** order property in the Flexbox */
+        int order;
+
+        @Override
+        public int compareTo(@NonNull Order another) {
+            if (order != another.order) {
+                return order - another.order;
+            }
+            return index - another.index;
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return "Order{" +
+                    "order=" + order +
+                    ", index=" + index +
+                    '}';
+        }
+    }
+
+    static class FlexLinesResult {
+
+        List<FlexLine> mFlexLines;
+
+        int mChildState;
+
+        void reset() {
+            mFlexLines = null;
+            mChildState = 0;
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxItemDecoration.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxItemDecoration.java
new file mode 100755
index 0000000..ad33332
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxItemDecoration.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * {@link RecyclerView.ItemDecoration} implementation that can be used as item decorations between
+ * view holders within the {@link FlexboxLayoutManager}.
+ *
+ * Orientation for the decoration can be either of:
+ * <ul>
+ * <li>Horizontal (setOrientation(HORIZONTAL)</li>
+ * <li>Vertical (setOrientation(VERTICAL)</li>
+ * <li>Both orientation (setOrientation(BOTH)</li>
+ * </ul>.
+ * The default value is set to both.
+ */
+public class FlexboxItemDecoration extends RecyclerView.ItemDecoration {
+
+    public static final int HORIZONTAL = 1;
+    public static final int VERTICAL = 1 << 1;
+    @SuppressWarnings("WeakerAccess")
+    public static final int BOTH = HORIZONTAL | VERTICAL;
+
+    private static final int[] LIST_DIVIDER_ATTRS = new int[]{android.R.attr.listDivider};
+
+    private Drawable mDrawable;
+
+    private int mOrientation;
+
+    public FlexboxItemDecoration(Context context) {
+        final TypedArray a = context.obtainStyledAttributes(LIST_DIVIDER_ATTRS);
+        mDrawable = a.getDrawable(0);
+        a.recycle();
+        setOrientation(BOTH);
+    }
+
+    /**
+     * Set the drawable used as the item decoration.
+     * If the drawable is not set, the default list divider is used as the
+     * item decoration.
+     */
+    public void setDrawable(Drawable drawable) {
+        if (drawable == null) {
+            throw new IllegalArgumentException("Drawable cannot be null.");
+        }
+        mDrawable = drawable;
+    }
+
+    /**
+     * Set the orientation for the decoration.
+     * Orientation for the decoration can be either of:
+     * <ul>
+     * <li>Horizontal (setOrientation(HORIZONTAL)</li>
+     * <li>Vertical (setOrientation(VERTICAL)</li>
+     * <li>Both orientation (setOrientation(BOTH)</li>
+     * </ul>.
+     */
+    public void setOrientation(int orientation) {
+        mOrientation = orientation;
+    }
+
+    @Override
+    public void onDraw(
+            @NonNull Canvas canvas,
+            @NonNull RecyclerView parent,
+            @NonNull RecyclerView.State state) {
+        drawHorizontalDecorations(canvas, parent);
+        drawVerticalDecorations(canvas, parent);
+    }
+
+    @Override
+    public void getItemOffsets(
+            @NonNull Rect outRect,
+            @NonNull View view,
+            RecyclerView parent,
+            @NonNull RecyclerView.State state) {
+        int position = parent.getChildAdapterPosition(view);
+        if (position == 0) {
+            return;
+        }
+        if (!needsHorizontalDecoration() && !needsVerticalDecoration()) {
+            outRect.set(0, 0, 0, 0);
+            return;
+        }
+        FlexboxLayoutManager layoutManager = (FlexboxLayoutManager) parent.getLayoutManager();
+        List<FlexLine> flexLines = layoutManager.getFlexLines();
+        int flexDirection = layoutManager.getFlexDirection();
+        setOffsetAlongMainAxis(outRect, position, layoutManager, flexLines, flexDirection);
+        setOffsetAlongCrossAxis(outRect, position, layoutManager, flexLines);
+    }
+
+    private void setOffsetAlongCrossAxis(Rect outRect, int position,
+            FlexboxLayoutManager layoutManager, List<FlexLine> flexLines) {
+        if (flexLines.size() == 0) {
+            return;
+        }
+        int flexLineIndex = layoutManager.getPositionToFlexLineIndex(position);
+        if (flexLineIndex == 0) {
+            return;
+        }
+
+        if (layoutManager.isMainAxisDirectionHorizontal()) {
+            if (!needsHorizontalDecoration()) {
+                outRect.top = 0;
+                outRect.bottom = 0;
+                return;
+            }
+            outRect.top = mDrawable.getIntrinsicHeight();
+            outRect.bottom = 0;
+        } else {
+            if (!needsVerticalDecoration()) {
+                return;
+            }
+            if (layoutManager.isLayoutRtl()) {
+                outRect.right = mDrawable.getIntrinsicWidth();
+                outRect.left = 0;
+            } else {
+                outRect.left = mDrawable.getIntrinsicWidth();
+                outRect.right = 0;
+            }
+        }
+
+    }
+
+    private void setOffsetAlongMainAxis(Rect outRect, int position,
+            FlexboxLayoutManager layoutManager, List<FlexLine> flexLines, int flexDirection) {
+        if (isFirstItemInLine(position, flexLines, layoutManager)) {
+            return;
+        }
+
+        if (layoutManager.isMainAxisDirectionHorizontal()) {
+            if (!needsVerticalDecoration()) {
+                outRect.left = 0;
+                outRect.right = 0;
+                return;
+            }
+            if (layoutManager.isLayoutRtl()) {
+                outRect.right = mDrawable.getIntrinsicWidth();
+                outRect.left = 0;
+            } else {
+                outRect.left = mDrawable.getIntrinsicWidth();
+                outRect.right = 0;
+            }
+        } else {
+            if (!needsHorizontalDecoration()) {
+                outRect.top = 0;
+                outRect.bottom = 0;
+                return;
+            }
+            if (flexDirection == FlexDirection.COLUMN_REVERSE) {
+                outRect.bottom = mDrawable.getIntrinsicHeight();
+                outRect.top = 0;
+            } else {
+                outRect.top = mDrawable.getIntrinsicHeight();
+                outRect.bottom = 0;
+            }
+        }
+
+    }
+
+    private void drawVerticalDecorations(Canvas canvas, RecyclerView parent) {
+        if (!needsVerticalDecoration()) {
+            return;
+        }
+        FlexboxLayoutManager layoutManager = (FlexboxLayoutManager) parent.getLayoutManager();
+        int parentTop = parent.getTop() - parent.getPaddingTop();
+        int parentBottom = parent.getBottom() + parent.getPaddingBottom();
+        int childCount = parent.getChildCount();
+        int flexDirection = layoutManager.getFlexDirection();
+        for (int i = 0; i < childCount; i++) {
+            View child = parent.getChildAt(i);
+
+            RecyclerView.LayoutParams lp = (RecyclerView.LayoutParams) child.getLayoutParams();
+
+            int left, right;
+            if (layoutManager.isLayoutRtl()) {
+                left = child.getRight() + lp.rightMargin;
+                right = left + mDrawable.getIntrinsicWidth();
+            } else {
+                right = child.getLeft() - lp.leftMargin;
+                left = right - mDrawable.getIntrinsicWidth();
+            }
+
+            int top, bottom;
+            if (layoutManager.isMainAxisDirectionHorizontal()) {
+                top = child.getTop() - lp.topMargin;
+                bottom = child.getBottom() + lp.bottomMargin;
+            } else {
+                if (flexDirection == FlexDirection.COLUMN_REVERSE) {
+                    bottom = child.getBottom() + lp.bottomMargin + mDrawable.getIntrinsicHeight();
+                    bottom = Math.min(bottom, parentBottom);
+                    top = child.getTop() - lp.topMargin;
+                } else {
+                    top = child.getTop() - lp.topMargin - mDrawable.getIntrinsicHeight();
+                    top = Math.max(top, parentTop);
+                    bottom = child.getBottom() + lp.bottomMargin;
+                }
+            }
+
+            mDrawable.setBounds(left, top, right, bottom);
+            mDrawable.draw(canvas);
+        }
+    }
+
+    private void drawHorizontalDecorations(Canvas canvas, RecyclerView parent) {
+        if (!needsHorizontalDecoration()) {
+            return;
+        }
+        FlexboxLayoutManager layoutManager = (FlexboxLayoutManager) parent.getLayoutManager();
+        int flexDirection = layoutManager.getFlexDirection();
+        int parentLeft = parent.getLeft() - parent.getPaddingLeft();
+        int parentRight = parent.getRight() + parent.getPaddingRight();
+        int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            View child = parent.getChildAt(i);
+            RecyclerView.LayoutParams lp = (RecyclerView.LayoutParams) child.getLayoutParams();
+
+            int top, bottom;
+            if (flexDirection == FlexDirection.COLUMN_REVERSE) {
+                top = child.getBottom() + lp.bottomMargin;
+                bottom = top + mDrawable.getIntrinsicHeight();
+            } else {
+                bottom = child.getTop() - lp.topMargin;
+                top = bottom - mDrawable.getIntrinsicHeight();
+            }
+
+            int left, right;
+            if (layoutManager.isMainAxisDirectionHorizontal()) {
+                if (layoutManager.isLayoutRtl()) {
+                    right = child.getRight() + lp.rightMargin + mDrawable.getIntrinsicWidth();
+                    right = Math.min(right, parentRight);
+                    left = child.getLeft() - lp.leftMargin;
+                } else {
+                    left = child.getLeft() - lp.leftMargin - mDrawable.getIntrinsicWidth();
+                    left = Math.max(left, parentLeft);
+                    right = child.getRight() + lp.rightMargin;
+                }
+            } else {
+                left = child.getLeft() - lp.leftMargin;
+                right = child.getRight() + lp.rightMargin;
+            }
+            mDrawable.setBounds(left, top, right, bottom);
+            mDrawable.draw(canvas);
+        }
+    }
+
+    private boolean needsHorizontalDecoration() {
+        return (mOrientation & HORIZONTAL) > 0;
+    }
+
+    private boolean needsVerticalDecoration() {
+        return (mOrientation & VERTICAL) > 0;
+    }
+
+    /**
+     * @return {@code true} if the given position is the first item in a flex line.
+     */
+    private boolean isFirstItemInLine(int position, List<FlexLine> flexLines,
+            FlexboxLayoutManager layoutManager) {
+        int flexLineIndex = layoutManager.getPositionToFlexLineIndex(position);
+        if (flexLineIndex != NO_POSITION &&
+                flexLineIndex < layoutManager.getFlexLinesInternal().size() &&
+                layoutManager.getFlexLinesInternal().get(flexLineIndex).mFirstIndex == position) {
+            return true;
+        }
+        if (position == 0) {
+            return true;
+        }
+        if (flexLines.size() == 0) {
+            return false;
+        }
+        // Check if the position is the "lastIndex + 1" of the last line in case the FlexLine which
+        // has the View, whose index is position is not included in the flexLines. (E.g. flexLines
+        // is being calculated
+        FlexLine lastLine = flexLines.get(flexLines.size() - 1);
+        return lastLine.mLastIndex == position - 1;
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
new file mode 100755
index 0000000..12c3e8a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
@@ -0,0 +1,1878 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.util.SparseIntArray;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+
+/**
+ * A layout that arranges its children in a way its attributes can be specified like the
+ * CSS Flexible Box Layout Module.
+ * This class extends the {@link ViewGroup} like other layout classes such as {@link LinearLayout}
+ * or {@link RelativeLayout}, the attributes can be specified from a layout XML or from code.
+ *
+ * The supported attributes that you can use are:
+ * <ul>
+ * <li>{@code flexDirection}</li>
+ * <li>{@code flexWrap}</li>
+ * <li>{@code justifyContent}</li>
+ * <li>{@code alignItems}</li>
+ * <li>{@code alignContent}</li>
+ * <li>{@code showDivider}</li>
+ * <li>{@code showDividerHorizontal}</li>
+ * <li>{@code showDividerVertical}</li>
+ * <li>{@code dividerDrawable}</li>
+ * <li>{@code dividerDrawableHorizontal}</li>
+ * <li>{@code dividerDrawableVertical}</li>
+ * <li>{@code maxLine}</li>
+ * </ul>
+ * for the FlexboxLayout.
+ *
+ * And for the children of the FlexboxLayout, you can use:
+ * <ul>
+ * <li>{@code layout_order}</li>
+ * <li>{@code layout_flexGrow}</li>
+ * <li>{@code layout_flexShrink}</li>
+ * <li>{@code layout_flexBasisPercent}</li>
+ * <li>{@code layout_alignSelf}</li>
+ * <li>{@code layout_minWidth}</li>
+ * <li>{@code layout_minHeight}</li>
+ * <li>{@code layout_maxWidth}</li>
+ * <li>{@code layout_maxHeight}</li>
+ * <li>{@code layout_wrapBefore}</li>
+ * </ul>
+ */
+public class FlexboxLayout extends ViewGroup implements FlexContainer {
+
+    /**
+     * The current value of the {@link FlexDirection}, the default value is {@link
+     * FlexDirection#ROW}.
+     *
+     * @see FlexDirection
+     */
+    private int mFlexDirection;
+
+    /**
+     * The current value of the {@link FlexWrap}, the default value is {@link FlexWrap#NOWRAP}.
+     *
+     * @see FlexWrap
+     */
+    private int mFlexWrap;
+
+    /**
+     * The current value of the {@link JustifyContent}, the default value is
+     * {@link JustifyContent#FLEX_START}.
+     *
+     * @see JustifyContent
+     */
+    private int mJustifyContent;
+
+    /**
+     * The current value of the {@link AlignItems}, the default value is
+     * {@link AlignItems#FLEX_START}.
+     *
+     * @see AlignItems
+     */
+    private int mAlignItems;
+
+    /**
+     * The current value of the {@link AlignContent}, the default value is
+     * {@link AlignContent#FLEX_START}.
+     *
+     * @see AlignContent
+     */
+    private int mAlignContent;
+
+    /**
+     * The current value of the maxLine attribute, which specifies the maximum number of flex lines.
+     */
+    private int mMaxLine = NOT_SET;
+
+    /**
+     * The int definition to be used as the arguments for the {@link #setShowDivider(int)},
+     * {@link #setShowDividerHorizontal(int)} or {@link #setShowDividerVertical(int)}.
+     * One or more of the values (such as
+     * {@link #SHOW_DIVIDER_BEGINNING} | {@link #SHOW_DIVIDER_MIDDLE}) can be passed to those set
+     * methods.
+     */
+    @IntDef(flag = true,
+            value = {
+                    SHOW_DIVIDER_NONE,
+                    SHOW_DIVIDER_BEGINNING,
+                    SHOW_DIVIDER_MIDDLE,
+                    SHOW_DIVIDER_END
+            })
+    @Retention(RetentionPolicy.SOURCE)
+    @SuppressWarnings("WeakerAccess")
+    public @interface DividerMode {
+
+    }
+
+    /** Constant to show no dividers */
+    public static final int SHOW_DIVIDER_NONE = 0;
+
+    /** Constant to show a divider at the beginning of the flex lines (or flex items). */
+    public static final int SHOW_DIVIDER_BEGINNING = 1;
+
+    /** Constant to show dividers between flex lines or flex items. */
+    public static final int SHOW_DIVIDER_MIDDLE = 1 << 1;
+
+    /** Constant to show a divider at the end of the flex lines or flex items. */
+    public static final int SHOW_DIVIDER_END = 1 << 2;
+
+    /** The drawable to be drawn for the horizontal dividers. */
+    @Nullable
+    private Drawable mDividerDrawableHorizontal;
+
+    /** The drawable to be drawn for the vertical dividers. */
+    @Nullable
+    private Drawable mDividerDrawableVertical;
+
+    /**
+     * Indicates the divider mode for the {@link #mDividerDrawableHorizontal}. The value needs to
+     * be the combination of the value of {@link #SHOW_DIVIDER_NONE},
+     * {@link #SHOW_DIVIDER_BEGINNING}, {@link #SHOW_DIVIDER_MIDDLE} and {@link #SHOW_DIVIDER_END}
+     */
+    private int mShowDividerHorizontal;
+
+    /**
+     * Indicates the divider mode for the {@link #mDividerDrawableVertical}. The value needs to
+     * be the combination of the value of {@link #SHOW_DIVIDER_NONE},
+     * {@link #SHOW_DIVIDER_BEGINNING}, {@link #SHOW_DIVIDER_MIDDLE} and {@link #SHOW_DIVIDER_END}
+     */
+    private int mShowDividerVertical;
+
+    /** The height of the {@link #mDividerDrawableHorizontal}. */
+    private int mDividerHorizontalHeight;
+
+    /** The width of the {@link #mDividerDrawableVertical}. */
+    private int mDividerVerticalWidth;
+
+    /**
+     * Holds reordered indices, which {@link FlexItem#getOrder()} parameters are taken
+     * into account
+     */
+    private int[] mReorderedIndices;
+
+    /**
+     * Caches the {@link FlexItem#getOrder()} attributes for children views.
+     * Key: the index of the view reordered indices using the {@link FlexItem#getOrder()}
+     * isn't taken into account)
+     * Value: the value for the order attribute
+     */
+    private SparseIntArray mOrderCache;
+
+    private FlexboxHelper mFlexboxHelper = new FlexboxHelper(this);
+
+    private List<FlexLine> mFlexLines = new ArrayList<>();
+
+    /**
+     * Used for receiving the calculation of the flex results to avoid creating a new instance
+     * every time flex lines are calculated.
+     */
+    private FlexboxHelper.FlexLinesResult mFlexLinesResult = new FlexboxHelper.FlexLinesResult();
+
+    public FlexboxLayout(Context context) {
+        this(context, null);
+    }
+
+    public FlexboxLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public FlexboxLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        TypedArray a = context.obtainStyledAttributes(
+                attrs, R.styleable.FlexboxLayout, defStyleAttr, 0);
+        mFlexDirection = a
+                .getInt(R.styleable.FlexboxLayout_flexDirection, FlexDirection.ROW);
+        mFlexWrap = a.getInt(R.styleable.FlexboxLayout_flexWrap, FlexWrap.NOWRAP);
+        mJustifyContent = a
+                .getInt(R.styleable.FlexboxLayout_justifyContent, JustifyContent.FLEX_START);
+        mAlignItems = a.getInt(R.styleable.FlexboxLayout_alignItems, AlignItems.FLEX_START);
+        mAlignContent = a.getInt(R.styleable.FlexboxLayout_alignContent, AlignContent.FLEX_START);
+        mMaxLine = a.getInt(R.styleable.FlexboxLayout_maxLine, NOT_SET);
+        Drawable drawable = a.getDrawable(R.styleable.FlexboxLayout_dividerDrawable);
+        if (drawable != null) {
+            setDividerDrawableHorizontal(drawable);
+            setDividerDrawableVertical(drawable);
+        }
+        Drawable drawableHorizontal = a
+                .getDrawable(R.styleable.FlexboxLayout_dividerDrawableHorizontal);
+        if (drawableHorizontal != null) {
+            setDividerDrawableHorizontal(drawableHorizontal);
+        }
+        Drawable drawableVertical = a
+                .getDrawable(R.styleable.FlexboxLayout_dividerDrawableVertical);
+        if (drawableVertical != null) {
+            setDividerDrawableVertical(drawableVertical);
+        }
+        int dividerMode = a.getInt(R.styleable.FlexboxLayout_showDivider, SHOW_DIVIDER_NONE);
+        if (dividerMode != SHOW_DIVIDER_NONE) {
+            mShowDividerVertical = dividerMode;
+            mShowDividerHorizontal = dividerMode;
+        }
+        int dividerModeVertical = a
+                .getInt(R.styleable.FlexboxLayout_showDividerVertical, SHOW_DIVIDER_NONE);
+        if (dividerModeVertical != SHOW_DIVIDER_NONE) {
+            mShowDividerVertical = dividerModeVertical;
+        }
+        int dividerModeHorizontal = a
+                .getInt(R.styleable.FlexboxLayout_showDividerHorizontal, SHOW_DIVIDER_NONE);
+        if (dividerModeHorizontal != SHOW_DIVIDER_NONE) {
+            mShowDividerHorizontal = dividerModeHorizontal;
+        }
+        a.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (mOrderCache == null) {
+            mOrderCache = new SparseIntArray(getChildCount());
+        }
+        if (mFlexboxHelper.isOrderChangedFromLastMeasurement(mOrderCache)) {
+            mReorderedIndices = mFlexboxHelper.createReorderedIndices(mOrderCache);
+        }
+
+        // TODO: Only calculate the children views which are affected from the last measure.
+
+        switch (mFlexDirection) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                measureHorizontal(widthMeasureSpec, heightMeasureSpec);
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                measureVertical(widthMeasureSpec, heightMeasureSpec);
+                break;
+            default:
+                throw new IllegalStateException(
+                        "Invalid value for the flex direction is set: " + mFlexDirection);
+        }
+    }
+
+    @Override
+    public int getFlexItemCount() {
+        return getChildCount();
+    }
+
+    @Override
+    public View getFlexItemAt(int index) {
+        return getChildAt(index);
+    }
+
+    /**
+     * Returns a View, which is reordered by taking {@link LayoutParams#mOrder} parameters
+     * into account.
+     *
+     * @param index the index of the view
+     * @return the reordered view, which {@link LayoutParams@order} is taken into account.
+     * If the index is negative or out of bounds of the number of contained views,
+     * returns {@code null}.
+     */
+    public View getReorderedChildAt(int index) {
+        if (index < 0 || index >= mReorderedIndices.length) {
+            return null;
+        }
+        return getChildAt(mReorderedIndices[index]);
+    }
+
+    @Override
+    public View getReorderedFlexItemAt(int index) {
+        return getReorderedChildAt(index);
+    }
+
+    @Override
+    public void addView(View child, int index, ViewGroup.LayoutParams params) {
+        if (mOrderCache == null) {
+            mOrderCache = new SparseIntArray(getChildCount());
+        }
+        // Create an array for the reordered indices before the View is added in the parent
+        // ViewGroup since otherwise reordered indices won't be in effect before the
+        // FlexboxLayout's onMeasure is called.
+        // Because requestLayout is requested in the super.addView method.
+        mReorderedIndices = mFlexboxHelper
+                .createReorderedIndices(child, index, params, mOrderCache);
+        super.addView(child, index, params);
+    }
+
+    /**
+     * Sub method for {@link #onMeasure(int, int)}, when the main axis direction is horizontal
+     * (either left to right or right to left).
+     *
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @see #onMeasure(int, int)
+     * @see #setFlexDirection(int)
+     * @see #setFlexWrap(int)
+     * @see #setAlignItems(int)
+     * @see #setAlignContent(int)
+     */
+    private void measureHorizontal(int widthMeasureSpec, int heightMeasureSpec) {
+        mFlexLines.clear();
+
+        mFlexLinesResult.reset();
+        mFlexboxHelper
+                .calculateHorizontalFlexLines(mFlexLinesResult, widthMeasureSpec,
+                        heightMeasureSpec);
+        mFlexLines = mFlexLinesResult.mFlexLines;
+
+        mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec);
+
+        // TODO: Consider the case any individual child's mAlignSelf is set to ALIGN_SELF_BASELINE
+        if (mAlignItems == AlignItems.BASELINE) {
+            for (FlexLine flexLine : mFlexLines) {
+                // The largest height value that also take the baseline shift into account
+                int largestHeightInLine = Integer.MIN_VALUE;
+                for (int i = 0; i < flexLine.mItemCount; i++) {
+                    int viewIndex = flexLine.mFirstIndex + i;
+                    View child = getReorderedChildAt(viewIndex);
+                    if (child == null || child.getVisibility() == View.GONE) {
+                        continue;
+                    }
+                    LayoutParams lp = (LayoutParams) child.getLayoutParams();
+                    if (mFlexWrap != FlexWrap.WRAP_REVERSE) {
+                        int marginTop = flexLine.mMaxBaseline - child.getBaseline();
+                        marginTop = Math.max(marginTop, lp.topMargin);
+                        largestHeightInLine = Math.max(largestHeightInLine,
+                                child.getMeasuredHeight() + marginTop + lp.bottomMargin);
+                    } else {
+                        int marginBottom = flexLine.mMaxBaseline - child.getMeasuredHeight() +
+                                child.getBaseline();
+                        marginBottom = Math.max(marginBottom, lp.bottomMargin);
+                        largestHeightInLine = Math.max(largestHeightInLine,
+                                child.getMeasuredHeight() + lp.topMargin + marginBottom);
+                    }
+                }
+                flexLine.mCrossSize = largestHeightInLine;
+            }
+        }
+
+        mFlexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec,
+                getPaddingTop() + getPaddingBottom());
+        // Now cross size for each flex line is determined.
+        // Expand the views if alignItems (or mAlignSelf in each child view) is set to stretch
+        mFlexboxHelper.stretchViews();
+        setMeasuredDimensionForFlex(mFlexDirection, widthMeasureSpec, heightMeasureSpec,
+                mFlexLinesResult.mChildState);
+    }
+
+    /**
+     * Sub method for {@link #onMeasure(int, int)} when the main axis direction is vertical
+     * (either from top to bottom or bottom to top).
+     *
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @see #onMeasure(int, int)
+     * @see #setFlexDirection(int)
+     * @see #setFlexWrap(int)
+     * @see #setAlignItems(int)
+     * @see #setAlignContent(int)
+     */
+    private void measureVertical(int widthMeasureSpec, int heightMeasureSpec) {
+        mFlexLines.clear();
+        mFlexLinesResult.reset();
+        mFlexboxHelper.calculateVerticalFlexLines(mFlexLinesResult, widthMeasureSpec,
+                heightMeasureSpec);
+        mFlexLines = mFlexLinesResult.mFlexLines;
+
+        mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec);
+        mFlexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec,
+                getPaddingLeft() + getPaddingRight());
+        // Now cross size for each flex line is determined.
+        // Expand the views if alignItems (or mAlignSelf in each child view) is set to stretch
+        mFlexboxHelper.stretchViews();
+        setMeasuredDimensionForFlex(mFlexDirection, widthMeasureSpec, heightMeasureSpec,
+                mFlexLinesResult.mChildState);
+    }
+
+    /**
+     * Set this FlexboxLayouts' width and height depending on the calculated size of main axis and
+     * cross axis.
+     *
+     * @param flexDirection     the value of the flex direction
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @param childState        the child state of the View
+     * @see #getFlexDirection()
+     * @see #setFlexDirection(int)
+     */
+    private void setMeasuredDimensionForFlex(@FlexDirection int flexDirection, int widthMeasureSpec,
+            int heightMeasureSpec, int childState) {
+        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+        int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+        int calculatedMaxHeight;
+        int calculatedMaxWidth;
+        switch (flexDirection) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                calculatedMaxHeight = getSumOfCrossSize() + getPaddingTop()
+                        + getPaddingBottom();
+                calculatedMaxWidth = getLargestMainSize();
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                calculatedMaxHeight = getLargestMainSize();
+                calculatedMaxWidth = getSumOfCrossSize() + getPaddingLeft() + getPaddingRight();
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid flex direction: " + flexDirection);
+        }
+
+        int widthSizeAndState;
+        switch (widthMode) {
+            case MeasureSpec.EXACTLY:
+                if (widthSize < calculatedMaxWidth) {
+                    childState = View
+                            .combineMeasuredStates(childState, View.MEASURED_STATE_TOO_SMALL);
+                }
+                widthSizeAndState = View.resolveSizeAndState(widthSize, widthMeasureSpec,
+                        childState);
+                break;
+            case MeasureSpec.AT_MOST: {
+                if (widthSize < calculatedMaxWidth) {
+                    childState = View
+                            .combineMeasuredStates(childState, View.MEASURED_STATE_TOO_SMALL);
+                } else {
+                    widthSize = calculatedMaxWidth;
+                }
+                widthSizeAndState = View.resolveSizeAndState(widthSize, widthMeasureSpec,
+                        childState);
+                break;
+            }
+            case MeasureSpec.UNSPECIFIED: {
+                widthSizeAndState = View
+                        .resolveSizeAndState(calculatedMaxWidth, widthMeasureSpec, childState);
+                break;
+            }
+            default:
+                throw new IllegalStateException("Unknown width mode is set: " + widthMode);
+        }
+        int heightSizeAndState;
+        switch (heightMode) {
+            case MeasureSpec.EXACTLY:
+                if (heightSize < calculatedMaxHeight) {
+                    childState = View.combineMeasuredStates(childState,
+                            View.MEASURED_STATE_TOO_SMALL
+                                    >> View.MEASURED_HEIGHT_STATE_SHIFT);
+                }
+                heightSizeAndState = View.resolveSizeAndState(heightSize, heightMeasureSpec,
+                        childState);
+                break;
+            case MeasureSpec.AT_MOST: {
+                if (heightSize < calculatedMaxHeight) {
+                    childState = View.combineMeasuredStates(childState,
+                            View.MEASURED_STATE_TOO_SMALL
+                                    >> View.MEASURED_HEIGHT_STATE_SHIFT);
+                } else {
+                    heightSize = calculatedMaxHeight;
+                }
+                heightSizeAndState = View.resolveSizeAndState(heightSize, heightMeasureSpec,
+                        childState);
+                break;
+            }
+            case MeasureSpec.UNSPECIFIED: {
+                heightSizeAndState = View.resolveSizeAndState(calculatedMaxHeight,
+                        heightMeasureSpec, childState);
+                break;
+            }
+            default:
+                throw new IllegalStateException("Unknown height mode is set: " + heightMode);
+        }
+        setMeasuredDimension(widthSizeAndState, heightSizeAndState);
+    }
+
+    @Override
+    public int getLargestMainSize() {
+        int largestSize = Integer.MIN_VALUE;
+        for (FlexLine flexLine : mFlexLines) {
+            largestSize = Math.max(largestSize, flexLine.mMainSize);
+        }
+        return largestSize;
+    }
+
+    @Override
+    public int getSumOfCrossSize() {
+        int sum = 0;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+
+            // Judge if the beginning or middle dividers are required
+            if (hasDividerBeforeFlexLine(i)) {
+                if (isMainAxisDirectionHorizontal()) {
+                    sum += mDividerHorizontalHeight;
+                } else {
+                    sum += mDividerVerticalWidth;
+                }
+            }
+
+            // Judge if the end divider is required
+            if (hasEndDividerAfterFlexLine(i)) {
+                if (isMainAxisDirectionHorizontal()) {
+                    sum += mDividerHorizontalHeight;
+                } else {
+                    sum += mDividerVerticalWidth;
+                }
+            }
+            sum += flexLine.mCrossSize;
+        }
+        return sum;
+    }
+
+    @Override
+    public boolean isMainAxisDirectionHorizontal() {
+        return mFlexDirection == FlexDirection.ROW || mFlexDirection == FlexDirection.ROW_REVERSE;
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        int layoutDirection = ViewCompat.getLayoutDirection(this);
+        boolean isRtl;
+        switch (mFlexDirection) {
+            case FlexDirection.ROW:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                layoutHorizontal(isRtl, left, top, right, bottom);
+                break;
+            case FlexDirection.ROW_REVERSE:
+                isRtl = layoutDirection != ViewCompat.LAYOUT_DIRECTION_RTL;
+                layoutHorizontal(isRtl, left, top, right, bottom);
+                break;
+            case FlexDirection.COLUMN:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                layoutVertical(isRtl, false, left, top, right, bottom);
+                break;
+            case FlexDirection.COLUMN_REVERSE:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                layoutVertical(isRtl, true, left, top, right, bottom);
+                break;
+            default:
+                throw new IllegalStateException("Invalid flex direction is set: " + mFlexDirection);
+        }
+    }
+
+    /**
+     * Sub method for {@link #onLayout(boolean, int, int, int, int)} when the
+     * {@link #mFlexDirection} is either {@link FlexDirection#ROW} or
+     * {@link FlexDirection#ROW_REVERSE}.
+     *
+     * @param isRtl  {@code true} if the horizontal layout direction is right to left, {@code
+     *               false} otherwise.
+     * @param left   the left position of this View
+     * @param top    the top position of this View
+     * @param right  the right position of this View
+     * @param bottom the bottom position of this View
+     * @see #getFlexWrap()
+     * @see #setFlexWrap(int)
+     * @see #getJustifyContent()
+     * @see #setJustifyContent(int)
+     * @see #getAlignItems()
+     * @see #setAlignItems(int)
+     * @see LayoutParams#mAlignSelf
+     */
+    private void layoutHorizontal(boolean isRtl, int left, int top, int right, int bottom) {
+        int paddingLeft = getPaddingLeft();
+        int paddingRight = getPaddingRight();
+        // Use float to reduce the round error that may happen in when justifyContent ==
+        // SPACE_BETWEEN or SPACE_AROUND
+        float childLeft;
+
+        int height = bottom - top;
+        int width = right - left;
+        // childBottom is used if the mFlexWrap is WRAP_REVERSE otherwise
+        // childTop is used to align the vertical position of the children views.
+        int childBottom = height - getPaddingBottom();
+        int childTop = getPaddingTop();
+
+        // Used only for RTL layout
+        // Use float to reduce the round error that may happen in when justifyContent ==
+        // SPACE_BETWEEN or SPACE_AROUND
+        float childRight;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            if (hasDividerBeforeFlexLine(i)) {
+                childBottom -= mDividerHorizontalHeight;
+                childTop += mDividerHorizontalHeight;
+            }
+            float spaceBetweenItem = 0f;
+            switch (mJustifyContent) {
+                case JustifyContent.FLEX_START:
+                    childLeft = paddingLeft;
+                    childRight = width - paddingRight;
+                    break;
+                case JustifyContent.FLEX_END:
+                    childLeft = width - flexLine.mMainSize + paddingRight;
+                    childRight = flexLine.mMainSize - paddingLeft;
+                    break;
+                case JustifyContent.CENTER:
+                    childLeft = paddingLeft + (width - flexLine.mMainSize) / 2f;
+                    childRight = width - paddingRight - (width - flexLine.mMainSize) / 2f;
+                    break;
+                case JustifyContent.SPACE_AROUND: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (width - flexLine.mMainSize)
+                                / (float) visibleCount;
+                    }
+                    childLeft = paddingLeft + spaceBetweenItem / 2f;
+                    childRight = width - paddingRight - spaceBetweenItem / 2f;
+                    break;
+                }
+                case JustifyContent.SPACE_BETWEEN: {
+                    childLeft = paddingLeft;
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    float denominator = visibleCount != 1 ? visibleCount - 1 : 1f;
+                    spaceBetweenItem = (width - flexLine.mMainSize) / denominator;
+                    childRight = width - paddingRight;
+                    break;
+                }
+                case JustifyContent.SPACE_EVENLY: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (width - flexLine.mMainSize)
+                                / (float) (visibleCount + 1);
+                    }
+                    childLeft = paddingLeft + spaceBetweenItem;
+                    childRight = width - paddingRight - spaceBetweenItem;
+                    break;
+                }
+                default:
+                    throw new IllegalStateException(
+                            "Invalid justifyContent is set: " + mJustifyContent);
+            }
+            spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int index = flexLine.mFirstIndex + j;
+                View child = getReorderedChildAt(index);
+                if (child == null || child.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = ((LayoutParams) child.getLayoutParams());
+                childLeft += lp.leftMargin;
+                childRight -= lp.rightMargin;
+                int beforeDividerLength = 0;
+                int endDividerLength = 0;
+                if (hasDividerBeforeChildAtAlongMainAxis(index, j)) {
+                    beforeDividerLength = mDividerVerticalWidth;
+                    childLeft += beforeDividerLength;
+                    childRight -= beforeDividerLength;
+                }
+                if (j == flexLine.mItemCount - 1 && (mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                    endDividerLength = mDividerVerticalWidth;
+                }
+
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    if (isRtl) {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childRight) - child.getMeasuredWidth(),
+                                childBottom - child.getMeasuredHeight(), Math.round(childRight),
+                                childBottom);
+                    } else {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childLeft), childBottom - child.getMeasuredHeight(),
+                                Math.round(childLeft) + child.getMeasuredWidth(), childBottom);
+                    }
+                } else {
+                    if (isRtl) {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childRight) - child.getMeasuredWidth(),
+                                childTop, Math.round(childRight),
+                                childTop + child.getMeasuredHeight());
+                    } else {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childLeft), childTop,
+                                Math.round(childLeft) + child.getMeasuredWidth(),
+                                childTop + child.getMeasuredHeight());
+                    }
+                }
+                childLeft += child.getMeasuredWidth() + spaceBetweenItem + lp.rightMargin;
+                childRight -= child.getMeasuredWidth() + spaceBetweenItem + lp.leftMargin;
+
+                if (isRtl) {
+                    flexLine.updatePositionFromView(child, /*leftDecoration*/endDividerLength, 0,
+                            /*rightDecoration*/ beforeDividerLength, 0);
+                } else {
+                    flexLine.updatePositionFromView(child, /*leftDecoration*/beforeDividerLength, 0,
+                            /*rightDecoration*/ endDividerLength, 0);
+                }
+            }
+            childTop += flexLine.mCrossSize;
+            childBottom -= flexLine.mCrossSize;
+        }
+    }
+
+    /**
+     * Sub method for {@link #onLayout(boolean, int, int, int, int)} when the
+     * {@link #mFlexDirection} is either {@link FlexDirection#COLUMN} or
+     * {@link FlexDirection#COLUMN_REVERSE}.
+     *
+     * @param isRtl           {@code true} if the horizontal layout direction is right to left,
+     *                        {@code false}
+     *                        otherwise
+     * @param fromBottomToTop {@code true} if the layout direction is bottom to top, {@code false}
+     *                        otherwise
+     * @param left            the left position of this View
+     * @param top             the top position of this View
+     * @param right           the right position of this View
+     * @param bottom          the bottom position of this View
+     * @see #getFlexWrap()
+     * @see #setFlexWrap(int)
+     * @see #getJustifyContent()
+     * @see #setJustifyContent(int)
+     * @see #getAlignItems()
+     * @see #setAlignItems(int)
+     * @see LayoutParams#mAlignSelf
+     */
+    private void layoutVertical(boolean isRtl, boolean fromBottomToTop, int left, int top,
+            int right, int bottom) {
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+
+        int paddingRight = getPaddingRight();
+        int childLeft = getPaddingLeft();
+
+        int width = right - left;
+        int height = bottom - top;
+        // childRight is used if the mFlexWrap is WRAP_REVERSE otherwise
+        // childLeft is used to align the horizontal position of the children views.
+        int childRight = width - paddingRight;
+
+        // Use float to reduce the round error that may happen in when justifyContent ==
+        // SPACE_BETWEEN or SPACE_AROUND
+        float childTop;
+
+        // Used only for if the direction is from bottom to top
+        float childBottom;
+
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            if (hasDividerBeforeFlexLine(i)) {
+                childLeft += mDividerVerticalWidth;
+                childRight -= mDividerVerticalWidth;
+            }
+            float spaceBetweenItem = 0f;
+            switch (mJustifyContent) {
+                case JustifyContent.FLEX_START:
+                    childTop = paddingTop;
+                    childBottom = height - paddingBottom;
+                    break;
+                case JustifyContent.FLEX_END:
+                    childTop = height - flexLine.mMainSize + paddingBottom;
+                    childBottom = flexLine.mMainSize - paddingTop;
+                    break;
+                case JustifyContent.CENTER:
+                    childTop = paddingTop + (height - flexLine.mMainSize) / 2f;
+                    childBottom = height - paddingBottom - (height - flexLine.mMainSize) / 2f;
+                    break;
+                case JustifyContent.SPACE_AROUND: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (height - flexLine.mMainSize)
+                                / (float) visibleCount;
+                    }
+                    childTop = paddingTop + spaceBetweenItem / 2f;
+                    childBottom = height - paddingBottom - spaceBetweenItem / 2f;
+                    break;
+                }
+                case JustifyContent.SPACE_BETWEEN: {
+                    childTop = paddingTop;
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    float denominator = visibleCount != 1 ? visibleCount - 1 : 1f;
+                    spaceBetweenItem = (height - flexLine.mMainSize) / denominator;
+                    childBottom = height - paddingBottom;
+                    break;
+                }
+                case JustifyContent.SPACE_EVENLY: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (height - flexLine.mMainSize)
+                                / (float) (visibleCount + 1);
+                    }
+                    childTop = paddingTop + spaceBetweenItem;
+                    childBottom = height - paddingBottom - spaceBetweenItem;
+                    break;
+                }
+                default:
+                    throw new IllegalStateException(
+                            "Invalid justifyContent is set: " + mJustifyContent);
+            }
+            spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int index = flexLine.mFirstIndex + j;
+                View child = getReorderedChildAt(index);
+                if (child == null || child.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = ((LayoutParams) child.getLayoutParams());
+                childTop += lp.topMargin;
+                childBottom -= lp.bottomMargin;
+                int beforeDividerLength = 0;
+                int endDividerLength = 0;
+                if (hasDividerBeforeChildAtAlongMainAxis(index, j)) {
+                    beforeDividerLength = mDividerHorizontalHeight;
+                    childTop += beforeDividerLength;
+                    childBottom -= beforeDividerLength;
+                }
+                if (j == flexLine.mItemCount - 1
+                        && (mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                    endDividerLength = mDividerHorizontalHeight;
+                }
+                if (isRtl) {
+                    if (fromBottomToTop) {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, true,
+                                childRight - child.getMeasuredWidth(),
+                                Math.round(childBottom) - child.getMeasuredHeight(), childRight,
+                                Math.round(childBottom));
+                    } else {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, true,
+                                childRight - child.getMeasuredWidth(), Math.round(childTop),
+                                childRight, Math.round(childTop) + child.getMeasuredHeight());
+                    }
+                } else {
+                    if (fromBottomToTop) {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, false,
+                                childLeft, Math.round(childBottom) - child.getMeasuredHeight(),
+                                childLeft + child.getMeasuredWidth(), Math.round(childBottom));
+                    } else {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, false,
+                                childLeft, Math.round(childTop),
+                                childLeft + child.getMeasuredWidth(),
+                                Math.round(childTop) + child.getMeasuredHeight());
+                    }
+                }
+                childTop += child.getMeasuredHeight() + spaceBetweenItem + lp.bottomMargin;
+                childBottom -= child.getMeasuredHeight() + spaceBetweenItem + lp.topMargin;
+
+                if (fromBottomToTop) {
+                    flexLine.updatePositionFromView(child, 0, /*topDecoration*/endDividerLength, 0,
+                            /*bottomDecoration*/ beforeDividerLength);
+                } else {
+                    flexLine.updatePositionFromView(child, 0, /*topDecoration*/beforeDividerLength,
+                            0, /*bottomDecoration*/endDividerLength);
+                }
+            }
+            childLeft += flexLine.mCrossSize;
+            childRight -= flexLine.mCrossSize;
+        }
+    }
+
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (mDividerDrawableVertical == null && mDividerDrawableHorizontal == null) {
+            return;
+        }
+        if (mShowDividerHorizontal == SHOW_DIVIDER_NONE
+                && mShowDividerVertical == SHOW_DIVIDER_NONE) {
+            return;
+        }
+
+        int layoutDirection = ViewCompat.getLayoutDirection(this);
+        boolean isRtl;
+        boolean fromBottomToTop = false;
+        switch (mFlexDirection) {
+            case FlexDirection.ROW:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    fromBottomToTop = true;
+                }
+                drawDividersHorizontal(canvas, isRtl, fromBottomToTop);
+                break;
+            case FlexDirection.ROW_REVERSE:
+                isRtl = layoutDirection != ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    fromBottomToTop = true;
+                }
+                drawDividersHorizontal(canvas, isRtl, fromBottomToTop);
+                break;
+            case FlexDirection.COLUMN:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                drawDividersVertical(canvas, isRtl, false);
+                break;
+            case FlexDirection.COLUMN_REVERSE:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                drawDividersVertical(canvas, isRtl, true);
+                break;
+        }
+    }
+
+    /**
+     * Sub method for {@link #onDraw(Canvas)} when the main axis direction is horizontal
+     * ({@link #mFlexDirection} is either of {@link FlexDirection#ROW} or
+     * {@link FlexDirection#ROW_REVERSE}.
+     *
+     * @param canvas          the canvas on which the background will be drawn
+     * @param isRtl           {@code true} when the horizontal layout direction is right to left,
+     *                        {@code false} otherwise
+     * @param fromBottomToTop {@code true} when the vertical layout direction is bottom to top,
+     *                        {@code false} otherwise
+     */
+    private void drawDividersHorizontal(Canvas canvas, boolean isRtl, boolean fromBottomToTop) {
+        int paddingLeft = getPaddingLeft();
+        int paddingRight = getPaddingRight();
+        int horizontalDividerLength = Math.max(0, getWidth() - paddingRight - paddingLeft);
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int viewIndex = flexLine.mFirstIndex + j;
+                View view = getReorderedChildAt(viewIndex);
+                if (view == null || view.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = (LayoutParams) view.getLayoutParams();
+
+                // Judge if the beginning or middle divider is needed
+                if (hasDividerBeforeChildAtAlongMainAxis(viewIndex, j)) {
+                    int dividerLeft;
+                    if (isRtl) {
+                        dividerLeft = view.getRight() + lp.rightMargin;
+                    } else {
+                        dividerLeft = view.getLeft() - lp.leftMargin - mDividerVerticalWidth;
+                    }
+
+                    drawVerticalDivider(canvas, dividerLeft, flexLine.mTop, flexLine.mCrossSize);
+                }
+
+                // Judge if the end divider is needed
+                if (j == flexLine.mItemCount - 1) {
+                    if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                        int dividerLeft;
+                        if (isRtl) {
+                            dividerLeft = view.getLeft() - lp.leftMargin - mDividerVerticalWidth;
+                        } else {
+                            dividerLeft = view.getRight() + lp.rightMargin;
+                        }
+
+                        drawVerticalDivider(canvas, dividerLeft, flexLine.mTop,
+                                flexLine.mCrossSize);
+                    }
+                }
+            }
+
+            // Judge if the beginning or middle dividers are needed before the flex line
+            if (hasDividerBeforeFlexLine(i)) {
+                int horizontalDividerTop;
+                if (fromBottomToTop) {
+                    horizontalDividerTop = flexLine.mBottom;
+                } else {
+                    horizontalDividerTop = flexLine.mTop - mDividerHorizontalHeight;
+                }
+                drawHorizontalDivider(canvas, paddingLeft, horizontalDividerTop,
+                        horizontalDividerLength);
+            }
+            // Judge if the end divider is needed before the flex line
+            if (hasEndDividerAfterFlexLine(i)) {
+                if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                    int horizontalDividerTop;
+                    if (fromBottomToTop) {
+                        horizontalDividerTop = flexLine.mTop - mDividerHorizontalHeight;
+                    } else {
+                        horizontalDividerTop = flexLine.mBottom;
+                    }
+                    drawHorizontalDivider(canvas, paddingLeft, horizontalDividerTop,
+                            horizontalDividerLength);
+                }
+            }
+        }
+    }
+
+    /**
+     * Sub method for {@link #onDraw(Canvas)} when the main axis direction is vertical
+     * ({@link #mFlexDirection} is either of {@link FlexDirection#COLUMN} or
+     * {@link FlexDirection#COLUMN_REVERSE}.
+     *
+     * @param canvas          the canvas on which the background will be drawn
+     * @param isRtl           {@code true} when the horizontal layout direction is right to left,
+     *                        {@code false} otherwise
+     * @param fromBottomToTop {@code true} when the vertical layout direction is bottom to top,
+     *                        {@code false} otherwise
+     */
+    private void drawDividersVertical(Canvas canvas, boolean isRtl, boolean fromBottomToTop) {
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+        int verticalDividerLength = Math.max(0, getHeight() - paddingBottom - paddingTop);
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+
+            // Draw horizontal dividers if needed
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int viewIndex = flexLine.mFirstIndex + j;
+                View view = getReorderedChildAt(viewIndex);
+                if (view == null || view.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = (LayoutParams) view.getLayoutParams();
+
+                // Judge if the beginning or middle divider is needed
+                if (hasDividerBeforeChildAtAlongMainAxis(viewIndex, j)) {
+                    int dividerTop;
+                    if (fromBottomToTop) {
+                        dividerTop = view.getBottom() + lp.bottomMargin;
+                    } else {
+                        dividerTop = view.getTop() - lp.topMargin - mDividerHorizontalHeight;
+                    }
+
+                    drawHorizontalDivider(canvas, flexLine.mLeft, dividerTop, flexLine.mCrossSize);
+                }
+
+                // Judge if the end divider is needed
+                if (j == flexLine.mItemCount - 1) {
+                    if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                        int dividerTop;
+                        if (fromBottomToTop) {
+                            dividerTop = view.getTop() - lp.topMargin - mDividerHorizontalHeight;
+                        } else {
+                            dividerTop = view.getBottom() + lp.bottomMargin;
+                        }
+
+                        drawHorizontalDivider(canvas, flexLine.mLeft, dividerTop,
+                                flexLine.mCrossSize);
+                    }
+                }
+            }
+
+            // Judge if the beginning or middle dividers are needed before the flex line
+            if (hasDividerBeforeFlexLine(i)) {
+                int verticalDividerLeft;
+                if (isRtl) {
+                    verticalDividerLeft = flexLine.mRight;
+                } else {
+                    verticalDividerLeft = flexLine.mLeft - mDividerVerticalWidth;
+                }
+                drawVerticalDivider(canvas, verticalDividerLeft, paddingTop,
+                        verticalDividerLength);
+            }
+            if (hasEndDividerAfterFlexLine(i)) {
+                if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                    int verticalDividerLeft;
+                    if (isRtl) {
+                        verticalDividerLeft = flexLine.mLeft - mDividerVerticalWidth;
+                    } else {
+                        verticalDividerLeft = flexLine.mRight;
+                    }
+                    drawVerticalDivider(canvas, verticalDividerLeft, paddingTop,
+                            verticalDividerLength);
+                }
+            }
+        }
+    }
+
+    private void drawVerticalDivider(Canvas canvas, int left, int top, int length) {
+        if (mDividerDrawableVertical == null) {
+            return;
+        }
+        mDividerDrawableVertical.setBounds(left, top, left + mDividerVerticalWidth, top + length);
+        mDividerDrawableVertical.draw(canvas);
+    }
+
+    private void drawHorizontalDivider(Canvas canvas, int left, int top, int length) {
+        if (mDividerDrawableHorizontal == null) {
+            return;
+        }
+        mDividerDrawableHorizontal
+                .setBounds(left, top, left + length, top + mDividerHorizontalHeight);
+        mDividerDrawableHorizontal.draw(canvas);
+    }
+
+    @Override
+    protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+        return p instanceof FlexboxLayout.LayoutParams;
+    }
+
+    @Override
+    public LayoutParams generateLayoutParams(AttributeSet attrs) {
+        return new FlexboxLayout.LayoutParams(getContext(), attrs);
+    }
+
+    @Override
+    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {
+        if (lp instanceof FlexboxLayout.LayoutParams) {
+            return new FlexboxLayout.LayoutParams((FlexboxLayout.LayoutParams) lp);
+        } else if (lp instanceof MarginLayoutParams) {
+            return new FlexboxLayout.LayoutParams((MarginLayoutParams) lp);
+        }
+        return new LayoutParams(lp);
+    }
+
+    @FlexDirection
+    @Override
+    public int getFlexDirection() {
+        return mFlexDirection;
+    }
+
+    @Override
+    public void setFlexDirection(@FlexDirection int flexDirection) {
+        if (mFlexDirection != flexDirection) {
+            mFlexDirection = flexDirection;
+            requestLayout();
+        }
+    }
+
+    @FlexWrap
+    @Override
+    public int getFlexWrap() {
+        return mFlexWrap;
+    }
+
+    @Override
+    public void setFlexWrap(@FlexWrap int flexWrap) {
+        if (mFlexWrap != flexWrap) {
+            mFlexWrap = flexWrap;
+            requestLayout();
+        }
+    }
+
+    @JustifyContent
+    @Override
+    public int getJustifyContent() {
+        return mJustifyContent;
+    }
+
+    @Override
+    public void setJustifyContent(@JustifyContent int justifyContent) {
+        if (mJustifyContent != justifyContent) {
+            mJustifyContent = justifyContent;
+            requestLayout();
+        }
+    }
+
+    @AlignItems
+    @Override
+    public int getAlignItems() {
+        return mAlignItems;
+    }
+
+    @Override
+    public void setAlignItems(@AlignItems int alignItems) {
+        if (mAlignItems != alignItems) {
+            mAlignItems = alignItems;
+            requestLayout();
+        }
+    }
+
+    @AlignContent
+    @Override
+    public int getAlignContent() {
+        return mAlignContent;
+    }
+
+    @Override
+    public void setAlignContent(@AlignContent int alignContent) {
+        if (mAlignContent != alignContent) {
+            mAlignContent = alignContent;
+            requestLayout();
+        }
+    }
+
+    @Override
+    public int getMaxLine() {
+        return mMaxLine;
+    }
+
+    @Override
+    public void setMaxLine(int maxLine) {
+        if (mMaxLine != maxLine) {
+            mMaxLine = maxLine;
+            requestLayout();
+        }
+    }
+
+    /**
+     * @return the flex lines composing this flex container. This method returns a copy of the
+     * original list excluding a dummy flex line (flex line that doesn't have any flex items in it
+     * but used for the alignment along the cross axis).
+     * Thus any changes of the returned list are not reflected to the original list.
+     */
+    @Override
+    public List<FlexLine> getFlexLines() {
+        List<FlexLine> result = new ArrayList<>(mFlexLines.size());
+        for (FlexLine flexLine : mFlexLines) {
+            if (flexLine.getItemCountNotGone() == 0) {
+                continue;
+            }
+            result.add(flexLine);
+        }
+        return result;
+    }
+
+    @Override
+    public int getDecorationLengthMainAxis(View view, int index, int indexInFlexLine) {
+        int decorationLength = 0;
+        if (isMainAxisDirectionHorizontal()) {
+            if (hasDividerBeforeChildAtAlongMainAxis(index, indexInFlexLine)) {
+                decorationLength += mDividerVerticalWidth;
+            }
+            if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                decorationLength += mDividerVerticalWidth;
+            }
+        } else {
+            if (hasDividerBeforeChildAtAlongMainAxis(index, indexInFlexLine)) {
+                decorationLength += mDividerHorizontalHeight;
+            }
+            if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                decorationLength += mDividerHorizontalHeight;
+            }
+        }
+        return decorationLength;
+    }
+
+    @Override
+    public int getDecorationLengthCrossAxis(View view) {
+        // Decoration along the cross axis for an individual view is not supported in the
+        // FlexboxLayout.
+        return 0;
+    }
+
+    @Override
+    public void onNewFlexLineAdded(FlexLine flexLine) {
+        // The size of the end divider isn't added until the flexLine is added to the flex container
+        // take the divider width (or height) into account when adding the flex line.
+        if (isMainAxisDirectionHorizontal()) {
+            if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                flexLine.mMainSize += mDividerVerticalWidth;
+                flexLine.mDividerLengthInMainSize += mDividerVerticalWidth;
+            }
+        } else {
+            if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                flexLine.mMainSize += mDividerHorizontalHeight;
+                flexLine.mDividerLengthInMainSize += mDividerHorizontalHeight;
+            }
+        }
+    }
+
+    @Override
+    public int getChildWidthMeasureSpec(int widthSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(widthSpec, padding, childDimension);
+    }
+
+    @Override
+    public int getChildHeightMeasureSpec(int heightSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(heightSpec, padding, childDimension);
+    }
+
+    @Override
+    public void onNewFlexItemAdded(View view, int index, int indexInFlexLine, FlexLine flexLine) {
+        // Check if the beginning or middle divider is required for the flex item
+        if (hasDividerBeforeChildAtAlongMainAxis(index, indexInFlexLine)) {
+            if (isMainAxisDirectionHorizontal()) {
+                flexLine.mMainSize += mDividerVerticalWidth;
+                flexLine.mDividerLengthInMainSize += mDividerVerticalWidth;
+            } else {
+                flexLine.mMainSize += mDividerHorizontalHeight;
+                flexLine.mDividerLengthInMainSize += mDividerHorizontalHeight;
+            }
+        }
+    }
+
+    @Override
+    public void setFlexLines(List<FlexLine> flexLines) {
+        mFlexLines = flexLines;
+    }
+
+    @Override
+    public List<FlexLine> getFlexLinesInternal() {
+        return mFlexLines;
+    }
+
+    @Override
+    public void updateViewCache(int position, View view) {
+        // No op
+    }
+
+    /**
+     * @return the horizontal divider drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setDividerDrawableHorizontal(Drawable)
+     */
+    @Nullable
+    @SuppressWarnings("UnusedDeclaration")
+    public Drawable getDividerDrawableHorizontal() {
+        return mDividerDrawableHorizontal;
+    }
+
+    /**
+     * @return the vertical divider drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setDividerDrawableVertical(Drawable)
+     */
+    @Nullable
+    @SuppressWarnings("UnusedDeclaration")
+    public Drawable getDividerDrawableVertical() {
+        return mDividerDrawableVertical;
+    }
+
+    /**
+     * Set a drawable to be used as a divider between items. The drawable is used for both
+     * horizontal and vertical dividers.
+     *
+     * @param divider Drawable that will divide each item for both horizontally and vertically.
+     * @see #setShowDivider(int)
+     */
+    public void setDividerDrawable(Drawable divider) {
+        setDividerDrawableHorizontal(divider);
+        setDividerDrawableVertical(divider);
+    }
+
+    /**
+     * Set a drawable to be used as a horizontal divider between items.
+     *
+     * @param divider Drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setShowDivider(int)
+     * @see #setShowDividerHorizontal(int)
+     */
+    public void setDividerDrawableHorizontal(@Nullable Drawable divider) {
+        if (divider == mDividerDrawableHorizontal) {
+            return;
+        }
+        mDividerDrawableHorizontal = divider;
+        if (divider != null) {
+            mDividerHorizontalHeight = divider.getIntrinsicHeight();
+        } else {
+            mDividerHorizontalHeight = 0;
+        }
+        setWillNotDrawFlag();
+        requestLayout();
+    }
+
+    /**
+     * Set a drawable to be used as a vertical divider between items.
+     *
+     * @param divider Drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setShowDivider(int)
+     * @see #setShowDividerVertical(int)
+     */
+    public void setDividerDrawableVertical(@Nullable Drawable divider) {
+        if (divider == mDividerDrawableVertical) {
+            return;
+        }
+        mDividerDrawableVertical = divider;
+        if (divider != null) {
+            mDividerVerticalWidth = divider.getIntrinsicWidth();
+        } else {
+            mDividerVerticalWidth = 0;
+        }
+        setWillNotDrawFlag();
+        requestLayout();
+    }
+
+    @FlexboxLayout.DividerMode
+    public int getShowDividerVertical() {
+        return mShowDividerVertical;
+    }
+
+    @FlexboxLayout.DividerMode
+    public int getShowDividerHorizontal() {
+        return mShowDividerHorizontal;
+    }
+
+    /**
+     * Set how dividers should be shown between items in this layout. This method sets the
+     * divider mode for both horizontally and vertically.
+     *
+     * @param dividerMode One or more of {@link #SHOW_DIVIDER_BEGINNING},
+     *                    {@link #SHOW_DIVIDER_MIDDLE}, or {@link #SHOW_DIVIDER_END},
+     *                    or {@link #SHOW_DIVIDER_NONE} to show no dividers.
+     * @see #setShowDividerVertical(int)
+     * @see #setShowDividerHorizontal(int)
+     */
+    public void setShowDivider(@DividerMode int dividerMode) {
+        setShowDividerVertical(dividerMode);
+        setShowDividerHorizontal(dividerMode);
+    }
+
+    /**
+     * Set how vertical dividers should be shown between items in this layout
+     *
+     * @param dividerMode One or more of {@link #SHOW_DIVIDER_BEGINNING},
+     *                    {@link #SHOW_DIVIDER_MIDDLE}, or {@link #SHOW_DIVIDER_END},
+     *                    or {@link #SHOW_DIVIDER_NONE} to show no dividers.
+     * @see #setShowDivider(int)
+     */
+    public void setShowDividerVertical(@DividerMode int dividerMode) {
+        if (dividerMode != mShowDividerVertical) {
+            mShowDividerVertical = dividerMode;
+            requestLayout();
+        }
+    }
+
+    /**
+     * Set how horizontal dividers should be shown between items in this layout.
+     *
+     * @param dividerMode One or more of {@link #SHOW_DIVIDER_BEGINNING},
+     *                    {@link #SHOW_DIVIDER_MIDDLE}, or {@link #SHOW_DIVIDER_END},
+     *                    or {@link #SHOW_DIVIDER_NONE} to show no dividers.
+     * @see #setShowDivider(int)
+     */
+    public void setShowDividerHorizontal(@DividerMode int dividerMode) {
+        if (dividerMode != mShowDividerHorizontal) {
+            mShowDividerHorizontal = dividerMode;
+            requestLayout();
+        }
+    }
+
+    private void setWillNotDrawFlag() {
+        if (mDividerDrawableHorizontal == null && mDividerDrawableVertical == null) {
+            setWillNotDraw(true);
+        } else {
+            setWillNotDraw(false);
+        }
+    }
+
+    /**
+     * Check if a divider is needed before the view whose indices are passed as arguments.
+     *
+     * @param index           the absolute index of the view to be judged
+     * @param indexInFlexLine the relative index in the flex line where the view
+     *                        belongs
+     * @return {@code true} if a divider is needed, {@code false} otherwise
+     */
+    private boolean hasDividerBeforeChildAtAlongMainAxis(int index, int indexInFlexLine) {
+        if (allViewsAreGoneBefore(index, indexInFlexLine)) {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerVertical & SHOW_DIVIDER_BEGINNING) != 0;
+            } else {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_BEGINNING) != 0;
+            }
+        } else {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerVertical & SHOW_DIVIDER_MIDDLE) != 0;
+            } else {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_MIDDLE) != 0;
+            }
+        }
+    }
+
+    private boolean allViewsAreGoneBefore(int index, int indexInFlexLine) {
+        for (int i = 1; i <= indexInFlexLine; i++) {
+            View view = getReorderedChildAt(index - i);
+            if (view != null && view.getVisibility() != View.GONE) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check if a divider is needed before the flex line whose index is passed as an argument.
+     *
+     * @param flexLineIndex the index of the flex line to be checked
+     * @return {@code true} if a divider is needed, {@code false} otherwise
+     */
+    private boolean hasDividerBeforeFlexLine(int flexLineIndex) {
+        if (flexLineIndex < 0 || flexLineIndex >= mFlexLines.size()) {
+            return false;
+        }
+        if (allFlexLinesAreDummyBefore(flexLineIndex)) {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_BEGINNING) != 0;
+            } else {
+                return (mShowDividerVertical & SHOW_DIVIDER_BEGINNING) != 0;
+            }
+        } else {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_MIDDLE) != 0;
+            } else {
+                return (mShowDividerVertical & SHOW_DIVIDER_MIDDLE) != 0;
+            }
+        }
+    }
+
+    private boolean allFlexLinesAreDummyBefore(int flexLineIndex) {
+        for (int i = 0; i < flexLineIndex; i++) {
+            if (mFlexLines.get(i).getItemCountNotGone() > 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check if a end divider is needed after the flex line whose index is passed as an argument.
+     *
+     * @param flexLineIndex the index of the flex line to be checked
+     * @return {@code true} if a divider is needed, {@code false} otherwise
+     */
+    private boolean hasEndDividerAfterFlexLine(int flexLineIndex) {
+        if (flexLineIndex < 0 || flexLineIndex >= mFlexLines.size()) {
+            return false;
+        }
+
+        for (int i = flexLineIndex + 1; i < mFlexLines.size(); i++) {
+            if (mFlexLines.get(i).getItemCountNotGone() > 0) {
+                return false;
+            }
+        }
+        if (isMainAxisDirectionHorizontal()) {
+            return (mShowDividerHorizontal & SHOW_DIVIDER_END) != 0;
+        } else {
+            return (mShowDividerVertical & SHOW_DIVIDER_END) != 0;
+        }
+
+    }
+
+    /**
+     * Per child parameters for children views of the {@link FlexboxLayout}.
+     *
+     * Note that some parent fields (which are not primitive nor a class implements
+     * {@link Parcelable}) are not included as the stored/restored fields after this class
+     * is serialized/de-serialized as an {@link Parcelable}.
+     */
+    public static class LayoutParams extends ViewGroup.MarginLayoutParams implements FlexItem {
+
+        /**
+         * @see FlexItem#getOrder()
+         */
+        private int mOrder = FlexItem.ORDER_DEFAULT;
+
+        /**
+         * @see FlexItem#getFlexGrow()
+         */
+        private float mFlexGrow = FlexItem.FLEX_GROW_DEFAULT;
+
+        /**
+         * @see FlexItem#getFlexShrink()
+         */
+        private float mFlexShrink = FlexItem.FLEX_SHRINK_DEFAULT;
+
+        /**
+         * @see FlexItem#getAlignSelf()
+         */
+        private int mAlignSelf = AlignSelf.AUTO;
+
+        /**
+         * @see FlexItem#getFlexBasisPercent()
+         */
+        private float mFlexBasisPercent = FlexItem.FLEX_BASIS_PERCENT_DEFAULT;
+
+        /**
+         * @see FlexItem#getMinWidth()
+         */
+        private int mMinWidth = NOT_SET;
+
+        /**
+         * @see FlexItem#getMinHeight()
+         */
+        private int mMinHeight = NOT_SET;
+
+        /**
+         * @see FlexItem#getMaxWidth()
+         */
+        private int mMaxWidth = MAX_SIZE;
+
+        /**
+         * @see FlexItem#getMaxHeight()
+         */
+        private int mMaxHeight = MAX_SIZE;
+
+        /**
+         * @see FlexItem#isWrapBefore()
+         */
+        private boolean mWrapBefore;
+
+        public LayoutParams(Context context, AttributeSet attrs) {
+            super(context, attrs);
+
+            TypedArray a = context
+                    .obtainStyledAttributes(attrs, R.styleable.FlexboxLayout_Layout);
+            mOrder = a.getInt(R.styleable.FlexboxLayout_Layout_layout_order, ORDER_DEFAULT);
+            mFlexGrow = a
+                    .getFloat(R.styleable.FlexboxLayout_Layout_layout_flexGrow, FLEX_GROW_DEFAULT);
+            mFlexShrink = a.getFloat(R.styleable.FlexboxLayout_Layout_layout_flexShrink,
+                    FLEX_SHRINK_DEFAULT);
+            mAlignSelf = a
+                    .getInt(R.styleable.FlexboxLayout_Layout_layout_alignSelf, AlignSelf.AUTO);
+            mFlexBasisPercent = a
+                    .getFraction(R.styleable.FlexboxLayout_Layout_layout_flexBasisPercent, 1, 1,
+                            FLEX_BASIS_PERCENT_DEFAULT);
+            mMinWidth = a
+                    .getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_minWidth, NOT_SET);
+            mMinHeight = a
+                    .getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_minHeight, NOT_SET);
+            mMaxWidth = a.getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_maxWidth,
+                    MAX_SIZE);
+            mMaxHeight = a.getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_maxHeight,
+                    MAX_SIZE);
+            mWrapBefore = a.getBoolean(R.styleable.FlexboxLayout_Layout_layout_wrapBefore, false);
+            a.recycle();
+        }
+
+        public LayoutParams(LayoutParams source) {
+            super(source);
+
+            mOrder = source.mOrder;
+            mFlexGrow = source.mFlexGrow;
+            mFlexShrink = source.mFlexShrink;
+            mAlignSelf = source.mAlignSelf;
+            mFlexBasisPercent = source.mFlexBasisPercent;
+            mMinWidth = source.mMinWidth;
+            mMinHeight = source.mMinHeight;
+            mMaxWidth = source.mMaxWidth;
+            mMaxHeight = source.mMaxHeight;
+            mWrapBefore = source.mWrapBefore;
+        }
+
+        public LayoutParams(ViewGroup.LayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(int width, int height) {
+            super(new ViewGroup.LayoutParams(width, height));
+        }
+
+        public LayoutParams(MarginLayoutParams source) {
+            super(source);
+        }
+
+        @Override
+        public int getWidth() {
+            return width;
+        }
+
+        @Override
+        public void setWidth(int width) {
+            this.width = width;
+        }
+
+        @Override
+        public int getHeight() {
+            return height;
+        }
+
+        @Override
+        public void setHeight(int height) {
+            this.height = height;
+        }
+
+        @Override
+        public int getOrder() {
+            return mOrder;
+        }
+
+        @Override
+        public void setOrder(int order) {
+            mOrder = order;
+        }
+
+        @Override
+        public float getFlexGrow() {
+            return mFlexGrow;
+        }
+
+        @Override
+        public void setFlexGrow(float flexGrow) {
+            this.mFlexGrow = flexGrow;
+        }
+
+        @Override
+        public float getFlexShrink() {
+            return mFlexShrink;
+        }
+
+        @Override
+        public void setFlexShrink(float flexShrink) {
+            this.mFlexShrink = flexShrink;
+        }
+
+        @AlignSelf
+        @Override
+        public int getAlignSelf() {
+            return mAlignSelf;
+        }
+
+        @Override
+        public void setAlignSelf(@AlignSelf int alignSelf) {
+            this.mAlignSelf = alignSelf;
+        }
+
+        @Override
+        public int getMinWidth() {
+            return mMinWidth;
+        }
+
+        @Override
+        public void setMinWidth(int minWidth) {
+            this.mMinWidth = minWidth;
+        }
+
+        @Override
+        public int getMinHeight() {
+            return mMinHeight;
+        }
+
+        @Override
+        public void setMinHeight(int minHeight) {
+            this.mMinHeight = minHeight;
+        }
+
+        @Override
+        public int getMaxWidth() {
+            return mMaxWidth;
+        }
+
+        @Override
+        public void setMaxWidth(int maxWidth) {
+            this.mMaxWidth = maxWidth;
+        }
+
+        @Override
+        public int getMaxHeight() {
+            return mMaxHeight;
+        }
+
+        @Override
+        public void setMaxHeight(int maxHeight) {
+            this.mMaxHeight = maxHeight;
+        }
+
+        @Override
+        public boolean isWrapBefore() {
+            return mWrapBefore;
+        }
+
+        @Override
+        public void setWrapBefore(boolean wrapBefore) {
+            this.mWrapBefore = wrapBefore;
+        }
+
+        @Override
+        public float getFlexBasisPercent() {
+            return mFlexBasisPercent;
+        }
+
+        @Override
+        public void setFlexBasisPercent(float flexBasisPercent) {
+            this.mFlexBasisPercent = flexBasisPercent;
+        }
+
+        @Override
+        public int getMarginLeft() {
+            return leftMargin;
+        }
+
+        @Override
+        public int getMarginTop() {
+            return topMargin;
+        }
+
+        @Override
+        public int getMarginRight() {
+            return rightMargin;
+        }
+
+        @Override
+        public int getMarginBottom() {
+            return bottomMargin;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(this.mOrder);
+            dest.writeFloat(this.mFlexGrow);
+            dest.writeFloat(this.mFlexShrink);
+            dest.writeInt(this.mAlignSelf);
+            dest.writeFloat(this.mFlexBasisPercent);
+            dest.writeInt(this.mMinWidth);
+            dest.writeInt(this.mMinHeight);
+            dest.writeInt(this.mMaxWidth);
+            dest.writeInt(this.mMaxHeight);
+            dest.writeByte(this.mWrapBefore ? (byte) 1 : (byte) 0);
+            dest.writeInt(this.bottomMargin);
+            dest.writeInt(this.leftMargin);
+            dest.writeInt(this.rightMargin);
+            dest.writeInt(this.topMargin);
+            dest.writeInt(this.height);
+            dest.writeInt(this.width);
+        }
+
+        protected LayoutParams(Parcel in) {
+            // Passing a resolved value to resolve a lint warning
+            // height and width are set in this method anyway.
+            super(0, 0);
+            this.mOrder = in.readInt();
+            this.mFlexGrow = in.readFloat();
+            this.mFlexShrink = in.readFloat();
+            this.mAlignSelf = in.readInt();
+            this.mFlexBasisPercent = in.readFloat();
+            this.mMinWidth = in.readInt();
+            this.mMinHeight = in.readInt();
+            this.mMaxWidth = in.readInt();
+            this.mMaxHeight = in.readInt();
+            this.mWrapBefore = in.readByte() != 0;
+            this.bottomMargin = in.readInt();
+            this.leftMargin = in.readInt();
+            this.rightMargin = in.readInt();
+            this.topMargin = in.readInt();
+            this.height = in.readInt();
+            this.width = in.readInt();
+        }
+
+        public static final Parcelable.Creator<LayoutParams> CREATOR
+                = new Parcelable.Creator<LayoutParams>() {
+            @Override
+            public LayoutParams createFromParcel(Parcel source) {
+                return new LayoutParams(source);
+            }
+
+            @Override
+            public LayoutParams[] newArray(int size) {
+                return new LayoutParams[size];
+            }
+        };
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
new file mode 100755
index 0000000..21ea733
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
@@ -0,0 +1,3112 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import static androidx.recyclerview.widget.LinearLayoutManager.INVALID_OFFSET;
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
+
+import android.content.Context;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSmoothScroller;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * LayoutManager for the {@link RecyclerView}. This class is intended to be used within a
+ * {@link RecyclerView} and offers the same capabilities of measure/layout its children
+ * as the {@link FlexboxLayout}.
+ */
+public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements FlexContainer,
+        RecyclerView.SmoothScroller.ScrollVectorProvider {
+
+    private static final String TAG = "FlexboxLayoutManager";
+
+    /**
+     * Temporary Rect instance to be passed to
+     * {@link RecyclerView.LayoutManager#calculateItemDecorationsForChild}
+     * to avoid creating a Rect instance every time.
+     */
+    private static final Rect TEMP_RECT = new Rect();
+
+    private static final boolean DEBUG = false;
+
+    /**
+     * The current value of the {@link FlexDirection}, the default value is {@link
+     * FlexDirection#ROW}.
+     *
+     * @see FlexContainer#getFlexDirection()
+     */
+    private int mFlexDirection;
+
+    /**
+     * The current value of the {@link FlexWrap}, the default value is {@link FlexWrap#WRAP}.
+     *
+     * @see FlexContainer#getFlexWrap()
+     */
+    private int mFlexWrap;
+
+    /**
+     * The current value of the {@link JustifyContent}, the default value is
+     * {@link JustifyContent#FLEX_START}.
+     *
+     * @see FlexContainer#getJustifyContent()
+     */
+    private int mJustifyContent;
+
+    /**
+     * The current value of the {@link AlignItems}, the default value is
+     * {@link AlignItems#STRETCH}.
+     *
+     * @see FlexContainer#getAlignItems()
+     */
+    private int mAlignItems;
+
+    private int mMaxLine = NOT_SET;
+
+    /**
+     * True if the layout direction is right to left, false otherwise.
+     */
+    private boolean mIsRtl;
+
+    /**
+     * True if the layout direction is bottom to top, false otherwise.
+     */
+    private boolean mFromBottomToTop;
+
+    private List<FlexLine> mFlexLines = new ArrayList<>();
+
+    private final FlexboxHelper mFlexboxHelper = new FlexboxHelper(this);
+
+    /**
+     * A snapshot of the {@link RecyclerView.Recycler} instance at a given moment.
+     * It's not guaranteed that this instance has a reference to the latest Recycler.
+     * When you want to use the latest Recycler, use the one passed as an method argument
+     * (such as the one in {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     */
+    private RecyclerView.Recycler mRecycler;
+
+    /**
+     * A snapshot of the {@link RecyclerView.State} instance at a given moment.
+     * It's not guaranteed that this instance has a reference to the latest State.
+     * When you want to use the latest State, use the one passed as an method argument
+     * (such as the one in {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     */
+    private RecyclerView.State mState;
+
+    private LayoutState mLayoutState;
+
+    private AnchorInfo mAnchorInfo = new AnchorInfo();
+
+    /**
+     * {@link OrientationHelper} along cross axis, which will be the primary scrolling direction.
+     * e.g. If the flex direction is set to {@link FlexDirection#ROW} and flex wrap is set to
+     * {@link FlexWrap#WRAP}, the RecyclerView scrolls vertically (along the cross axis).
+     */
+    private OrientationHelper mOrientationHelper;
+
+    /**
+     * {@link OrientationHelper} along the main axis, which will be the secondary scrolling
+     * direction if the size of the main size is larger than the parent of the RecyclerView.
+     */
+    private OrientationHelper mSubOrientationHelper;
+
+    private SavedState mPendingSavedState;
+
+    /**
+     * The position to which the next layout should start from this adapter position.
+     * This value is set either from the {@link #mPendingSavedState} when a configuration change
+     * happens or programmatically such as when the {@link #scrollToPosition(int)} is called.
+     */
+    private int mPendingScrollPosition = NO_POSITION;
+
+    /**
+     * The offset by which the next layout should be offset.
+     */
+    private int mPendingScrollPositionOffset = INVALID_OFFSET;
+
+    /**
+     * The width value used in the last {@link #onLayoutChildren} method.
+     */
+    private int mLastWidth = Integer.MIN_VALUE;
+
+    /**
+     * The height value used in the last {@link #onLayoutChildren} method.
+     */
+    private int mLastHeight = Integer.MIN_VALUE;
+
+    /**
+     * If set to {@code true}, this LayoutManager tries to recycle the children when detached from
+     * the RecyclerView so that recycled views can be reused using RecycledViewPool.
+     */
+    private boolean mRecycleChildrenOnDetach;
+
+    /**
+     * View cache within this LayoutManager. This is used to avoid the same ViewHolder is created
+     * multiple times in the same layout pass (onLayoutChildren or scrollHorizontally or
+     * scrollVertically).
+     * The keys and values in this cache needs to be cleared at the end of each layout pass.
+     */
+    private SparseArray<View> mViewCache = new SparseArray<>();
+
+    private final Context mContext;
+
+    /** The reference to the parent of the RecyclerView */
+    private View mParent;
+
+    /**
+     * Indicates the position that the view position that the flex line which has the view having
+     * this position needs to be recomputed before the next layout.
+     * For example, this is updated when a new View is inserted into the position before the
+     * first visible position.
+     */
+    private int mDirtyPosition = NO_POSITION;
+
+    /**
+     * Used for storing the results of calculation of flex lines to avoid creating a new instance
+     * every time the calculation happens.
+     */
+    private FlexboxHelper.FlexLinesResult mFlexLinesResult = new FlexboxHelper.FlexLinesResult();
+
+    /**
+     * Creates a default FlexboxLayoutManager.
+     */
+    public FlexboxLayoutManager(Context context) {
+        this(context, FlexDirection.ROW, FlexWrap.WRAP);
+    }
+
+    /**
+     * Creates a FlexboxLayoutManager with the flexDirection specified.
+     *
+     * @param flexDirection the flex direction attribute
+     */
+    public FlexboxLayoutManager(Context context, @FlexDirection int flexDirection) {
+        this(context, flexDirection, FlexWrap.WRAP);
+    }
+
+    /**
+     * Creates a FlexboxLayoutManager with the flexDirection and flexWrap attributes specified.
+     *
+     * @param flexDirection the flex direction attribute
+     * @param flexWrap      the flex wrap attribute
+     */
+    public FlexboxLayoutManager(Context context, @FlexDirection int flexDirection,
+            @FlexWrap int flexWrap) {
+        setFlexDirection(flexDirection);
+        setFlexWrap(flexWrap);
+        setAlignItems(AlignItems.STRETCH);
+        mContext = context;
+    }
+
+    /**
+     * Constructor used when layout manager is set in XML by RecyclerView attribute
+     * "layoutManager". No corresponding attributes for the {@code orientation},
+     * {@code reverseLayout} and {@code stackFromEnd} exist in Flexbox, thus map the similar
+     * attributes from Flexbox that behave similarly for each of them.
+     *
+     * {@code android:orientation} maps to the {@link FlexDirection},
+     * HORIZONTAL -> {@link FlexDirection#ROW}, VERTICAL -> {@link FlexDirection#COLUMN}.
+     *
+     * {@code android.support.v7.recyclerview:reverseLayout} reverses the direction of the
+     * {@link FlexDirection}, i.e. if reverseLayout is {@code true}, {@link FlexDirection#ROW} is
+     * changed to {@link FlexDirection#ROW_REVERSE}. Similarly {@link FlexDirection#COLUMN} is
+     * changed to {@link FlexDirection#COLUMN_REVERSE}.
+     */
+    public FlexboxLayoutManager(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        Properties properties = getProperties(context, attrs, defStyleAttr, defStyleRes);
+        switch (properties.orientation) {
+            case LinearLayoutManager.HORIZONTAL:
+                if (properties.reverseLayout) {
+                    setFlexDirection(FlexDirection.ROW_REVERSE);
+                } else {
+                    setFlexDirection(FlexDirection.ROW);
+                }
+                break;
+            case LinearLayoutManager.VERTICAL:
+                if (properties.reverseLayout) {
+                    setFlexDirection(FlexDirection.COLUMN_REVERSE);
+                } else {
+                    setFlexDirection(FlexDirection.COLUMN);
+                }
+                break;
+        }
+        setFlexWrap(FlexWrap.WRAP);
+        setAlignItems(AlignItems.STRETCH);
+        mContext = context;
+    }
+
+    @Override
+    public boolean isAutoMeasureEnabled() {
+        return true;
+    }
+
+    // From here, methods from FlexContainer
+    @FlexDirection
+    @Override
+    public int getFlexDirection() {
+        return mFlexDirection;
+    }
+
+    @Override
+    public void setFlexDirection(@FlexDirection int flexDirection) {
+        if (mFlexDirection != flexDirection) {
+            // Remove the existing views even if the direction changes from
+            // row -> row_reverse or column -> column_reverse to make the item decorations dirty
+            // state
+            removeAllViews();
+            mFlexDirection = flexDirection;
+            mOrientationHelper = null;
+            mSubOrientationHelper = null;
+            clearFlexLines();
+            requestLayout();
+        }
+    }
+
+    @Override
+    @FlexWrap
+    public int getFlexWrap() {
+        return mFlexWrap;
+    }
+
+    @Override
+    public void setFlexWrap(@FlexWrap int flexWrap) {
+        if (flexWrap == FlexWrap.WRAP_REVERSE) {
+            throw new UnsupportedOperationException("wrap_reverse is not supported in "
+                    + "FlexboxLayoutManager");
+        }
+        if (mFlexWrap != flexWrap) {
+            if (mFlexWrap == FlexWrap.NOWRAP || flexWrap == FlexWrap.NOWRAP) {
+                removeAllViews();
+                clearFlexLines();
+            }
+            mFlexWrap = flexWrap;
+            mOrientationHelper = null;
+            mSubOrientationHelper = null;
+            requestLayout();
+        }
+    }
+
+    @JustifyContent
+    @Override
+    public int getJustifyContent() {
+        return mJustifyContent;
+    }
+
+    @Override
+    public void setJustifyContent(@JustifyContent int justifyContent) {
+        if (mJustifyContent != justifyContent) {
+            mJustifyContent = justifyContent;
+            requestLayout();
+        }
+    }
+
+    @AlignItems
+    @Override
+    public int getAlignItems() {
+        return mAlignItems;
+    }
+
+    @Override
+    public void setAlignItems(@AlignItems int alignItems) {
+        if (mAlignItems != alignItems) {
+            if (mAlignItems == AlignItems.STRETCH || alignItems == AlignItems.STRETCH) {
+                removeAllViews();
+                clearFlexLines();
+            }
+            mAlignItems = alignItems;
+            requestLayout();
+        }
+    }
+
+    @AlignContent
+    @Override
+    public int getAlignContent() {
+        return AlignContent.STRETCH;
+    }
+
+    @Override
+    public void setAlignContent(@AlignContent int alignContent) {
+        throw new UnsupportedOperationException("Setting the alignContent in the "
+                + "FlexboxLayoutManager is not supported. Use FlexboxLayout "
+                + "if you need to use this attribute.");
+    }
+
+    @Override
+    public int getMaxLine() {
+        return mMaxLine;
+    }
+
+    @Override
+    public void setMaxLine(int maxLine) {
+        if (mMaxLine != maxLine) {
+            mMaxLine = maxLine;
+            requestLayout();
+        }
+    }
+
+    @Override
+    @NonNull
+    public List<FlexLine> getFlexLines() {
+        List<FlexLine> result = new ArrayList<>(mFlexLines.size());
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            if (flexLine.getItemCount() == 0) {
+                continue;
+            }
+            result.add(flexLine);
+        }
+        return result;
+    }
+
+    @Override
+    public int getDecorationLengthMainAxis(View view, int index, int indexInFlexLine) {
+        if (isMainAxisDirectionHorizontal()) {
+            return getLeftDecorationWidth(view) + getRightDecorationWidth(view);
+        } else {
+            return getTopDecorationHeight(view) + getBottomDecorationHeight(view);
+        }
+    }
+
+    @Override
+    public int getDecorationLengthCrossAxis(View view) {
+        if (isMainAxisDirectionHorizontal()) {
+            return getTopDecorationHeight(view) + getBottomDecorationHeight(view);
+        } else {
+            return getLeftDecorationWidth(view) + getRightDecorationWidth(view);
+        }
+    }
+
+    @Override
+    public void onNewFlexItemAdded(View view, int index, int indexInFlexLine, FlexLine flexLine) {
+        // To avoid creating a new Rect instance every time, passing the same Rect instance
+        // since calculated decorations are assigned to view's LayoutParams inside the
+        // calculateItemDecorationsForChild method anyway.
+        calculateItemDecorationsForChild(view, TEMP_RECT);
+        if (isMainAxisDirectionHorizontal()) {
+            int decorationWidth = getLeftDecorationWidth(view) + getRightDecorationWidth(view);
+            flexLine.mMainSize += decorationWidth;
+            flexLine.mDividerLengthInMainSize += decorationWidth;
+        } else {
+            int decorationHeight = getTopDecorationHeight(view) + getBottomDecorationHeight(view);
+            flexLine.mMainSize += decorationHeight;
+            flexLine.mDividerLengthInMainSize += decorationHeight;
+        }
+    }
+
+    /**
+     * @return the number of flex items contained in the flex container.
+     * This method doesn't always reflect the latest state of the adapter.
+     * If you want to access the latest state of the adapter, use the {@link RecyclerView.State}
+     * instance passed as an argument for some methods (such as
+     * {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     *
+     * This method is used to avoid the implementation of the similar method.
+     * i.e. {@link FlexboxLayoutManager#getChildCount()} returns the child count, but it doesn't
+     * include the children that are detached or scrapped.
+     */
+    @Override
+    public int getFlexItemCount() {
+        return mState.getItemCount();
+    }
+
+    /**
+     * @return the flex item as a view specified as the index.
+     * This method doesn't always return the latest state of the view in the adapter.
+     * If you want to access the latest state, use the {@link RecyclerView.Recycler}
+     * instance passed as an argument for some methods (such as
+     * {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     *
+     * This method is used to avoid the implementation of the similar method.
+     * i.e. {@link FlexboxLayoutManager#getChildAt(int)} returns a view for the given index,
+     * but the index is based on the layout position, not based on the adapter position, which
+     * isn't desired given the usage of this method.
+     */
+    @Override
+    public View getFlexItemAt(int index) {
+        // Look up the cache within the LayoutManager first, since it's the most light operation.
+        View cachedView = mViewCache.get(index);
+        if (cachedView != null) {
+            return cachedView;
+        }
+        return mRecycler.getViewForPosition(index);
+    }
+
+    /**
+     * Returns a View for the given index.
+     * The order attribute ({@link FlexItem#getOrder()}) is not supported by this class since
+     * otherwise all view holders need to be inflated at least once even though only the visible
+     * part of the layout is needed.
+     * Implementing this method just to make this class conform to the
+     * {@link FlexContainer} interface.
+     *
+     * @param index the index of the view
+     * @return the view for the given index.
+     * If the index is negative or out of bounds of the number of contained views,
+     * returns {@code null}.
+     */
+    @Override
+    public View getReorderedFlexItemAt(int index) {
+        return getFlexItemAt(index);
+    }
+
+    @Override
+    public void onNewFlexLineAdded(FlexLine flexLine) {
+        // No op
+    }
+
+    @Override
+    public int getChildWidthMeasureSpec(int widthSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(getWidth(), getWidthMode(), padding, childDimension,
+                canScrollHorizontally());
+    }
+
+    @Override
+    public int getChildHeightMeasureSpec(int heightSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(getHeight(), getHeightMode(), padding, childDimension,
+                canScrollVertically());
+    }
+
+    @Override
+    public int getLargestMainSize() {
+        if (mFlexLines.size() == 0) {
+            return 0;
+        }
+        int largestSize = Integer.MIN_VALUE;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            largestSize = Math.max(largestSize, flexLine.mMainSize);
+        }
+        return largestSize;
+    }
+
+    @Override
+    public int getSumOfCrossSize() {
+        int sum = 0;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            // TODO: Consider adding decorator between flex lines.
+            sum += flexLine.mCrossSize;
+        }
+        return sum;
+    }
+
+    @Override
+    public void setFlexLines(List<FlexLine> flexLines) {
+        mFlexLines = flexLines;
+    }
+
+    @Override
+    public List<FlexLine> getFlexLinesInternal() {
+        return mFlexLines;
+    }
+
+    @Override
+    public void updateViewCache(int position, View view) {
+        mViewCache.put(position, view);
+    }
+    // The end of methods from FlexContainer
+
+    // ScrollVectorProvider method
+    @Override
+    public PointF computeScrollVectorForPosition(int targetPosition) {
+        if (getChildCount() == 0) {
+            return null;
+        }
+        View view = getChildAt(0);
+        if (view == null) {
+            return null;
+        }
+        int firstChildPos = getPosition(view);
+        int direction = targetPosition < firstChildPos ? -1 : 1;
+        if (isMainAxisDirectionHorizontal()) {
+            return new PointF(0, direction);
+        } else {
+            return new PointF(direction, 0);
+        }
+    }
+
+    @Override
+    public RecyclerView.LayoutParams generateDefaultLayoutParams() {
+        return new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+    }
+
+    @Override
+    public RecyclerView.LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {
+        return new LayoutParams(c, attrs);
+    }
+
+    @Override
+    public boolean checkLayoutParams(RecyclerView.LayoutParams lp) {
+        return lp instanceof LayoutParams;
+    }
+
+    @Override
+    public void onAdapterChanged(RecyclerView.Adapter oldAdapter, RecyclerView.Adapter newAdapter) {
+        removeAllViews();
+    }
+
+    @Override
+    public Parcelable onSaveInstanceState() {
+        if (mPendingSavedState != null) {
+            return new SavedState(mPendingSavedState);
+        }
+        SavedState savedState = new SavedState();
+        if (getChildCount() > 0) {
+            // TODO: Find the child from end if mFlexWrap == FlexWrap.WRAP_REVERSE
+            View firstView = getChildClosestToStart();
+            savedState.mAnchorPosition = getPosition(firstView);
+            savedState.mAnchorOffset = mOrientationHelper.getDecoratedStart(firstView) -
+                    mOrientationHelper.getStartAfterPadding();
+        } else {
+            savedState.invalidateAnchor();
+        }
+        return savedState;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Parcelable state) {
+        if (state instanceof SavedState) {
+            mPendingSavedState = (SavedState) state;
+            requestLayout();
+            if (DEBUG) {
+                Log.d(TAG, "Loaded saved state. " + mPendingSavedState);
+            }
+        } else {
+            if (DEBUG) {
+                Log.w(TAG, "Invalid state was trying to be restored. " + state);
+            }
+        }
+    }
+
+    @Override
+    public void onItemsAdded(@NonNull RecyclerView recyclerView, int positionStart, int itemCount) {
+        super.onItemsAdded(recyclerView, positionStart, itemCount);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsUpdated(@NonNull RecyclerView recyclerView, int positionStart, int itemCount,
+            Object payload) {
+        super.onItemsUpdated(recyclerView, positionStart, itemCount, payload);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsUpdated(@NonNull RecyclerView recyclerView, int positionStart, int itemCount) {
+        super.onItemsUpdated(recyclerView, positionStart, itemCount);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsRemoved(@NonNull RecyclerView recyclerView, int positionStart, int itemCount) {
+        super.onItemsRemoved(recyclerView, positionStart, itemCount);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsMoved(@NonNull RecyclerView recyclerView, int from, int to, int itemCount) {
+        super.onItemsMoved(recyclerView, from, to, itemCount);
+        updateDirtyPosition(Math.min(from, to));
+    }
+
+    private void updateDirtyPosition(int positionStart) {
+        int lastVisiblePosition = findLastVisibleItemPosition();
+        if (positionStart >= lastVisiblePosition) {
+            return;
+        }
+        int childCount = getChildCount();
+        mFlexboxHelper.ensureMeasureSpecCache(childCount);
+        mFlexboxHelper.ensureMeasuredSizeCache(childCount);
+        mFlexboxHelper.ensureIndexToFlexLine(childCount);
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+
+        if (positionStart >= mFlexboxHelper.mIndexToFlexLine.length) {
+            return;
+        }
+
+        mDirtyPosition = positionStart;
+
+        View firstView = getChildClosestToStart();
+        if (firstView == null) {
+            return;
+        }
+
+        // Assign the pending scroll position and offset so that the first visible position is
+        // restored in the next layout.
+        mPendingScrollPosition = getPosition(firstView);
+
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            mPendingScrollPositionOffset = mOrientationHelper.getDecoratedEnd(firstView) +
+                    mOrientationHelper.getEndPadding();
+        } else {
+            mPendingScrollPositionOffset = mOrientationHelper.getDecoratedStart(firstView) -
+                    mOrientationHelper.getStartAfterPadding();
+        }
+    }
+
+    @Override
+    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+        // Layout algorithm:
+        // 1) Find an anchor coordinate and anchor flex line position. If not found, the coordinate
+        //    starts from zero.
+        // 2) From the anchor position to the visible area, calculate the flex lines that needs to
+        //    be filled.
+        // 3) Fill toward end from the anchor position
+        // 4) Fill toward start from the anchor position
+        if (DEBUG) {
+            Log.d(TAG, "onLayoutChildren started");
+            Log.d(TAG, "getChildCount: " + getChildCount());
+            Log.d(TAG, "State: " + state);
+            Log.d(TAG, "PendingSavedState: " + mPendingSavedState);
+            Log.d(TAG, "PendingScrollPosition: " + mPendingScrollPosition);
+            Log.d(TAG, "PendingScrollOffset: " + mPendingScrollPositionOffset);
+        }
+
+        // Assign the Recycler and the State as the member variables so that
+        // the method from FlexContainer (such as getFlexItemCount()) returns the number of
+        // flex items from the adapter not the child count in the LayoutManager because
+        // LayoutManager#getChildCount doesn't include the views that are detached or scrapped.
+        mRecycler = recycler;
+        mState = state;
+        int childCount = state.getItemCount();
+        if (childCount == 0 && state.isPreLayout()) {
+            return;
+        }
+        resolveLayoutDirection();
+        ensureOrientationHelper();
+        ensureLayoutState();
+        mFlexboxHelper.ensureMeasureSpecCache(childCount);
+        mFlexboxHelper.ensureMeasuredSizeCache(childCount);
+
+        mFlexboxHelper.ensureIndexToFlexLine(childCount);
+
+        mLayoutState.mShouldRecycle = false;
+
+        if (mPendingSavedState != null && mPendingSavedState.hasValidAnchor(childCount)) {
+            mPendingScrollPosition = mPendingSavedState.mAnchorPosition;
+        }
+
+        if (!mAnchorInfo.mValid || mPendingScrollPosition != NO_POSITION ||
+                mPendingSavedState != null) {
+            mAnchorInfo.reset();
+            updateAnchorInfoForLayout(state, mAnchorInfo);
+            mAnchorInfo.mValid = true;
+        }
+        detachAndScrapAttachedViews(recycler);
+
+        if (mAnchorInfo.mLayoutFromEnd) {
+            updateLayoutStateToFillStart(mAnchorInfo, false, true);
+        } else {
+            updateLayoutStateToFillEnd(mAnchorInfo, false, true);
+        }
+        if (DEBUG) {
+            Log.d(TAG,
+                    String.format("onLayoutChildren. recycler.getScrapList.size(): %s, state: %s",
+                            recycler.getScrapList().size(), state));
+        }
+
+        updateFlexLines(childCount);
+        if (DEBUG) {
+            for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+                FlexLine flexLine = mFlexLines.get(i);
+                Log.d(TAG, String.format("%d flex line. MainSize: %d, CrossSize: %d, itemCount: %d",
+                        i, flexLine.getMainSize(), flexLine.getCrossSize(),
+                        flexLine.getItemCount()));
+            }
+        }
+
+        int startOffset;
+        int endOffset;
+        int filledToEnd = fill(recycler, state, mLayoutState);
+        if (mAnchorInfo.mLayoutFromEnd) {
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward start", filledToEnd));
+            }
+            startOffset = mLayoutState.mOffset;
+            updateLayoutStateToFillEnd(mAnchorInfo, true, false);
+            int filledToStart = fill(recycler, state, mLayoutState);
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward end", filledToStart));
+            }
+            endOffset = mLayoutState.mOffset;
+        } else {
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward end", filledToEnd));
+            }
+            endOffset = mLayoutState.mOffset;
+            updateLayoutStateToFillStart(mAnchorInfo, true, false);
+            int filledToStart = fill(recycler, state, mLayoutState);
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward start", filledToStart));
+            }
+            startOffset = mLayoutState.mOffset;
+        }
+
+        if (getChildCount() > 0) {
+            if (mAnchorInfo.mLayoutFromEnd) {
+                int fixOffset = fixLayoutEndGap(endOffset, recycler, state, true);
+                startOffset += fixOffset;
+                fixLayoutStartGap(startOffset, recycler, state, false);
+            } else {
+                int fixOffset = fixLayoutStartGap(startOffset, recycler, state, true);
+                endOffset += fixOffset;
+                fixLayoutEndGap(endOffset, recycler, state, false);
+            }
+        }
+    }
+
+    /**
+     * Fill the gap the toward the start position if the gap to be filled is made.
+     * Large part is copied from LinearLayoutManager#fixLayoutStartGap.
+     */
+    private int fixLayoutStartGap(int startOffset, RecyclerView.Recycler recycler,
+            RecyclerView.State state, boolean canOffsetChildren) {
+        int gap;
+        int fixOffset;
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            gap = mOrientationHelper.getEndAfterPadding() - startOffset;
+            if (gap > 0) {
+                // check if we should fix this gap.
+                fixOffset = handleScrollingMainOrientation(-gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        } else {
+            gap = startOffset - mOrientationHelper.getStartAfterPadding();
+            if (gap > 0) {
+                // check if we should fix this gap.
+                fixOffset = -handleScrollingMainOrientation(gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        }
+        startOffset += fixOffset;
+        if (canOffsetChildren) {
+            // re-calculate gap, see if we could fix it
+            gap = startOffset - mOrientationHelper.getStartAfterPadding();
+            if (gap > 0) {
+                mOrientationHelper.offsetChildren(-gap);
+                return fixOffset - gap;
+            }
+        }
+        return fixOffset;
+    }
+
+    /**
+     * Fill the gap the toward the end position if the gap to be filled is made.
+     * This process is necessary in a case like {@link #scrollToPosition(int)} is called
+     * for the last item, otherwise the last item is placed as the first line.
+     * Large part is copied from LinearLayoutManager#fixLayoutEndGap.
+     */
+    private int fixLayoutEndGap(int endOffset, RecyclerView.Recycler recycler,
+            RecyclerView.State state, boolean canOffsetChildren) {
+        int gap;
+        boolean columnAndRtl = !isMainAxisDirectionHorizontal() && mIsRtl;
+        int fixOffset;
+        if (columnAndRtl) {
+            gap = endOffset - mOrientationHelper.getStartAfterPadding();
+            if (gap > 0) {
+                fixOffset = handleScrollingMainOrientation(gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        } else {
+            gap = mOrientationHelper.getEndAfterPadding() - endOffset;
+            if (gap > 0) {
+                fixOffset = -handleScrollingMainOrientation(-gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        }
+
+        // move offset according to scroll amount
+        endOffset += fixOffset;
+        if (canOffsetChildren) {
+            // re-calculate gap, see if we could fix it
+            gap = mOrientationHelper.getEndAfterPadding() - endOffset;
+            if (gap > 0) {
+                mOrientationHelper.offsetChildren(gap);
+                return gap + fixOffset;
+            }
+        }
+        return fixOffset;
+    }
+
+    private void updateFlexLines(int childCount) {
+        //noinspection ResourceType
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(getWidth(), getWidthMode());
+        //noinspection ResourceType
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(getHeight(), getHeightMode());
+        int width = getWidth();
+        int height = getHeight();
+        boolean isMainSizeChanged;
+        int needsToFill;
+        // Clear the flex lines if the main size has changed from the last measurement.
+        // For example this happens when the developer handles the configuration changes manually
+        // or the user change the width boundary in the multi window mode.
+        if (isMainAxisDirectionHorizontal()) {
+            isMainSizeChanged = mLastWidth != Integer.MIN_VALUE && mLastWidth != width;
+
+            // If the mInfinite flag is set to true (that usually happens when RecyclerViews are
+            // nested and inner RecyclerView's layout_height is set to wrap_content, thus height is
+            // passed as 0 from the RecyclerView)
+            // Set the upper limit as the height of the device in order to prevent computing all
+            // items in the adapter
+            needsToFill = mLayoutState.mInfinite ?
+                    mContext.getResources().getDisplayMetrics().heightPixels
+                    : mLayoutState.mAvailable;
+        } else {
+            isMainSizeChanged = mLastHeight != Integer.MIN_VALUE && mLastHeight != height;
+
+            // If the mInfinite flag is set to true (that usually happens when RecyclerViews are
+            // nested and inner RecyclerView's layout_width is set to wrap_content, thus width is
+            // passed as 0 from the RecyclerView)
+            // Set the upper limit as the width of the device in order to prevent computing all
+            // items in the adapter
+            needsToFill = mLayoutState.mInfinite ?
+                    mContext.getResources().getDisplayMetrics().widthPixels
+                    : mLayoutState.mAvailable;
+        }
+
+        mLastWidth = width;
+        mLastHeight = height;
+
+        if (mDirtyPosition == NO_POSITION &&
+                (mPendingScrollPosition != NO_POSITION || isMainSizeChanged)) {
+            if (mAnchorInfo.mLayoutFromEnd) {
+                // Prior flex lines should be already calculated, don't have to be updated
+                return;
+            }
+            // TODO: This path may need another consideration to not calculate the entire flex
+            // lines prior to the anchor position since it may cause noticeable amount of
+            // skipped frames.
+            // Another note: deciding anchor position for the anchor view assumes that prior
+            // flex lines are calculated otherwise the position of the view can't be decided.
+            // It may be possible that assumes the anchor view is always at the start of a flex
+            // line and calculate the rest of flex lines as user scrolls to the top (toward the
+            // start) incrementally, but that approach may lead to inconsistent anchor view
+            // position
+            mFlexLines.clear();
+            assert mFlexboxHelper.mIndexToFlexLine != null;
+            mFlexLinesResult.reset();
+            if (isMainAxisDirectionHorizontal()) {
+                mFlexboxHelper
+                        .calculateHorizontalFlexLinesToIndex(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec,
+                                needsToFill, mAnchorInfo.mPosition, mFlexLines);
+            } else {
+                mFlexboxHelper
+                        .calculateVerticalFlexLinesToIndex(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec,
+                                needsToFill, mAnchorInfo.mPosition, mFlexLines);
+            }
+            mFlexLines = mFlexLinesResult.mFlexLines;
+            mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec);
+            mFlexboxHelper.stretchViews();
+            mAnchorInfo.mFlexLinePosition =
+                    mFlexboxHelper.mIndexToFlexLine[mAnchorInfo.mPosition];
+            mLayoutState.mFlexLinePosition = mAnchorInfo.mFlexLinePosition;
+        } else {
+            // Calculate the flex lines until the calculated cross size reaches the
+            // LayoutState#mAvailable (or until the end of the flex container)
+            // calculation can be done incrementally because the flex lines prior to the anchor
+            // position haven't changed
+            int fromIndex = mDirtyPosition != NO_POSITION ?
+                    Math.min(mDirtyPosition, mAnchorInfo.mPosition) : mAnchorInfo.mPosition;
+
+            mFlexLinesResult.reset();
+            if (isMainAxisDirectionHorizontal()) {
+                if (mFlexLines.size() > 0) {
+                    // Remove the already calculated flex lines from the fromIndex (either of
+                    // anchor position or the position marked as dirty (last time the item was
+                    // changed) and calculate beyond the available amount
+                    // (visible area that needs to be filled)
+                    mFlexboxHelper.clearFlexLines(mFlexLines, fromIndex);
+                    mFlexboxHelper.calculateFlexLines(mFlexLinesResult, widthMeasureSpec,
+                            heightMeasureSpec, needsToFill, fromIndex, mAnchorInfo.mPosition,
+                            mFlexLines);
+                } else {
+                    mFlexboxHelper.ensureIndexToFlexLine(childCount);
+                    mFlexboxHelper
+                            .calculateHorizontalFlexLines(mFlexLinesResult,
+                                    widthMeasureSpec, heightMeasureSpec,
+                                    needsToFill, 0, mFlexLines);
+                }
+            } else {
+                if (mFlexLines.size() > 0) {
+                    // Remove the already calculated flex lines from the fromIndex (either of
+                    // anchor position or the position marked as dirty (last time the item was
+                    // changed) and calculate beyond the available amount
+                    // (visible area that needs to be filled)
+                    mFlexboxHelper.clearFlexLines(mFlexLines, fromIndex);
+                    mFlexboxHelper.calculateFlexLines(mFlexLinesResult, heightMeasureSpec,
+                            widthMeasureSpec, needsToFill, fromIndex, mAnchorInfo.mPosition,
+                            mFlexLines);
+                } else {
+                    mFlexboxHelper.ensureIndexToFlexLine(childCount);
+                    mFlexboxHelper
+                            .calculateVerticalFlexLines(mFlexLinesResult, widthMeasureSpec,
+                                    heightMeasureSpec, needsToFill, 0, mFlexLines);
+                }
+            }
+            mFlexLines = mFlexLinesResult.mFlexLines;
+            mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec,
+                    fromIndex);
+            // Unlike the FlexboxLayout not calling FlexboxHelper#determineCrossSize because
+            // the align content attribute (which is used to determine the cross size) is only
+            // effective
+            // when the size of flex line is equal or more than 2 and the parent height
+            // (length along the cross size) is fixed. But in RecyclerView, these two conditions
+            // can't
+            // be true at the same time. Because it's scrollable along the cross axis
+            // or even if not (when flex wrap is "nowrap") the size of the flex lines should be 1.
+            mFlexboxHelper.stretchViews(fromIndex);
+        }
+    }
+
+    @Override
+    public void onLayoutCompleted(RecyclerView.State state) {
+        super.onLayoutCompleted(state);
+        if (DEBUG) {
+            Log.d(TAG, "onLayoutCompleted. " + state);
+        }
+        mPendingSavedState = null;
+        mPendingScrollPosition = NO_POSITION;
+        mPendingScrollPositionOffset = INVALID_OFFSET;
+        mDirtyPosition = NO_POSITION;
+        mAnchorInfo.reset();
+        mViewCache.clear();
+    }
+
+    boolean isLayoutRtl() {
+        return mIsRtl;
+    }
+
+    private void resolveLayoutDirection() {
+        int layoutDirection = getLayoutDirection();
+        switch (mFlexDirection) {
+            case FlexDirection.ROW:
+                mIsRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                mFromBottomToTop = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                break;
+            case FlexDirection.ROW_REVERSE:
+                mIsRtl = layoutDirection != ViewCompat.LAYOUT_DIRECTION_RTL;
+                mFromBottomToTop = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                break;
+            case FlexDirection.COLUMN:
+                mIsRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    mIsRtl = !mIsRtl;
+                }
+                mFromBottomToTop = false;
+                break;
+            case FlexDirection.COLUMN_REVERSE:
+                mIsRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    mIsRtl = !mIsRtl;
+                }
+                mFromBottomToTop = true;
+                break;
+            default:
+                mIsRtl = false;
+                mFromBottomToTop = false;
+        }
+    }
+
+    private void updateAnchorInfoForLayout(RecyclerView.State state, AnchorInfo anchorInfo) {
+        if (updateAnchorFromPendingState(state, anchorInfo, mPendingSavedState)) {
+            if (DEBUG) {
+                Log.d(TAG, "updated anchor from the pending state");
+            }
+            return;
+        }
+        if (updateAnchorFromChildren(state, anchorInfo)) {
+            if (DEBUG) {
+                Log.d(TAG,
+                        String.format("updated anchor info from existing children. AnchorInfo: %s",
+                                anchorInfo));
+            }
+            return;
+        }
+        if (DEBUG) {
+            Log.d(TAG, "deciding anchor info for fresh state");
+        }
+        anchorInfo.assignCoordinateFromPadding();
+        anchorInfo.mPosition = 0;
+        anchorInfo.mFlexLinePosition = 0;
+    }
+
+    private boolean updateAnchorFromPendingState(RecyclerView.State state, AnchorInfo anchorInfo,
+            SavedState savedState) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        if (state.isPreLayout() || mPendingScrollPosition == NO_POSITION) {
+            return false;
+        }
+        if (mPendingScrollPosition < 0 || mPendingScrollPosition >= state.getItemCount()) {
+            mPendingScrollPosition = NO_POSITION;
+            mPendingScrollPositionOffset = INVALID_OFFSET;
+            if (DEBUG) {
+                Log.e(TAG, "ignoring invalid scroll position " + mPendingScrollPosition);
+            }
+            return false;
+        }
+
+        anchorInfo.mPosition = mPendingScrollPosition;
+        anchorInfo.mFlexLinePosition = mFlexboxHelper.mIndexToFlexLine[anchorInfo.mPosition];
+        if (mPendingSavedState != null && mPendingSavedState.hasValidAnchor(state.getItemCount())) {
+            anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding() +
+                    savedState.mAnchorOffset;
+            anchorInfo.mAssignedFromSavedState = true;
+            anchorInfo.mFlexLinePosition = NO_POSITION;
+            return true;
+        }
+
+        if (mPendingScrollPositionOffset == INVALID_OFFSET) {
+            View anchorView = findViewByPosition(mPendingScrollPosition);
+            if (anchorView != null) {
+                if (mOrientationHelper.getDecoratedMeasurement(anchorView) >
+                        mOrientationHelper.getTotalSpace()) {
+                    anchorInfo.assignCoordinateFromPadding();
+                    return true;
+                }
+                int startGap = mOrientationHelper.getDecoratedStart(anchorView)
+                        - mOrientationHelper.getStartAfterPadding();
+                if (startGap < 0) {
+                    anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding();
+                    anchorInfo.mLayoutFromEnd = false;
+                    return true;
+                }
+
+                int endGap = mOrientationHelper.getEndAfterPadding() -
+                        mOrientationHelper.getDecoratedEnd(anchorView);
+                if (endGap < 0) {
+                    anchorInfo.mCoordinate = mOrientationHelper.getEndAfterPadding();
+                    anchorInfo.mLayoutFromEnd = true;
+                    return true;
+                }
+                anchorInfo.mCoordinate = anchorInfo.mLayoutFromEnd ?
+                        (mOrientationHelper.getDecoratedEnd(anchorView) +
+                                mOrientationHelper.getTotalSpaceChange())
+                        : mOrientationHelper.getDecoratedStart(anchorView);
+            } else {
+                if (getChildCount() > 0) {
+                    View view = getChildAt(0);
+                    if (view != null) {
+                        int position = getPosition(view);
+                        anchorInfo.mLayoutFromEnd = mPendingScrollPosition < position;
+                    }
+                }
+                anchorInfo.assignCoordinateFromPadding();
+            }
+            return true;
+        }
+
+        // TODO: Support reverse layout when flex wrap == FlexWrap.WRAP_REVERSE
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            anchorInfo.mCoordinate = mPendingScrollPositionOffset
+                    - mOrientationHelper.getEndPadding();
+        } else {
+            anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding()
+                    + mPendingScrollPositionOffset;
+        }
+        return true;
+    }
+
+    /**
+     * Finds an anchor child from existing Views. Most of the time, this is the view closest to
+     * start or end that has a valid position (e.g. not removed).
+     * Large part refers to the same method from LinearLayout#updateAnchorFromChildren
+     */
+    private boolean updateAnchorFromChildren(RecyclerView.State state, AnchorInfo anchorInfo) {
+        if (getChildCount() == 0) {
+            return false;
+        }
+        // TODO: Consider the focused view
+
+        View referenceChild = anchorInfo.mLayoutFromEnd
+                ? findLastReferenceChild(state.getItemCount())
+                : findFirstReferenceChild(state.getItemCount());
+        if (referenceChild != null) {
+            anchorInfo.assignFromView(referenceChild);
+            // If all visible views are removed in 1 pass, reference child might be out of bounds.
+            // If that is the case, offset it back to 0 so that we use these pre-layout children.
+            if (!state.isPreLayout() && supportsPredictiveItemAnimations()) {
+                // validate this child is at least partially visible. if not, offset it to start
+                final boolean notVisible =
+                        mOrientationHelper.getDecoratedStart(referenceChild) >= mOrientationHelper
+                                .getEndAfterPadding()
+                                || mOrientationHelper.getDecoratedEnd(referenceChild)
+                                < mOrientationHelper.getStartAfterPadding();
+                if (notVisible) {
+                    anchorInfo.mCoordinate = anchorInfo.mLayoutFromEnd
+                            ? mOrientationHelper.getEndAfterPadding()
+                            : mOrientationHelper.getStartAfterPadding();
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Find the reference view to be used as an anchor. It tries to find the view who has the
+     * maximum/minimum start/end (differs depending on if the container if RTL and the main axis
+     * direction) coordinate in the first visible flex line.
+     *
+     * @param itemCount the number of the items in this layout including invisible items
+     * @return the reference view
+     */
+    private View findFirstReferenceChild(int itemCount) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        View firstFound = findReferenceChild(0, getChildCount(), itemCount);
+        if (firstFound == null) {
+            return null;
+        }
+        int firstFoundPosition = getPosition(firstFound);
+        int firstFoundLinePosition = mFlexboxHelper.mIndexToFlexLine[firstFoundPosition];
+        if (firstFoundLinePosition == NO_POSITION) {
+            return null;
+        }
+        FlexLine firstFoundLine = mFlexLines.get(firstFoundLinePosition);
+        return findFirstReferenceViewInLine(firstFound, firstFoundLine);
+    }
+
+    /**
+     * Find the reference view to be used as an anchor. It tries to find the view who has the
+     * maximum/minimum start/end (differs depending on if the container if RTL and the main axis
+     * direction) coordinate in the last visible flex line.
+     *
+     * @param itemCount the number of the items in this layout including invisible items
+     * @return the reference view
+     */
+    private View findLastReferenceChild(int itemCount) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        View lastFound = findReferenceChild(getChildCount() - 1, -1, itemCount);
+        if (lastFound == null) {
+            return null;
+        }
+        int lastFoundPosition = getPosition(lastFound);
+        int lastFoundLinePosition = mFlexboxHelper.mIndexToFlexLine[lastFoundPosition];
+        FlexLine lastFoundLine = mFlexLines.get(lastFoundLinePosition);
+        return findLastReferenceViewInLine(lastFound, lastFoundLine);
+    }
+
+    /**
+     * Find a visible (or less preferred invisible) view within the given start and end index.
+     * Large part refers to the same method in LinearLayoutManager#findReferenceChild
+     *
+     * @param start     the start index within the range to find a view
+     * @param end       the end index within the range to find a view
+     * @param itemCount the item count
+     * @return the found view within the range of the given start and
+     */
+    private View findReferenceChild(int start, int end, int itemCount) {
+        ensureOrientationHelper();
+        ensureLayoutState();
+        View invalidMatch = null;
+        View outOfBoundsMatch = null;
+        int boundStart = mOrientationHelper.getStartAfterPadding();
+        int boundEnd = mOrientationHelper.getEndAfterPadding();
+        int diff = end > start ? 1 : -1;
+        for (int i = start; i != end; i += diff) {
+            View view = getChildAt(i);
+            if (view == null) {
+                continue;
+            }
+            int position = getPosition(view);
+            if (position >= 0 && position < itemCount) {
+                if (((RecyclerView.LayoutParams) view.getLayoutParams()).isItemRemoved()) {
+                    if (invalidMatch == null) {
+                        invalidMatch = view;
+                    }
+                } else if (mOrientationHelper.getDecoratedStart(view) < boundStart ||
+                        mOrientationHelper.getDecoratedEnd(view) > boundEnd) {
+                    if (outOfBoundsMatch == null) {
+                        outOfBoundsMatch = view;
+                    }
+                } else {
+                    return view;
+                }
+            }
+        }
+        return outOfBoundsMatch != null ? outOfBoundsMatch : invalidMatch;
+    }
+
+    private View getChildClosestToStart() {
+        // TODO: Find from end when mFlexWrap == FlexWrap.WRAP_REVERSE
+        return getChildAt(0);
+    }
+
+    /**
+     * Fills the remaining space defined by the layoutState on
+     * how many pixels should be filled (defined by {@link LayoutState#mAvailable}.
+     * The large part refers to the LinearLayoutManager#fill method except for the fill direction.
+     * Because FlexboxLayoutManager needs to care two scrolling directions:
+     * <li>
+     * <ul>Along the cross axis - When flex wrap is set to either FlexWrap.WRAP or
+     * FlexWrap.WRAP_REVERSE, the layout needs to scroll along the cross axis.</ul>
+     * <ul>Along the main axis - When flex wrap is set t FlexWrap.NOWRAP, the layout needs
+     * to scroll along the main axis if there are overflowing flex items.</ul>
+     * </li>
+     *
+     * @return the amount of pixels filled
+     */
+    private int fill(RecyclerView.Recycler recycler, RecyclerView.State state,
+            LayoutState layoutState) {
+        if (layoutState.mScrollingOffset != LayoutState.SCROLLING_OFFSET_NaN) {
+            if (layoutState.mAvailable < 0) {
+                layoutState.mScrollingOffset += layoutState.mAvailable;
+            }
+            recycleByLayoutState(recycler, layoutState);
+        }
+        int start = layoutState.mAvailable;
+        int remainingSpace = layoutState.mAvailable;
+        int consumed = 0;
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+        while ((remainingSpace > 0 || mLayoutState.mInfinite) &&
+                layoutState.hasMore(state, mFlexLines)) {
+            FlexLine flexLine = mFlexLines.get(layoutState.mFlexLinePosition);
+            layoutState.mPosition = flexLine.mFirstIndex;
+            consumed += layoutFlexLine(flexLine, layoutState);
+
+            if (!mainAxisHorizontal && mIsRtl) {
+                layoutState.mOffset -= flexLine.getCrossSize() * layoutState.mLayoutDirection;
+            } else {
+                layoutState.mOffset += flexLine.getCrossSize() * layoutState.mLayoutDirection;
+            }
+
+            remainingSpace -= flexLine.getCrossSize();
+        }
+        layoutState.mAvailable -= consumed;
+        if (layoutState.mScrollingOffset != LayoutState.SCROLLING_OFFSET_NaN) {
+            layoutState.mScrollingOffset += consumed;
+            if (layoutState.mAvailable < 0) {
+                layoutState.mScrollingOffset += layoutState.mAvailable;
+            }
+            recycleByLayoutState(recycler, layoutState);
+        }
+        return start - layoutState.mAvailable;
+    }
+
+    private void recycleByLayoutState(RecyclerView.Recycler recycler, LayoutState layoutState) {
+        if (!layoutState.mShouldRecycle) {
+            return;
+        }
+        if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+            // TODO: Consider the case mFlexWrap is set to nowrap and view is recycled individually
+            recycleFlexLinesFromEnd(recycler, layoutState);
+        } else {
+            recycleFlexLinesFromStart(recycler, layoutState);
+        }
+    }
+
+    private void recycleFlexLinesFromStart(RecyclerView.Recycler recycler,
+            LayoutState layoutState) {
+        if (layoutState.mScrollingOffset < 0) {
+            return;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int childCount = getChildCount();
+        if (childCount == 0) {
+            return;
+        }
+        View firstView = getChildAt(0);
+        if (firstView == null) {
+            return;
+        }
+        int currentLineIndex = mFlexboxHelper.mIndexToFlexLine[getPosition(firstView)];
+        if (currentLineIndex == NO_POSITION) {
+            return;
+        }
+        FlexLine flexLine = mFlexLines.get(currentLineIndex);
+        int recycleTo = -1;
+        for (int i = 0; i < childCount; i++) {
+            View view = getChildAt(i);
+            if (view == null) {
+                continue;
+            }
+            if (canViewBeRecycledFromStart(view, layoutState.mScrollingOffset)) {
+                if (flexLine.mLastIndex == getPosition(view)) {
+                    // Recycle the views in a flex line if all views end positions are lower than
+                    // the scrolling offset because the views are laid out as a flex line unit.
+                    // We need to also recycle the views as an unit of a flex line
+                    recycleTo = i;
+                    if (currentLineIndex >= mFlexLines.size() - 1) {
+                        // Reached to the last line
+                        break;
+                    } else {
+                        currentLineIndex += layoutState.mLayoutDirection;
+                        flexLine = mFlexLines.get(currentLineIndex);
+                    }
+                }
+            } else {
+                break;
+            }
+        }
+        recycleChildren(recycler, 0, recycleTo);
+    }
+
+    private boolean canViewBeRecycledFromStart(View view, int scrollingOffset) {
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            return mOrientationHelper.getEnd() -
+                    mOrientationHelper.getDecoratedStart(view) <= scrollingOffset;
+        } else {
+            return mOrientationHelper.getDecoratedEnd(view) <= scrollingOffset;
+        }
+    }
+
+    private void recycleFlexLinesFromEnd(RecyclerView.Recycler recycler, LayoutState layoutState) {
+        if (layoutState.mScrollingOffset < 0) {
+            return;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int childCount = getChildCount();
+        if (childCount == 0) {
+            return;
+        }
+
+        View lastView = getChildAt(childCount - 1);
+        if (lastView == null) {
+            return;
+        }
+        int currentLineIndex = mFlexboxHelper.mIndexToFlexLine[getPosition(lastView)];
+        if (currentLineIndex == NO_POSITION) {
+            return;
+        }
+        int recycleTo = childCount - 1;
+        int recycleFrom = childCount;
+        FlexLine flexLine = mFlexLines.get(currentLineIndex);
+        for (int i = childCount - 1; i >= 0; i--) {
+            View view = getChildAt(i);
+            if (view == null) {
+                continue;
+            }
+            if (canViewBeRecycledFromEnd(view, layoutState.mScrollingOffset)) {
+                if (flexLine.mFirstIndex == getPosition(view)) {
+                    // Recycle the views in a flex line if all views start positions are beyond the
+                    // limit because the views are laid out as a flex line unit. We need to also
+                    // recycle the views as an unit of a flex line
+                    recycleFrom = i;
+                    if (currentLineIndex <= 0) {
+                        // Reached to the first flex line
+                        break;
+                    } else {
+                        currentLineIndex += layoutState.mLayoutDirection;
+                        flexLine = mFlexLines.get(currentLineIndex);
+                    }
+                }
+            } else {
+                break;
+            }
+        }
+        recycleChildren(recycler, recycleFrom, recycleTo);
+    }
+
+    private boolean canViewBeRecycledFromEnd(View view, int scrollingOffset) {
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            return mOrientationHelper.getDecoratedEnd(view) <= scrollingOffset;
+        } else {
+            return mOrientationHelper.getDecoratedStart(view) >=
+                    mOrientationHelper.getEnd() - scrollingOffset;
+        }
+    }
+
+    /**
+     * Recycles children between given indices.
+     *
+     * @param startIndex inclusive
+     * @param endIndex   inclusive
+     */
+    private void recycleChildren(RecyclerView.Recycler recycler, int startIndex, int endIndex) {
+        for (int i = endIndex; i >= startIndex; i--) {
+            removeAndRecycleViewAt(i, recycler);
+        }
+    }
+
+    private int layoutFlexLine(FlexLine flexLine, LayoutState layoutState) {
+        if (isMainAxisDirectionHorizontal()) {
+            return layoutFlexLineMainAxisHorizontal(flexLine, layoutState);
+        } else {
+            return layoutFlexLineMainAxisVertical(flexLine, layoutState);
+        }
+    }
+
+    private int layoutFlexLineMainAxisHorizontal(FlexLine flexLine, LayoutState layoutState) {
+        assert mFlexboxHelper.mMeasureSpecCache != null;
+
+        int paddingLeft = getPaddingLeft();
+        int paddingRight = getPaddingRight();
+        int parentWidth = getWidth();
+
+        int childTop = layoutState.mOffset;
+        if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+            childTop = childTop - flexLine.mCrossSize;
+        }
+        int startPosition = layoutState.mPosition;
+
+        float childLeft;
+
+        // Only used when mIsRtl is true
+        float childRight;
+        float spaceBetweenItem = 0f;
+        switch (mJustifyContent) {
+            case JustifyContent.FLEX_START:
+                childLeft = paddingLeft;
+                childRight = parentWidth - paddingRight;
+                break;
+            case JustifyContent.FLEX_END:
+                childLeft = parentWidth - flexLine.mMainSize + paddingRight;
+                childRight = flexLine.mMainSize - paddingLeft;
+                break;
+            case JustifyContent.CENTER:
+                childLeft = paddingLeft + (parentWidth - flexLine.mMainSize) / 2f;
+                childRight = parentWidth - paddingRight - (parentWidth - flexLine.mMainSize) / 2f;
+                break;
+            case JustifyContent.SPACE_AROUND:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentWidth - flexLine.mMainSize)
+                            / (float) flexLine.mItemCount;
+                }
+                childLeft = paddingLeft + spaceBetweenItem / 2f;
+                childRight = parentWidth - paddingRight - spaceBetweenItem / 2f;
+                break;
+            case JustifyContent.SPACE_BETWEEN:
+                childLeft = paddingLeft;
+                float denominator = flexLine.mItemCount != 1 ? flexLine.mItemCount - 1 : 1f;
+                spaceBetweenItem = (parentWidth - flexLine.mMainSize) / denominator;
+                childRight = parentWidth - paddingRight;
+                break;
+            case JustifyContent.SPACE_EVENLY:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentWidth - flexLine.mMainSize)
+                            / (float) (flexLine.mItemCount + 1);
+                }
+                childLeft = paddingLeft + spaceBetweenItem;
+                childRight = parentWidth - paddingRight - spaceBetweenItem;
+                break;
+            default:
+                throw new IllegalStateException(
+                        "Invalid justifyContent is set: " + mJustifyContent);
+        }
+        childLeft -= mAnchorInfo.mPerpendicularCoordinate;
+        childRight -= mAnchorInfo.mPerpendicularCoordinate;
+        spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+        // Used only when mLayoutDirection == LayoutState.LAYOUT_START to remember the index
+        // a flex item should be inserted
+        int indexInFlexLine = 0;
+        for (int i = startPosition, itemCount = flexLine.getItemCount();
+                i < startPosition + itemCount; i++) {
+            View view = getFlexItemAt(i);
+            if (view == null) {
+                continue;
+            }
+
+            if (layoutState.mLayoutDirection == LayoutState.LAYOUT_END) {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view);
+            } else {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view, indexInFlexLine);
+                indexInFlexLine++;
+            }
+
+            // Retrieve the measure spec from the cache because the view may be re-created when
+            // retrieved from Recycler, in that case measured width/height are set to 0 even
+            // each visible child should be measured at least once in the FlexboxHelper
+            long measureSpec = mFlexboxHelper.mMeasureSpecCache[i];
+            int widthSpec = mFlexboxHelper.extractLowerInt(measureSpec);
+            int heightSpec = mFlexboxHelper.extractHigherInt(measureSpec);
+            LayoutParams lp = (LayoutParams) view.getLayoutParams();
+            if (shouldMeasureChild(view, widthSpec, heightSpec, lp)) {
+                view.measure(widthSpec, heightSpec);
+            }
+
+            childLeft += (lp.leftMargin + getLeftDecorationWidth(view));
+            childRight -= (lp.rightMargin + getRightDecorationWidth(view));
+
+            int topWithDecoration = childTop + getTopDecorationHeight(view);
+            if (mIsRtl) {
+                mFlexboxHelper.layoutSingleChildHorizontal(view, flexLine,
+                        Math.round(childRight) - view.getMeasuredWidth(),
+                        topWithDecoration, Math.round(childRight),
+                        topWithDecoration + view.getMeasuredHeight());
+            } else {
+                mFlexboxHelper.layoutSingleChildHorizontal(view, flexLine,
+                        Math.round(childLeft), topWithDecoration,
+                        Math.round(childLeft) + view.getMeasuredWidth(),
+                        topWithDecoration + view.getMeasuredHeight());
+            }
+            childLeft += (view.getMeasuredWidth() + lp.rightMargin + getRightDecorationWidth(view)
+                    + spaceBetweenItem);
+            childRight -= (view.getMeasuredWidth() + lp.leftMargin + getLeftDecorationWidth(view)
+                    + spaceBetweenItem);
+        }
+        layoutState.mFlexLinePosition += mLayoutState.mLayoutDirection;
+        return flexLine.getCrossSize();
+    }
+
+    private int layoutFlexLineMainAxisVertical(FlexLine flexLine, LayoutState layoutState) {
+        assert mFlexboxHelper.mMeasureSpecCache != null;
+
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+        int parentHeight = getHeight();
+
+        int childLeft = layoutState.mOffset;
+        // childRight is used only for the layout is RTL
+        int childRight = layoutState.mOffset;
+        if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+            childLeft = childLeft - flexLine.mCrossSize;
+            childRight = childRight + flexLine.mCrossSize;
+        }
+        int startPosition = layoutState.mPosition;
+
+        float childTop;
+
+        // Only used when mFromBottomToTop is true
+        float childBottom;
+        float spaceBetweenItem = 0f;
+        switch (mJustifyContent) {
+            case JustifyContent.FLEX_START:
+                childTop = paddingTop;
+                childBottom = parentHeight - paddingBottom;
+                break;
+            case JustifyContent.FLEX_END:
+                childTop = parentHeight - flexLine.mMainSize + paddingBottom;
+                childBottom = flexLine.mMainSize - paddingTop;
+                break;
+            case JustifyContent.CENTER:
+                childTop = paddingTop + (parentHeight - flexLine.mMainSize) / 2f;
+                childBottom = parentHeight - paddingBottom
+                        - (parentHeight - flexLine.mMainSize) / 2f;
+                break;
+            case JustifyContent.SPACE_AROUND:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentHeight - flexLine.mMainSize)
+                            / (float) flexLine.mItemCount;
+                }
+                childTop = paddingTop + spaceBetweenItem / 2f;
+                childBottom = parentHeight - paddingBottom - spaceBetweenItem / 2f;
+                break;
+            case JustifyContent.SPACE_BETWEEN:
+                childTop = paddingTop;
+                float denominator = flexLine.mItemCount != 1 ? flexLine.mItemCount - 1 : 1f;
+                spaceBetweenItem = (parentHeight - flexLine.mMainSize) / denominator;
+                childBottom = parentHeight - paddingBottom;
+                break;
+            case JustifyContent.SPACE_EVENLY:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentHeight - flexLine.mMainSize)
+                            / (float) (flexLine.mItemCount + 1);
+                }
+                childTop = paddingTop + spaceBetweenItem;
+                childBottom = parentHeight - paddingBottom - spaceBetweenItem;
+                break;
+            default:
+                throw new IllegalStateException(
+                        "Invalid justifyContent is set: " + mJustifyContent);
+        }
+        childTop -= mAnchorInfo.mPerpendicularCoordinate;
+        childBottom -= mAnchorInfo.mPerpendicularCoordinate;
+        spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+        // Used only when mLayoutDirection == LayoutState.LAYOUT_START to remember the index
+        // a flex item should be inserted
+        int indexInFlexLine = 0;
+        for (int i = startPosition, itemCount = flexLine.getItemCount();
+                i < startPosition + itemCount; i++) {
+            View view = getFlexItemAt(i);
+            if (view == null) {
+                continue;
+            }
+
+            // Retrieve the measure spec from the cache because the view may be re-created when
+            // retrieved from Recycler, in that case measured width/height are set to 0 even
+            // each visible child should be measured at least once in the FlexboxHelper
+            long measureSpec = mFlexboxHelper.mMeasureSpecCache[i];
+            int widthSpec = mFlexboxHelper.extractLowerInt(measureSpec);
+            int heightSpec = mFlexboxHelper.extractHigherInt(measureSpec);
+            LayoutParams lp = (LayoutParams) view.getLayoutParams();
+            if (shouldMeasureChild(view, widthSpec, heightSpec, lp)) {
+                view.measure(widthSpec, heightSpec);
+            }
+
+            childTop += (lp.topMargin + getTopDecorationHeight(view));
+            childBottom -= (lp.rightMargin + getBottomDecorationHeight(view));
+
+            if (layoutState.mLayoutDirection == LayoutState.LAYOUT_END) {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view);
+            } else {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view, indexInFlexLine);
+                indexInFlexLine++;
+            }
+
+            int leftWithDecoration = childLeft + getLeftDecorationWidth(view);
+            int rightWithDecoration = childRight - getRightDecorationWidth(view);
+            if (mIsRtl) {
+                if (mFromBottomToTop) {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            rightWithDecoration - view.getMeasuredWidth(),
+                            Math.round(childBottom) - view.getMeasuredHeight(),
+                            rightWithDecoration, Math.round(childBottom));
+                } else {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            rightWithDecoration - view.getMeasuredWidth(),
+                            Math.round(childTop), rightWithDecoration,
+                            Math.round(childTop) + view.getMeasuredHeight());
+                }
+            } else {
+                if (mFromBottomToTop) {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            leftWithDecoration, Math.round(childBottom) - view.getMeasuredHeight(),
+                            leftWithDecoration + view.getMeasuredWidth(), Math.round(childBottom));
+                } else {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            leftWithDecoration, Math.round(childTop),
+                            leftWithDecoration + view.getMeasuredWidth(),
+                            Math.round(childTop) + view.getMeasuredHeight());
+                }
+            }
+            childTop += (view.getMeasuredHeight() + lp.topMargin + getBottomDecorationHeight(view)
+                    + spaceBetweenItem);
+            childBottom -= (view.getMeasuredHeight() + lp.bottomMargin +
+                    getTopDecorationHeight(view) + spaceBetweenItem);
+        }
+        layoutState.mFlexLinePosition += mLayoutState.mLayoutDirection;
+        return flexLine.getCrossSize();
+    }
+
+    @Override
+    public boolean isMainAxisDirectionHorizontal() {
+        return mFlexDirection == FlexDirection.ROW || mFlexDirection == FlexDirection.ROW_REVERSE;
+    }
+
+
+    /**
+     * Update the layout state based on the anchor information.
+     * The view holders are going to be filled toward the end position (bottom if the main axis
+     * direction is horizontal, right if the main axis direction if vertical).
+     *
+     * @param anchorInfo       the anchor information where layout should start
+     * @param fromNextLine     if set to {@code true}, layout starts from the next flex line set to
+     *                         the anchor information
+     * @param considerInfinite if set to {@code true}, the judgement if the infinite available
+     *                         space
+     *                         needs to be considered.
+     */
+    private void updateLayoutStateToFillEnd(AnchorInfo anchorInfo, boolean fromNextLine,
+            boolean considerInfinite) {
+        if (considerInfinite) {
+            resolveInfiniteAmount();
+        } else {
+            mLayoutState.mInfinite = false;
+        }
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            mLayoutState.mAvailable = anchorInfo.mCoordinate - getPaddingRight();
+        } else {
+            mLayoutState.mAvailable =
+                    mOrientationHelper.getEndAfterPadding() - anchorInfo.mCoordinate;
+        }
+        mLayoutState.mPosition = anchorInfo.mPosition;
+        mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+        mLayoutState.mLayoutDirection = LayoutState.LAYOUT_END;
+        mLayoutState.mOffset = anchorInfo.mCoordinate;
+        mLayoutState.mScrollingOffset = LayoutState.SCROLLING_OFFSET_NaN;
+        mLayoutState.mFlexLinePosition = anchorInfo.mFlexLinePosition;
+
+        if (fromNextLine
+                && mFlexLines.size() > 1
+                && anchorInfo.mFlexLinePosition >= 0
+                && anchorInfo.mFlexLinePosition < mFlexLines.size() - 1) {
+            FlexLine currentLine = mFlexLines.get(anchorInfo.mFlexLinePosition);
+            mLayoutState.mFlexLinePosition++;
+            mLayoutState.mPosition += currentLine.getItemCount();
+        }
+    }
+
+    /**
+     * Update the layout state based on the anchor information.
+     * The view holders are going to be filled toward the start position (top if the main axis
+     * direction is horizontal, left if the main axis direction if vertical).
+     *
+     * @param anchorInfo       the anchor information where layout should start
+     * @param fromPreviousLine if set to {@code true}, layout starts from the next flex line set to
+     *                         the anchor information
+     * @param considerInfinite if set to {@code true}, the judgement if the infinite available
+     *                         space
+     *                         needs to be considered.
+     */
+    private void updateLayoutStateToFillStart(AnchorInfo anchorInfo, boolean fromPreviousLine,
+            boolean considerInfinite) {
+        if (considerInfinite) {
+            resolveInfiniteAmount();
+        } else {
+            mLayoutState.mInfinite = false;
+        }
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            mLayoutState.mAvailable = mParent.getWidth() - anchorInfo.mCoordinate
+                    - mOrientationHelper.getStartAfterPadding();
+        } else {
+            mLayoutState.mAvailable = anchorInfo.mCoordinate - mOrientationHelper
+                    .getStartAfterPadding();
+        }
+        mLayoutState.mPosition = anchorInfo.mPosition;
+        mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+        mLayoutState.mLayoutDirection = LayoutState.LAYOUT_START;
+        mLayoutState.mOffset = anchorInfo.mCoordinate;
+        mLayoutState.mScrollingOffset = LayoutState.SCROLLING_OFFSET_NaN;
+        mLayoutState.mFlexLinePosition = anchorInfo.mFlexLinePosition;
+
+        if (fromPreviousLine && anchorInfo.mFlexLinePosition > 0
+                && mFlexLines.size() > anchorInfo.mFlexLinePosition) {
+            FlexLine currentLine = mFlexLines.get(anchorInfo.mFlexLinePosition);
+            mLayoutState.mFlexLinePosition--;
+            mLayoutState.mPosition -= currentLine.getItemCount();
+        }
+    }
+
+    private void resolveInfiniteAmount() {
+        int crossMode;
+        if (isMainAxisDirectionHorizontal()) {
+            crossMode = getHeightMode();
+        } else {
+            crossMode = getWidthMode();
+        }
+        // Setting the infinite flag so that the LayoutManager tries to fill the available space
+        // as much as possible. E.g. this is needed in the case RecyclerView is wrapped with another
+        // scrollable container (another RecyclerView or ScrollView) on the condition
+        // layout_height="wrap_content" and flexDirection="row". In such a case, the height of the
+        // inner RecyclerView (attached RecyclerView for this LayoutManager) is set to 0 at this
+        // moment, so the value of the mAvailable doesn't have enough value enough to put the
+        // already calculated flex lines.
+        mLayoutState.mInfinite =
+                crossMode == View.MeasureSpec.UNSPECIFIED || crossMode == View.MeasureSpec.AT_MOST;
+    }
+
+    private void ensureOrientationHelper() {
+        if (mOrientationHelper != null) {
+            return;
+        }
+        // There are two cases for each of main axis direction. In either case the scroll happens
+        // along the cross axis:
+        // -- Scroll vertically when mFlexWrap != FlexWrap.NOWRAP. In this case scroll happens
+        //    along the cross axis
+        //
+        // When scroll direction is vertical:
+        // -- Scroll horizontally when mFlexWrap != FlexWrap.NOWRAP. In this case scroll happens
+        //    along the cross axis
+        if (isMainAxisDirectionHorizontal()) {
+            if (mFlexWrap == FlexWrap.NOWRAP) {
+                mOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createVerticalHelper(this);
+            } else {
+                mOrientationHelper = OrientationHelper.createVerticalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+            }
+        } else {
+            if (mFlexWrap == FlexWrap.NOWRAP) {
+                mOrientationHelper = OrientationHelper.createVerticalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+            } else {
+                mOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createVerticalHelper(this);
+            }
+        }
+    }
+
+    private void ensureLayoutState() {
+        if (mLayoutState == null) {
+            mLayoutState = new LayoutState();
+        }
+    }
+
+    @Override
+    public void scrollToPosition(int position) {
+        mPendingScrollPosition = position;
+        mPendingScrollPositionOffset = INVALID_OFFSET;
+        if (mPendingSavedState != null) {
+            mPendingSavedState.invalidateAnchor();
+        }
+        requestLayout();
+    }
+
+    @Override
+    public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state,
+            int position) {
+        LinearSmoothScroller smoothScroller =
+                new LinearSmoothScroller(recyclerView.getContext());
+        smoothScroller.setTargetPosition(position);
+        startSmoothScroll(smoothScroller);
+    }
+
+    /**
+     * @return true if LayoutManager will recycle its children when it is detached from
+     * RecyclerView.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public boolean getRecycleChildrenOnDetach() {
+        return mRecycleChildrenOnDetach;
+    }
+
+    /**
+     * Set whether this LayoutManager will recycle its children when it is detached from
+     * RecyclerView.
+     * <p>
+     * If you are using a {@link RecyclerView.RecycledViewPool}, it might be a good idea to set
+     * this flag to <code>true</code> so that views will be available to other RecyclerViews
+     * immediately.
+     * <p>
+     * Note that, setting this flag will result in a performance drop if RecyclerView
+     * is restored.
+     *
+     * @param recycleChildrenOnDetach Whether children should be recycled in detach or not.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setRecycleChildrenOnDetach(boolean recycleChildrenOnDetach) {
+        mRecycleChildrenOnDetach = recycleChildrenOnDetach;
+    }
+
+    @Override
+    public void onAttachedToWindow(RecyclerView recyclerView) {
+        super.onAttachedToWindow(recyclerView);
+        mParent = (View) recyclerView.getParent();
+    }
+
+    @Override
+    public void onDetachedFromWindow(RecyclerView view, RecyclerView.Recycler recycler) {
+        super.onDetachedFromWindow(view, recycler);
+        if (mRecycleChildrenOnDetach) {
+            if (DEBUG) {
+                Log.d(TAG, "onDetachedFromWindow. Recycling children in the recycler");
+            }
+            removeAndRecycleAllViews(recycler);
+            recycler.clear();
+        }
+    }
+
+    @Override
+    public boolean canScrollHorizontally() {
+        if (mFlexWrap == FlexWrap.NOWRAP) {
+            return isMainAxisDirectionHorizontal();
+        } else {
+            return !isMainAxisDirectionHorizontal() || getWidth() > (mParent != null ? mParent.getWidth() : 0);
+        }
+    }
+
+    @Override
+    public boolean canScrollVertically() {
+        if (mFlexWrap == FlexWrap.NOWRAP) {
+            return !isMainAxisDirectionHorizontal();
+        } else {
+            return isMainAxisDirectionHorizontal() || getHeight() > (mParent != null ? mParent.getHeight() : 0);
+        }
+    }
+
+    @Override
+    public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler,
+            RecyclerView.State state) {
+        if (!isMainAxisDirectionHorizontal() || (mFlexWrap == FlexWrap.NOWRAP)) {
+            int scrolled = handleScrollingMainOrientation(dx, recycler, state);
+            mViewCache.clear();
+            return scrolled;
+        } else {
+            int scrolled = handleScrollingSubOrientation(dx);
+            mAnchorInfo.mPerpendicularCoordinate += scrolled;
+            mSubOrientationHelper.offsetChildren(-scrolled);
+            return scrolled;
+        }
+    }
+
+    @Override
+    public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler,
+            RecyclerView.State state) {
+        if (isMainAxisDirectionHorizontal() ||
+                (mFlexWrap == FlexWrap.NOWRAP && !isMainAxisDirectionHorizontal())) {
+            int scrolled = handleScrollingMainOrientation(dy, recycler, state);
+            mViewCache.clear();
+            return scrolled;
+        } else {
+            int scrolled = handleScrollingSubOrientation(dy);
+            mAnchorInfo.mPerpendicularCoordinate += scrolled;
+            mSubOrientationHelper.offsetChildren(-scrolled);
+            return scrolled;
+        }
+    }
+
+    /**
+     * Handle the scrolling along the direction of {@link #mOrientationHelper}.
+     *
+     * @param delta    the delta for the amount that is being scrolled
+     *                 (either horizontally or vertically)
+     * @param recycler the Recycler instance
+     * @param state    the Recycler.State instance
+     * @return the amount actually scrolled
+     */
+    private int handleScrollingMainOrientation(int delta, RecyclerView.Recycler recycler,
+            RecyclerView.State state) {
+        if (getChildCount() == 0 || delta == 0) {
+            return 0;
+        }
+        ensureOrientationHelper();
+        mLayoutState.mShouldRecycle = true;
+        int layoutDirection;
+        boolean columnAndRtl = !isMainAxisDirectionHorizontal() && mIsRtl;
+        if (columnAndRtl) {
+            layoutDirection = delta < 0 ? LayoutState.LAYOUT_END : LayoutState.LAYOUT_START;
+        } else {
+            layoutDirection = delta > 0 ? LayoutState.LAYOUT_END : LayoutState.LAYOUT_START;
+        }
+        int absDelta = Math.abs(delta);
+
+        updateLayoutState(layoutDirection, absDelta);
+
+        int freeScroll = mLayoutState.mScrollingOffset;
+        int consumed = freeScroll + fill(recycler, state, mLayoutState);
+        if (consumed < 0) {
+            return 0;
+        }
+        int scrolled;
+        if (columnAndRtl) {
+            scrolled = absDelta > consumed ? -layoutDirection * consumed : delta;
+        } else {
+            scrolled = absDelta > consumed ? layoutDirection * consumed : delta;
+        }
+        mOrientationHelper.offsetChildren(-scrolled);
+        mLayoutState.mLastScrollDelta = scrolled;
+        return scrolled;
+    }
+
+    /**
+     * Handle the scrolling along the direction of {@link #mSubOrientationHelper}.
+     *
+     * @param delta    the delta for the amount that is being scrolled
+     *                 (either horizontally or vertically)
+     * @return  the amount actually scrolled
+     */
+    private int handleScrollingSubOrientation(int delta) {
+        if (getChildCount() == 0 || delta == 0) {
+            return 0;
+        }
+        ensureOrientationHelper();
+        boolean isMainAxisHorizontal = isMainAxisDirectionHorizontal();
+        int parentLength = isMainAxisHorizontal ? mParent.getWidth() : mParent.getHeight();
+        int mainAxisLength = isMainAxisHorizontal ? getWidth() : getHeight();
+
+        boolean layoutRtl = getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL;
+        if (layoutRtl) {
+            int absDelta = Math.abs(delta);
+            if (delta < 0) {
+                delta = Math.min(mainAxisLength
+                        + mAnchorInfo.mPerpendicularCoordinate - parentLength, absDelta);
+                delta = -delta;
+            } else {
+                delta = mAnchorInfo.mPerpendicularCoordinate + delta > 0
+                        ? -mAnchorInfo.mPerpendicularCoordinate
+                        : delta;
+            }
+        } else {
+            if (delta > 0) {
+                delta = Math.min(mainAxisLength
+                        - mAnchorInfo.mPerpendicularCoordinate - parentLength, delta);
+            } else {
+                delta = mAnchorInfo.mPerpendicularCoordinate + delta >= 0 ? delta :
+                        -mAnchorInfo.mPerpendicularCoordinate;
+            }
+        }
+        return delta;
+    }
+
+    /**
+     * Update the layout state as part of the scrolling. This method also update the flex lines
+     * enough to display the view port including the delta of the scroll.
+     *
+     * @param layoutDirection the layout direction value. Either of {@link LayoutState#LAYOUT_END}
+     *                        or {@link LayoutState#LAYOUT_START}
+     * @param absDelta        the absolute value of the delta that is about to be scrolled.
+     */
+    private void updateLayoutState(int layoutDirection, int absDelta) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        mLayoutState.mLayoutDirection = layoutDirection;
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+
+        //noinspection ResourceType
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(getWidth(), getWidthMode());
+        //noinspection ResourceType
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(getHeight(), getHeightMode());
+        boolean columnAndRtl = !mainAxisHorizontal && mIsRtl;
+        if (layoutDirection == LayoutState.LAYOUT_END) {
+            View lastVisible = getChildAt(getChildCount() - 1);
+            if (lastVisible == null) {
+                return;
+            }
+            mLayoutState.mOffset = mOrientationHelper.getDecoratedEnd(lastVisible);
+            int lastVisiblePosition = getPosition(lastVisible);
+            int lastVisibleLinePosition = mFlexboxHelper.mIndexToFlexLine[lastVisiblePosition];
+            FlexLine lastVisibleLine = mFlexLines.get(lastVisibleLinePosition);
+
+            // The reference view which has the maximum end (or minimum if the layout is RTL and
+            // the main axis direction is horizontal) coordinate in  the last visible flex line.
+            View referenceView = findLastReferenceViewInLine(lastVisible, lastVisibleLine);
+            mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+            mLayoutState.mPosition = lastVisiblePosition + mLayoutState.mItemDirection;
+            if (mFlexboxHelper.mIndexToFlexLine.length <= mLayoutState.mPosition) {
+                mLayoutState.mFlexLinePosition = NO_POSITION;
+            } else {
+                mLayoutState.mFlexLinePosition
+                        = mFlexboxHelper.mIndexToFlexLine[mLayoutState.mPosition];
+            }
+
+            if (columnAndRtl) {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedStart(referenceView);
+                mLayoutState.mScrollingOffset = -mOrientationHelper.getDecoratedStart(referenceView)
+                        + mOrientationHelper.getStartAfterPadding();
+                mLayoutState.mScrollingOffset = Math.max(mLayoutState.mScrollingOffset, 0);
+            } else {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedEnd(referenceView);
+                mLayoutState.mScrollingOffset = mOrientationHelper.getDecoratedEnd(referenceView)
+                        - mOrientationHelper.getEndAfterPadding();
+            }
+
+            if ((mLayoutState.mFlexLinePosition == NO_POSITION
+                    || mLayoutState.mFlexLinePosition > mFlexLines.size() - 1) &&
+                    mLayoutState.mPosition <= getFlexItemCount()) {
+                // If the RecyclerView tries to scroll beyond the already calculated
+                // flex container, need to calculate beyond the amount that needs to be filled
+
+                int needsToFill = absDelta - mLayoutState.mScrollingOffset;
+                mFlexLinesResult.reset();
+                if (needsToFill > 0) {
+                    if (mainAxisHorizontal) {
+                        mFlexboxHelper.calculateHorizontalFlexLines(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec, needsToFill,
+                                mLayoutState.mPosition, mFlexLines);
+                    } else {
+                        mFlexboxHelper.calculateVerticalFlexLines(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec, needsToFill,
+                                mLayoutState.mPosition, mFlexLines);
+                    }
+                    mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec,
+                            mLayoutState.mPosition);
+                    mFlexboxHelper.stretchViews(mLayoutState.mPosition);
+                }
+            }
+        } else {
+            View firstVisible = getChildAt(0);
+            if (firstVisible == null) {
+                return;
+            }
+            mLayoutState.mOffset = mOrientationHelper.getDecoratedStart(firstVisible);
+            int firstVisiblePosition = getPosition(firstVisible);
+            int firstVisibleLinePosition = mFlexboxHelper.mIndexToFlexLine[firstVisiblePosition];
+            FlexLine firstVisibleLine = mFlexLines.get(firstVisibleLinePosition);
+
+            // The reference view which has the minimum start (or maximum if the layout is RTL and
+            // the main axis direction is horizontal) coordinate in the first visible flex line
+            View referenceView = findFirstReferenceViewInLine(firstVisible, firstVisibleLine);
+
+            mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+            int flexLinePosition = mFlexboxHelper.mIndexToFlexLine[firstVisiblePosition];
+            if (flexLinePosition == NO_POSITION) {
+                flexLinePosition = 0;
+            }
+            if (flexLinePosition > 0) {
+                FlexLine previousLine = mFlexLines.get(flexLinePosition - 1);
+                // The position of the next item toward start should be on the next flex line,
+                // shifting the position by the number of the items in the previous line.
+                mLayoutState.mPosition = firstVisiblePosition - previousLine.getItemCount();
+            } else {
+                mLayoutState.mPosition = NO_POSITION;
+            }
+            mLayoutState.mFlexLinePosition = flexLinePosition > 0 ? flexLinePosition - 1 : 0;
+
+            if (columnAndRtl) {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedEnd(referenceView);
+                mLayoutState.mScrollingOffset = mOrientationHelper.getDecoratedEnd(referenceView)
+                        - mOrientationHelper.getEndAfterPadding();
+                mLayoutState.mScrollingOffset = Math.max(mLayoutState.mScrollingOffset, 0);
+            } else {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedStart(referenceView);
+                mLayoutState.mScrollingOffset = -mOrientationHelper.getDecoratedStart(referenceView)
+                        + mOrientationHelper.getStartAfterPadding();
+            }
+        }
+        mLayoutState.mAvailable = absDelta - mLayoutState.mScrollingOffset;
+    }
+
+    /**
+     * Loop through the first visible flex line to find the reference view, which has the minimum
+     * start (or maximum if the layout is RTL and main axis direction is horizontal) coordinate.
+     *
+     * @param firstView        the first visible view
+     * @param firstVisibleLine the first visible flex line
+     * @return the reference view
+     */
+    private View findFirstReferenceViewInLine(View firstView, FlexLine firstVisibleLine) {
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+        View referenceView = firstView;
+        for (int i = 1, to = firstVisibleLine.mItemCount;
+                i < to; i++) {
+            View viewInSameLine = getChildAt(i);
+            if (viewInSameLine == null || viewInSameLine.getVisibility() == View.GONE) {
+                continue;
+            }
+            if (mIsRtl && !mainAxisHorizontal) {
+                if (mOrientationHelper.getDecoratedEnd(referenceView)
+                        < mOrientationHelper.getDecoratedEnd(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            } else {
+                if (mOrientationHelper.getDecoratedStart(referenceView)
+                        > mOrientationHelper.getDecoratedStart(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            }
+        }
+        return referenceView;
+    }
+
+    /**
+     * Loop through the last visible flex line to find the reference view, which has the maximum
+     * end (or minimum if the layout is RTL and main axis direction is horizontal) coordinate.
+     *
+     * @param lastView        the last visible view
+     * @param lastVisibleLine the last visible flex line
+     * @return the reference view
+     */
+    private View findLastReferenceViewInLine(View lastView, FlexLine lastVisibleLine) {
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+        View referenceView = lastView;
+        for (int i = getChildCount() - 2, to = getChildCount() - lastVisibleLine.mItemCount - 1;
+                i > to; i--) {
+            View viewInSameLine = getChildAt(i);
+            if (viewInSameLine == null || viewInSameLine.getVisibility() == View.GONE) {
+                continue;
+            }
+            if (mIsRtl && !mainAxisHorizontal) {
+                // The end edge of the view is left, should be the minimum left edge
+                // where the next view should be placed
+                if (mOrientationHelper.getDecoratedStart(referenceView) >
+                        mOrientationHelper.getDecoratedStart(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            } else {
+                if (mOrientationHelper.getDecoratedEnd(referenceView) <
+                        mOrientationHelper.getDecoratedEnd(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            }
+        }
+        return referenceView;
+    }
+
+    @Override
+    public int computeHorizontalScrollExtent(@NonNull RecyclerView.State state) {
+        int scrollExtent = computeScrollExtent(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeHorizontalScrollExtent: " + scrollExtent);
+        }
+        return scrollExtent;
+    }
+
+    @Override
+    public int computeVerticalScrollExtent(@NonNull RecyclerView.State state) {
+        int scrollExtent = computeScrollExtent(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeVerticalScrollExtent: " + scrollExtent);
+        }
+        return scrollExtent;
+    }
+
+    private int computeScrollExtent(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        int allChildrenCount = state.getItemCount();
+        ensureOrientationHelper();
+        View firstReferenceView = findFirstReferenceChild(allChildrenCount);
+        View lastReferenceView = findLastReferenceChild(allChildrenCount);
+        if (state.getItemCount() == 0 || firstReferenceView == null || lastReferenceView == null) {
+            return 0;
+        }
+        // TODO: Need to consider the reverse pattern when flexWrap == wrap_reverse is implemented
+        int extend = mOrientationHelper.getDecoratedEnd(lastReferenceView) -
+                mOrientationHelper.getDecoratedStart(firstReferenceView);
+        return Math.min(mOrientationHelper.getTotalSpace(), extend);
+    }
+
+    @Override
+    public int computeHorizontalScrollOffset(@NonNull RecyclerView.State state) {
+        int scrollOffset = computeScrollOffset(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeHorizontalScrollOffset: " + scrollOffset);
+        }
+        return scrollOffset;
+    }
+
+    @Override
+    public int computeVerticalScrollOffset(@NonNull RecyclerView.State state) {
+        int scrollOffset = computeScrollOffset(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeVerticalScrollOffset: " + scrollOffset);
+        }
+        return scrollOffset;
+    }
+
+    private int computeScrollOffset(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        int allChildrenCount = state.getItemCount();
+        View firstReferenceView = findFirstReferenceChild(allChildrenCount);
+        View lastReferenceView = findLastReferenceChild(allChildrenCount);
+        if (state.getItemCount() == 0 || firstReferenceView == null || lastReferenceView == null) {
+            return 0;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int minPosition = getPosition(firstReferenceView);
+        int maxPosition = getPosition(lastReferenceView);
+        int laidOutArea = Math.abs(mOrientationHelper.getDecoratedEnd(lastReferenceView) -
+                mOrientationHelper.getDecoratedStart(firstReferenceView));
+        int firstLinePosition = mFlexboxHelper.mIndexToFlexLine[minPosition];
+        if (firstLinePosition == 0 || firstLinePosition == NO_POSITION) {
+            return 0;
+        }
+        int lastLinePosition = mFlexboxHelper.mIndexToFlexLine[maxPosition];
+        int lineRange = lastLinePosition - firstLinePosition + 1;
+        float averageSizePerLine = (float) laidOutArea / lineRange;
+        // The number of lines before the first line is equal to the value of firstLinePosition
+        return Math.round(
+                firstLinePosition * averageSizePerLine + (mOrientationHelper.getStartAfterPadding()
+                        - mOrientationHelper.getDecoratedStart(firstReferenceView)));
+    }
+
+    @Override
+    public int computeHorizontalScrollRange(@NonNull RecyclerView.State state) {
+        int scrollRange = computeScrollRange(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeHorizontalScrollRange: " + scrollRange);
+        }
+        return scrollRange;
+    }
+
+    @Override
+    public int computeVerticalScrollRange(@NonNull RecyclerView.State state) {
+        int scrollRange = computeScrollRange(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeVerticalScrollRange: " + scrollRange);
+        }
+        return scrollRange;
+    }
+
+    /**
+     * @return the estimate total length of the flex container.
+     * Note that this method estimates the length by using the number of the visible items and the
+     * rest of the non-visible items. So the value returned by this method isn't the exact length
+     * of the container. So the scroll bar position may be slightly different from the actual
+     * expected position
+     */
+    private int computeScrollRange(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        int allItemCount = state.getItemCount();
+        View firstReferenceView = findFirstReferenceChild(allItemCount);
+        View lastReferenceView = findLastReferenceChild(allItemCount);
+        if (state.getItemCount() == 0 || firstReferenceView == null || lastReferenceView == null) {
+            return 0;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int firstVisiblePosition = findFirstVisibleItemPosition();
+        int lastVisiblePosition = findLastVisibleItemPosition();
+        int laidOutArea = Math.abs(mOrientationHelper.getDecoratedEnd(lastReferenceView) -
+                mOrientationHelper.getDecoratedStart(firstReferenceView));
+        int laidOutRange = lastVisiblePosition - firstVisiblePosition + 1;
+        return (int) ((float) laidOutArea / laidOutRange * state.getItemCount());
+    }
+
+    /**
+     * Copied from {@link RecyclerView.LayoutManager#shouldMeasureChild
+     * (View,
+     * int, int, RecyclerView.LayoutParams)}}
+     */
+    private boolean shouldMeasureChild(View child, int widthSpec, int heightSpec,
+            RecyclerView.LayoutParams lp) {
+        return child.isLayoutRequested()
+                || !isMeasurementCacheEnabled()
+                || !isMeasurementUpToDate(child.getWidth(), widthSpec, lp.width)
+                || !isMeasurementUpToDate(child.getHeight(), heightSpec, lp.height);
+    }
+
+    /**
+     * Copied from
+     * {@link RecyclerView.LayoutManager#isMeasurementUpToDate(int, int,
+     * int)}
+     */
+    private static boolean isMeasurementUpToDate(int childSize, int spec, int dimension) {
+        final int specMode = View.MeasureSpec.getMode(spec);
+        final int specSize = View.MeasureSpec.getSize(spec);
+        if (dimension > 0 && childSize != dimension) {
+            return false;
+        }
+        switch (specMode) {
+            case View.MeasureSpec.UNSPECIFIED:
+                return true;
+            case View.MeasureSpec.AT_MOST:
+                return specSize >= childSize;
+            case View.MeasureSpec.EXACTLY:
+                return specSize == childSize;
+        }
+        return false;
+    }
+
+    private void clearFlexLines() {
+        mFlexLines.clear();
+        mAnchorInfo.reset();
+        mAnchorInfo.mPerpendicularCoordinate = 0;
+    }
+
+    private int getChildLeft(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedLeft(view) - params.leftMargin;
+    }
+
+    private int getChildRight(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedRight(view) + params.rightMargin;
+    }
+
+    private int getChildTop(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedTop(view) - params.topMargin;
+    }
+
+    private int getChildBottom(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedBottom(view) + params.bottomMargin;
+    }
+
+    /**
+     * @param view              the view to be examined if it's visible
+     * @param completelyVisible when passed as {@code true}, this method checks if the view bounds
+     *                          don't overlap the bounds of the RecyclerView. When passed as
+     *                          {@code false}, this method checks if the view bounds are partially
+     *                          visible within the RecyclerView.
+     * @return if the view passed as an argument is visible (view bounds are within the parent
+     * RecyclerView)
+     */
+    private boolean isViewVisible(View view, boolean completelyVisible) {
+        int left = getPaddingLeft();
+        int top = getPaddingTop();
+        int right = getWidth() - getPaddingRight();
+        int bottom = getHeight() - getPaddingBottom();
+        int childLeft = getChildLeft(view);
+        int childTop = getChildTop(view);
+        int childRight = getChildRight(view);
+        int childBottom = getChildBottom(view);
+
+        boolean horizontalCompletelyVisible = false;
+        boolean horizontalPartiallyVisible = false;
+        boolean verticalCompletelyVisible = false;
+        boolean verticalPartiallyVisible = false;
+        if (left <= childLeft && right >= childRight) {
+            horizontalCompletelyVisible = true;
+        }
+        if (childLeft >= right || childRight >= left) {
+            horizontalPartiallyVisible = true;
+        }
+
+        if (top <= childTop && bottom >= childBottom) {
+            verticalCompletelyVisible = true;
+        }
+        if (childTop >= bottom || childBottom >= top) {
+            verticalPartiallyVisible = true;
+        }
+        if (completelyVisible) {
+            return horizontalCompletelyVisible && verticalCompletelyVisible;
+        } else {
+            return horizontalPartiallyVisible && verticalPartiallyVisible;
+        }
+    }
+
+    /**
+     * Returns the adapter position of the first visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * If RecyclerView has item decorators, they will be considered in calculations as well.
+     * LayoutManager may pre-cache some views that are not necessarily visible. Those views
+     * are ignored in this method.
+     *
+     * @return The adapter position of the first visible item or {@link RecyclerView#NO_POSITION} if
+     * there aren't any visible items.
+     * @see #findFirstCompletelyVisibleItemPosition()
+     * @see #findLastVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findFirstVisibleItemPosition() {
+        final View child = findOneVisibleChild(0, getChildCount(), false);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the first fully visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * @return The adapter position of the first fully visible item or
+     * {@link RecyclerView#NO_POSITION} if there aren't any visible items.
+     * @see #findFirstVisibleItemPosition()
+     * @see #findLastCompletelyVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findFirstCompletelyVisibleItemPosition() {
+        final View child = findOneVisibleChild(0, getChildCount(), true);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the last visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * If RecyclerView has item decorators, they will be considered in calculations as well.
+     * LayoutManager may pre-cache some views that are not necessarily visible. Those views
+     * are ignored in this method.
+     *
+     * @return The adapter position of the last visible view or {@link RecyclerView#NO_POSITION} if
+     * there aren't any visible items.
+     * @see #findLastCompletelyVisibleItemPosition()
+     * @see #findFirstVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findLastVisibleItemPosition() {
+        final View child = findOneVisibleChild(getChildCount() - 1, -1, false);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the last fully visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * @return The adapter position of the last fully visible view or
+     * {@link RecyclerView#NO_POSITION} if there aren't any visible items.
+     * @see #findLastVisibleItemPosition()
+     * @see #findFirstCompletelyVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findLastCompletelyVisibleItemPosition() {
+        final View child = findOneVisibleChild(getChildCount() - 1, -1, true);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the first child that is visible in the provided index range, i.e. either partially or
+     * fully visible depending on the arguments provided.
+     *
+     * @param fromIndex         the start index for searching the visible child
+     * @param toIndex           the last index for searching the visible child
+     * @param completelyVisible when passed as {@code true}, this method checks if the view bounds
+     *                          don't overlap the bounds of the RecyclerView. When passed as
+     *                          {@code false}, this method checks if the view bounds are partially
+     *                          visible within the RecyclerView.
+     * @return the first child that is visible.
+     */
+    private View findOneVisibleChild(int fromIndex, int toIndex, boolean completelyVisible) {
+        int next = toIndex > fromIndex ? 1 : -1;
+        for (int i = fromIndex; i != toIndex; i += next) {
+            View view = getChildAt(i);
+            if (isViewVisible(view, completelyVisible)) {
+                return view;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param position the index of the view
+     * @return the index of the {@link FlexLine}, which includes the view whose index is passed as
+     * the position argument.
+     */
+    int getPositionToFlexLineIndex(int position) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        return mFlexboxHelper.mIndexToFlexLine[position];
+    }
+
+    /**
+     * LayoutParams used by the {@link FlexboxLayoutManager}, which stores per-child information
+     * required for the Flexbox.
+     *
+     * Note that some parent fields (which are not primitive nor a class implements
+     * {@link Parcelable}) are not included as the stored/restored fields after this class
+     * is serialized/de-serialized as an {@link Parcelable}.
+     */
+    public static class LayoutParams extends RecyclerView.LayoutParams implements FlexItem {
+
+        /**
+         * @see FlexItem#getFlexGrow()
+         */
+        private float mFlexGrow = FlexItem.FLEX_GROW_DEFAULT;
+
+        /**
+         * @see FlexItem#getFlexShrink()
+         */
+        private float mFlexShrink = FlexItem.FLEX_SHRINK_DEFAULT;
+
+        /**
+         * @see FlexItem#getAlignSelf()
+         */
+        private int mAlignSelf = AlignSelf.AUTO;
+
+        /**
+         * @see FlexItem#getFlexBasisPercent()
+         */
+        private float mFlexBasisPercent = FlexItem.FLEX_BASIS_PERCENT_DEFAULT;
+
+        /**
+         * @see FlexItem#getMinWidth()
+         */
+        private int mMinWidth;
+
+        /**
+         * @see FlexItem#getMinHeight()
+         */
+        private int mMinHeight;
+
+        /**
+         * @see FlexItem#getMaxWidth()
+         */
+        private int mMaxWidth = MAX_SIZE;
+
+        /**
+         * @see FlexItem#getMaxHeight()
+         */
+        private int mMaxHeight = MAX_SIZE;
+
+        /**
+         * @see FlexItem#isWrapBefore()
+         */
+        private boolean mWrapBefore;
+
+        @Override
+        public int getWidth() {
+            return width;
+        }
+
+        @Override
+        public void setWidth(int width) {
+            this.width = width;
+        }
+
+        @Override
+        public int getHeight() {
+            return height;
+        }
+
+        @Override
+        public void setHeight(int height) {
+            this.height = height;
+        }
+
+        @Override
+        public float getFlexGrow() {
+            return mFlexGrow;
+        }
+
+        @Override
+        public void setFlexGrow(float flexGrow) {
+            this.mFlexGrow = flexGrow;
+        }
+
+        @Override
+        public float getFlexShrink() {
+            return mFlexShrink;
+        }
+
+        @Override
+        public void setFlexShrink(float flexShrink) {
+            this.mFlexShrink = flexShrink;
+        }
+
+        @AlignSelf
+        @Override
+        public int getAlignSelf() {
+            return mAlignSelf;
+        }
+
+        @Override
+        public void setAlignSelf(@AlignSelf int alignSelf) {
+            this.mAlignSelf = alignSelf;
+        }
+
+        @Override
+        public int getMinWidth() {
+            return mMinWidth;
+        }
+
+        @Override
+        public void setMinWidth(int minWidth) {
+            this.mMinWidth = minWidth;
+        }
+
+        @Override
+        public int getMinHeight() {
+            return mMinHeight;
+        }
+
+        @Override
+        public void setMinHeight(int minHeight) {
+            this.mMinHeight = minHeight;
+        }
+
+        @Override
+        public int getMaxWidth() {
+            return mMaxWidth;
+        }
+
+        @Override
+        public void setMaxWidth(int maxWidth) {
+            this.mMaxWidth = maxWidth;
+        }
+
+        @Override
+        public int getMaxHeight() {
+            return mMaxHeight;
+        }
+
+        @Override
+        public void setMaxHeight(int maxHeight) {
+            this.mMaxHeight = maxHeight;
+        }
+
+        @Override
+        public boolean isWrapBefore() {
+            return mWrapBefore;
+        }
+
+        @Override
+        public void setWrapBefore(boolean wrapBefore) {
+            this.mWrapBefore = wrapBefore;
+        }
+
+        @Override
+        public float getFlexBasisPercent() {
+            return mFlexBasisPercent;
+        }
+
+        @Override
+        public void setFlexBasisPercent(float flexBasisPercent) {
+            this.mFlexBasisPercent = flexBasisPercent;
+        }
+
+        @Override
+        public int getMarginLeft() {
+            return leftMargin;
+        }
+
+        @Override
+        public int getMarginTop() {
+            return topMargin;
+        }
+
+        @Override
+        public int getMarginRight() {
+            return rightMargin;
+        }
+
+        @Override
+        public int getMarginBottom() {
+            return bottomMargin;
+        }
+
+        public LayoutParams(Context c, AttributeSet attrs) {
+            super(c, attrs);
+        }
+
+        public LayoutParams(int width, int height) {
+            super(width, height);
+        }
+
+        public LayoutParams(ViewGroup.MarginLayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(ViewGroup.LayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(RecyclerView.LayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(LayoutParams source) {
+            super(source);
+
+            mFlexGrow = source.mFlexGrow;
+            mFlexShrink = source.mFlexShrink;
+            mAlignSelf = source.mAlignSelf;
+            mFlexBasisPercent = source.mFlexBasisPercent;
+            mMinWidth = source.mMinWidth;
+            mMinHeight = source.mMinHeight;
+            mMaxWidth = source.mMaxWidth;
+            mMaxHeight = source.mMaxHeight;
+            mWrapBefore = source.mWrapBefore;
+        }
+
+        @Override
+        public int getOrder() {
+            return FlexItem.ORDER_DEFAULT;
+        }
+
+        @Override
+        public void setOrder(int order) {
+            // Unlike the FlexboxLayout, the order attribute is not supported, we don't calculate
+            // the order attribute because preparing the order attribute requires all
+            // view holders to be inflated at least once, which is inefficient if the number of
+            // items in the adapter is large
+            throw new UnsupportedOperationException("Setting the order in the "
+                    + "FlexboxLayoutManager is not supported. Use FlexboxLayout "
+                    + "if you need to reorder using the attribute.");
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeFloat(this.mFlexGrow);
+            dest.writeFloat(this.mFlexShrink);
+            dest.writeInt(this.mAlignSelf);
+            dest.writeFloat(this.mFlexBasisPercent);
+            dest.writeInt(this.mMinWidth);
+            dest.writeInt(this.mMinHeight);
+            dest.writeInt(this.mMaxWidth);
+            dest.writeInt(this.mMaxHeight);
+            dest.writeByte(this.mWrapBefore ? (byte) 1 : (byte) 0);
+            dest.writeInt(this.bottomMargin);
+            dest.writeInt(this.leftMargin);
+            dest.writeInt(this.rightMargin);
+            dest.writeInt(this.topMargin);
+            dest.writeInt(this.height);
+            dest.writeInt(this.width);
+        }
+
+        protected LayoutParams(Parcel in) {
+            super(WRAP_CONTENT, WRAP_CONTENT);
+            this.mFlexGrow = in.readFloat();
+            this.mFlexShrink = in.readFloat();
+            this.mAlignSelf = in.readInt();
+            this.mFlexBasisPercent = in.readFloat();
+            this.mMinWidth = in.readInt();
+            this.mMinHeight = in.readInt();
+            this.mMaxWidth = in.readInt();
+            this.mMaxHeight = in.readInt();
+            this.mWrapBefore = in.readByte() != 0;
+            this.bottomMargin = in.readInt();
+            this.leftMargin = in.readInt();
+            this.rightMargin = in.readInt();
+            this.topMargin = in.readInt();
+            this.height = in.readInt();
+            this.width = in.readInt();
+        }
+
+        public static final Parcelable.Creator<LayoutParams> CREATOR
+                = new Parcelable.Creator<LayoutParams>() {
+            @Override
+            public LayoutParams createFromParcel(Parcel source) {
+                return new LayoutParams(source);
+            }
+
+            @Override
+            public LayoutParams[] newArray(int size) {
+                return new LayoutParams[size];
+            }
+        };
+    }
+
+    /**
+     * A class that holds the information about an anchor position like from what pixels layout
+     * should start.
+     */
+    private class AnchorInfo {
+
+        private int mPosition;
+
+        private int mFlexLinePosition;
+
+        private int mCoordinate;
+
+        /**
+         * The anchor position of the main axis, which is the secondary scrolling direction.
+         */
+        private int mPerpendicularCoordinate = 0;
+
+        private boolean mLayoutFromEnd;
+
+        private boolean mValid;
+
+        private boolean mAssignedFromSavedState;
+
+        private void reset() {
+            mPosition = NO_POSITION;
+            mFlexLinePosition = NO_POSITION;
+            mCoordinate = INVALID_OFFSET;
+            mValid = false;
+            mAssignedFromSavedState = false;
+            if (isMainAxisDirectionHorizontal()) {
+                if (mFlexWrap == FlexWrap.NOWRAP) {
+                    mLayoutFromEnd = mFlexDirection == FlexDirection.ROW_REVERSE;
+                } else {
+                    mLayoutFromEnd = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                }
+            } else {
+                if (mFlexWrap == FlexWrap.NOWRAP) {
+                    mLayoutFromEnd = mFlexDirection == FlexDirection.COLUMN_REVERSE;
+                } else {
+                    mLayoutFromEnd = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                }
+            }
+        }
+
+        private void assignCoordinateFromPadding() {
+            if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+                mCoordinate = mLayoutFromEnd ? mOrientationHelper.getEndAfterPadding()
+                        : getWidth() - mOrientationHelper.getStartAfterPadding();
+            } else {
+                mCoordinate = mLayoutFromEnd ? mOrientationHelper.getEndAfterPadding()
+                        : mOrientationHelper.getStartAfterPadding();
+            }
+        }
+
+        private void assignFromView(View anchor) {
+            OrientationHelper orientationHelper;
+            // When the flex wrap is nowrap, the orientation helper is changed to
+            // perpendicular. Need to use the mSubOrientationHelper to be consistent with
+            // when flex wrap is not nowrap.
+            if (mFlexWrap == FlexWrap.NOWRAP) {
+                orientationHelper = mSubOrientationHelper;
+            } else {
+                orientationHelper = mOrientationHelper;
+            }
+            if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+                // We need to use the anchor view as starting from right if the flex direction is
+                // (column or column_reverse) and layout direction is RTL.
+                if (mLayoutFromEnd) {
+                    mCoordinate = orientationHelper.getDecoratedStart(anchor) +
+                        orientationHelper.getTotalSpaceChange();
+                } else {
+                    mCoordinate = orientationHelper.getDecoratedEnd(anchor);
+                }
+            } else {
+                if (mLayoutFromEnd) {
+                    mCoordinate = orientationHelper.getDecoratedEnd(anchor) +
+                        orientationHelper.getTotalSpaceChange();
+                } else {
+                    mCoordinate = orientationHelper.getDecoratedStart(anchor);
+                }
+            }
+            mPosition = getPosition(anchor);
+            mAssignedFromSavedState = false;
+            assert mFlexboxHelper.mIndexToFlexLine != null;
+            int flexLinePosition =
+                    mFlexboxHelper.mIndexToFlexLine[mPosition != NO_POSITION ? mPosition : 0];
+            mFlexLinePosition = flexLinePosition != NO_POSITION ? flexLinePosition : 0;
+            // It's likely that the view is the first item in a flex line, but if not get the
+            // index of the first item in the same line because the calculation of the flex lines
+            // expects that it starts from the first item in a flex line
+            if (mFlexLines.size() > mFlexLinePosition) {
+                mPosition = mFlexLines.get(mFlexLinePosition).mFirstIndex;
+            }
+        }
+
+        @Override
+        @NonNull
+        public String toString() {
+            return "AnchorInfo{" +
+                    "mPosition=" + mPosition +
+                    ", mFlexLinePosition=" + mFlexLinePosition +
+                    ", mCoordinate=" + mCoordinate +
+                    ", mPerpendicularCoordinate=" + mPerpendicularCoordinate +
+                    ", mLayoutFromEnd=" + mLayoutFromEnd +
+                    ", mValid=" + mValid +
+                    ", mAssignedFromSavedState=" + mAssignedFromSavedState +
+                    '}';
+        }
+    }
+
+    /**
+     * Helper class that keeps temporary state while the FlexboxLayoutManager is filling out the
+     * empty space.
+     */
+    private static class LayoutState {
+
+        private final static int SCROLLING_OFFSET_NaN = Integer.MIN_VALUE;
+
+        private static final int LAYOUT_START = -1;
+        private static final int LAYOUT_END = 1;
+
+        private static final int ITEM_DIRECTION_TAIL = 1;
+
+        /** Number of pixels that we should fill, in the layout direction. */
+        private int mAvailable;
+
+        /** If set to true, the value of {@link #mAvailable} is considered as infinite. */
+        private boolean mInfinite;
+
+        // TODO: Add mExtra to support better smooth scrolling
+
+        /** Current position on the flex lines being laid out in the layout call */
+        private int mFlexLinePosition;
+
+        /** Current position on the adapter to get the next item. */
+        private int mPosition;
+
+        /** Pixel offset where layout should start */
+        private int mOffset;
+
+        /**
+         * Used when LayoutState is constructed in a scrolling state.
+         * It should be set the amount of scrolling we can make without creating a new view.
+         * Settings this is required for efficient view recycling.
+         */
+        private int mScrollingOffset;
+
+        /**
+         * The most recent
+         * {@link #scrollVerticallyBy(int, RecyclerView.Recycler, RecyclerView.State)} or
+         * {@link #scrollHorizontallyBy(int, RecyclerView.Recycler, RecyclerView.State)} amount.
+         */
+        private int mLastScrollDelta;
+
+        private int mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+
+        private int mLayoutDirection = LayoutState.LAYOUT_END;
+
+        private boolean mShouldRecycle;
+
+        /**
+         * @return {@code true} if there are more items to layout
+         */
+        private boolean hasMore(RecyclerView.State state, List<FlexLine> flexLines) {
+            return mPosition >= 0 && mPosition < state.getItemCount() &&
+                    mFlexLinePosition >= 0 && mFlexLinePosition < flexLines.size();
+        }
+
+        @Override
+        @NonNull
+        public String toString() {
+            return "LayoutState{" +
+                    "mAvailable=" + mAvailable +
+                    ", mFlexLinePosition=" + mFlexLinePosition +
+                    ", mPosition=" + mPosition +
+                    ", mOffset=" + mOffset +
+                    ", mScrollingOffset=" + mScrollingOffset +
+                    ", mLastScrollDelta=" + mLastScrollDelta +
+                    ", mItemDirection=" + mItemDirection +
+                    ", mLayoutDirection=" + mLayoutDirection +
+                    '}';
+        }
+    }
+
+    /**
+     * The saved state that needs to be restored after the RecyclerView is recreated.
+     */
+    private static class SavedState implements Parcelable {
+
+        /** The adapter position of the first visible view */
+        private int mAnchorPosition;
+
+        /**
+         * The offset of the first visible view.
+         * E.g. if this value is set as -30, the fist visible view's top is off screen by 30 pixels
+         */
+        private int mAnchorOffset;
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(this.mAnchorPosition);
+            dest.writeInt(this.mAnchorOffset);
+        }
+
+        SavedState() {
+        }
+
+        private SavedState(Parcel in) {
+            this.mAnchorPosition = in.readInt();
+            this.mAnchorOffset = in.readInt();
+        }
+
+        private SavedState(SavedState savedState) {
+            mAnchorPosition = savedState.mAnchorPosition;
+            mAnchorOffset = savedState.mAnchorOffset;
+        }
+
+        private void invalidateAnchor() {
+            mAnchorPosition = NO_POSITION;
+        }
+
+        private boolean hasValidAnchor(int itemCount) {
+            return mAnchorPosition >= 0 && mAnchorPosition < itemCount;
+        }
+
+        public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
+            @Override
+            public SavedState createFromParcel(Parcel source) {
+                return new SavedState(source);
+            }
+
+            @Override
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+
+        @Override
+        @NonNull
+        public String toString() {
+            return "SavedState{" +
+                    "mAnchorPosition=" + mAnchorPosition +
+                    ", mAnchorOffset=" + mAnchorOffset +
+                    '}';
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/JustifyContent.java b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/JustifyContent.java
new file mode 100755
index 0000000..e6505b4
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/JustifyContent.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/** This attribute controls the alignment along the main axis. */
+@IntDef({JustifyContent.FLEX_START, JustifyContent.FLEX_END, JustifyContent.CENTER,
+        JustifyContent.SPACE_BETWEEN, JustifyContent.SPACE_AROUND, JustifyContent.SPACE_EVENLY})
+@Retention(RetentionPolicy.SOURCE)
+public @interface JustifyContent {
+
+    /** Flex items are packed toward the start line. */
+    int FLEX_START = 0;
+
+    /** Flex items are packed toward the end line. */
+    int FLEX_END = 1;
+
+    /** Flex items are centered along the flex line where the flex items belong. */
+    int CENTER = 2;
+
+    /**
+     * Flex items are evenly distributed along the flex line, first flex item is on the
+     * start line, the last flex item is on the end line.
+     */
+    int SPACE_BETWEEN = 3;
+
+    /**
+     * Flex items are evenly distributed along the flex line with the same amount of spaces between
+     * the flex lines.
+     */
+    int SPACE_AROUND = 4;
+
+    /**
+     * Flex items are evenly distributed along the flex line. The difference between
+     * {@link #SPACE_AROUND} is that all the spaces between items should be the same as the
+     * space before the first item and after the last item.
+     * See
+     * <a href="https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content">the document on MDN</a>
+     * for more details.
+     */
+    int SPACE_EVENLY = 5;
+}
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/res/values/attrs.xml b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/res/values/attrs.xml
new file mode 100755
index 0000000..277f885
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/flexbox/src/main/res/values/attrs.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <declare-styleable name="FlexboxLayout">
+        <attr name="flexDirection">
+            <enum name="row" value="0" />
+            <enum name="row_reverse" value="1" />
+            <enum name="column" value="2" />
+            <enum name="column_reverse" value="3" />
+        </attr>
+
+        <attr name="flexWrap">
+            <enum name="nowrap" value="0" />
+            <enum name="wrap" value="1" />
+            <enum name="wrap_reverse" value="2" />
+        </attr>
+
+        <!--
+            Omitting flex-flow property since it's reflected in the parent flex container.
+            Set the flexDirection and/or flexWrap to the parent flex container explicitly if you
+            want to use the flex-flow similar way to the web.
+         -->
+
+        <attr name="justifyContent">
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="space_between" value="3" />
+            <enum name="space_around" value="4" />
+            <enum name="space_evenly" value="5" />
+        </attr>
+
+        <attr name="alignItems">
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="baseline" value="3" />
+            <enum name="stretch" value="4" />
+        </attr>
+
+        <attr name="alignContent">
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="space_between" value="3" />
+            <enum name="space_around" value="4" />
+            <enum name="stretch" value="5" />
+        </attr>
+
+        <attr name="dividerDrawable" format="reference" />
+        <attr name="dividerDrawableHorizontal" format="reference" />
+        <attr name="dividerDrawableVertical" format="reference" />
+
+        <attr name="showDivider">
+            <flag name="none" value="0" />
+            <flag name="beginning" value="1" />
+            <flag name="middle" value="2" />
+            <flag name="end" value="4" />
+        </attr>
+        <attr name="showDividerHorizontal">
+            <flag name="none" value="0" />
+            <flag name="beginning" value="1" />
+            <flag name="middle" value="2" />
+            <flag name="end" value="4" />
+        </attr>
+        <attr name="showDividerVertical">
+            <flag name="none" value="0" />
+            <flag name="beginning" value="1" />
+            <flag name="middle" value="2" />
+            <flag name="end" value="4" />
+        </attr>
+
+        <!--
+            The attribute that specifies the maximum number of flex lines. This attribute is
+            effective only when the flexWrap attribute is "wrap" or "wrap_reverse".
+        -->
+        <attr name="maxLine" format="integer" />
+
+    </declare-styleable>
+
+    <declare-styleable name="FlexboxLayout_Layout">
+        <attr name="layout_order" format="integer" />
+
+        <!-- Negative numbers are invalid. -->
+        <attr name="layout_flexGrow" format="float" />
+
+        <!-- Negative numbers are invalid. -->
+        <attr name="layout_flexShrink" format="float" />
+
+        <!--
+            The initial length in a percentage format relative to its parent. This is similar to the
+            flex-basis property in the original CSS specification.
+            (https://www.w3.org/TR/css-flexbox-1/#flex-basis-property)
+            But unlike the flex-basis property, this attribute only accepts a value in fraction
+            (percentage), whereas flex-basis property accepts width values such as 1em, 10px and
+            the 'content' string.
+            But specifying initial fixed width values can be done by specifying width values in
+            layout_width (or layout_height, varies depending on the flexDirection). Also the same
+            effect can be done by specifying "wrap_content" in layout_width (or layout_height) if
+            developers want to achieve the same effect as 'content'.
+            Thus, this attribute only accepts fraction values, which can't be done through
+            layout_width (or layout_height) for simplicity.
+        -->
+        <attr name="layout_flexBasisPercent" format="fraction" />
+
+        <!--
+            Omitting flex property since it's a shorthand for layout_flexGrow and layout_flexShrink
+            and layout_percentInParent (flex-basis in the original CSS spec).
+        -->
+
+        <attr name="layout_alignSelf">
+            <enum name="auto" value="-1" />
+            <!-- The values below need to match the values of alignItems -->
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="baseline" value="3" />
+            <enum name="stretch" value="4" />
+        </attr>
+
+        <attr name="layout_minWidth" format="dimension" />
+        <attr name="layout_minHeight" format="dimension" />
+        <attr name="layout_maxWidth" format="dimension" />
+        <attr name="layout_maxHeight" format="dimension" />
+
+        <!--
+            This attribute forces a flex line wrapping. i.e. if this is set to true for a
+            flex item, the item will become the first item of a flex line. (A wrapping happens
+            regardless of the flex items being processed in the the previous flex line)
+            This attribute is ignored if the flex_wrap attribute is set to nowrap.
+            The equivalent attribute isn't defined in the original CSS Flexible Box Module
+            specification, but having this attribute is useful for Android developers to flatten
+            the layouts when building a grid like layout or for a situation where developers want
+            to put a new flex line to make a semantic difference from the previous one, etc.
+        -->
+        <attr name="layout_wrapBefore" format="boolean" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/gradle.properties b/OnTime_Merchant_live/lib/flexbox-layout/gradle.properties
new file mode 100755
index 0000000..1f0a9ed
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/gradle.properties
@@ -0,0 +1,37 @@
+#
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/gradle/wrapper/gradle-wrapper.properties b/OnTime_Merchant_live/lib/flexbox-layout/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..52aa872
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Mar 02 14:58:35 WIB 2026
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/gradlew b/OnTime_Merchant_live/lib/flexbox-layout/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/gradlew.bat b/OnTime_Merchant_live/lib/flexbox-layout/gradlew.bat
new file mode 100755
index 0000000..e95643d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/settings.gradle b/OnTime_Merchant_live/lib/flexbox-layout/settings.gradle
new file mode 100755
index 0000000..8d26cda
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/settings.gradle
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+include ':demo-playground', ':demo-cat-gallery', ':flexbox'
diff --git a/OnTime_Merchant_live/lib/flexbox-layout/tool/codeStyleSettings.xml b/OnTime_Merchant_live/lib/flexbox-layout/tool/codeStyleSettings.xml
new file mode 100755
index 0000000..bfd09bd
--- /dev/null
+++ b/OnTime_Merchant_live/lib/flexbox-layout/tool/codeStyleSettings.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="FIELD_NAME_PREFIX" value="m" />
+        <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
+        <option name="IMPORT_LAYOUT_TABLE">
+          <value>
+            <package name="android" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="com.android" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="dalvik" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="libcore" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="com" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="gov" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="junit" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="net" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="org" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="java" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="javax" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="android" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com.android" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="dalvik" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="libcore" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="gov" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="junit" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="net" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="javax" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="false" />
+          </value>
+        </option>
+        <option name="RIGHT_MARGIN" value="100" />
+        <option name="JD_P_AT_EMPTY_LINES" value="false" />
+        <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+        <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+        <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
+        <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+        <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
+        <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+        <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+        <option name="BLANK_LINES_AROUND_FIELD" value="1" />
+        <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+        <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+        <option name="ALIGN_MULTILINE_FOR" value="false" />
+        <option name="CALL_PARAMETERS_WRAP" value="1" />
+        <option name="METHOD_PARAMETERS_WRAP" value="1" />
+        <option name="EXTENDS_LIST_WRAP" value="1" />
+        <option name="THROWS_LIST_WRAP" value="1" />
+        <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+        <option name="THROWS_KEYWORD_WRAP" value="1" />
+        <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+        <option name="BINARY_OPERATION_WRAP" value="1" />
+        <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+        <option name="TERNARY_OPERATION_WRAP" value="1" />
+        <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+        <option name="FOR_STATEMENT_WRAP" value="1" />
+        <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+        <option name="ASSIGNMENT_WRAP" value="1" />
+        <option name="PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE" value="true" />
+        <option name="WRAP_COMMENTS" value="true" />
+        <option name="IF_BRACE_FORCE" value="3" />
+        <option name="DOWHILE_BRACE_FORCE" value="3" />
+        <option name="WHILE_BRACE_FORCE" value="3" />
+        <option name="FOR_BRACE_FORCE" value="3" />
+        <Objective-C-extensions>
+          <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
+          <option name="RELEASE_STYLE" value="IVAR" />
+          <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" />
+          <file>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+          </file>
+          <class>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+          </class>
+          <extensions>
+            <pair source="cpp" header="h" />
+            <pair source="c" header="h" />
+          </extensions>
+        </Objective-C-extensions>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <ADDITIONAL_INDENT_OPTIONS fileType="java">
+          <option name="TAB_SIZE" value="8" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="js">
+          <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <codeStyleSettings language="JAVA">
+          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+          <option name="ALIGN_MULTILINE_FOR" value="false" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="PREFER_PARAMETERS_WRAP" value="true" />
+          <option name="METHOD_PARAMETERS_WRAP" value="1" />
+          <option name="RESOURCE_LIST_WRAP" value="1" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="THROWS_LIST_WRAP" value="1" />
+          <option name="THROWS_KEYWORD_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="1" />
+          <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+          <option name="TERNARY_OPERATION_WRAP" value="1" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="1" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="WRAP_LONG_LINES" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="XML">
+          <option name="FORCE_REARRANGE_MODE" value="1" />
+          <indentOptions>
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+          </indentOptions>
+          <arrangement>
+            <rules>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>xmlns:android</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>xmlns:.*</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:id</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:name</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>name</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>style</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_width</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_height</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_.*</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:width</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:height</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>.*</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+            </rules>
+          </arrangement>
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="AndroidStyle" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/.gitignore b/OnTime_Merchant_live/lib/overscroll-decor/.gitignore
new file mode 100755
index 0000000..5df5e83
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/.gitignore
@@ -0,0 +1,9 @@
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+/.idea
+*iml
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/LICENSE b/OnTime_Merchant_live/lib/overscroll-decor/LICENSE
new file mode 100755
index 0000000..2772b5d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2015, DoAT Media Ltd.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/README.md b/OnTime_Merchant_live/lib/overscroll-decor/README.md
new file mode 100755
index 0000000..3c552fc
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/README.md
@@ -0,0 +1,266 @@
+> **Announcement**
+>
+> An update regarding Bintray's shutdown: The library has been successfuly republished onto maven central, but with a different Group ID; Please update your Gradle dependencies as follows:
+>
+> ```diff
+> -implementation 'me.everything:overscroll-decor-android:1.1.0'
+> +implementation 'io.github.everythingme:overscroll-decor-android:1.1.1'
+> ```
+
+# Over-Scroll Support For Android's RecyclerView, ListView, GridView, ScrollView ...
+
+The library provides an iOS-like over-scrolling effect applicable over almost all Android native scrollable views. It is also built to allow for very easy adaptation to support custom views.
+
+The core effect classes are loose-[decorators](https://en.wikipedia.org/wiki/Decorator_pattern) of Android views, and are thus decoupled from the actual view classes' implementations. That allows developers to apply the effect over views while keeping them as untampered 'black-boxes'. Namely, it allows for keeping important optimizations such as view-recycling intact.
+
+![RecyclerView demo](recyclerview_demo.gif)
+
+# Gradle Dependency
+
+Add the following to your module's `build.gradle` file:
+
+```groovy
+dependencies {
+    // ...
+    
+    implementation 'io.github.everythingme:overscroll-decor-android:1.1.1'
+}
+```
+
+# Usage
+
+### RecyclerView
+
+Supports both linear and staggered-grid layout managers (i.e. all native Android layouts).
+Can be easily adapted to support custom layout managers.
+
+```java
+RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+    
+// Horizontal
+OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+// Vertical
+OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+```
+
+### RecyclerView with items swiping / dragging
+See _Advanced Usage_.
+
+
+### ListView
+
+```java
+ListView listView = (ListView) findViewById(R.id.list_view);
+OverScrollDecoratorHelper.setUpOverScroll(listView);
+```
+
+### GridView
+
+```java
+GridView gridView = (GridView) findViewById(R.id.grid_view);
+OverScrollDecoratorHelper.setUpOverScroll(gridView);
+```
+
+### ViewPager
+
+```java
+ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
+OverScrollDecoratorHelper.setUpOverScroll(viewPager);
+```
+
+### ScrollView, HorizontalScrollView
+
+```java
+ScrollView scrollView = (ScrollView) findViewById(R.id.scroll_view);
+OverScrollDecoratorHelper.setUpOverScroll(scrollView);
+    
+HorizontalScrollView horizontalScrollView = (HorizontalScrollView) findViewById(R.id.horizontal_scroll_view);
+OverScrollDecoratorHelper.setUpOverScroll(horizontalScrollView);
+```
+
+### Any View - Text, Image... (Always Over-Scroll Ready)
+
+```java
+View view = findViewById(R.id.demo_view);
+    
+// Horizontal
+OverScrollDecoratorHelper.setUpStaticOverScroll(view, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+// Vertical
+OverScrollDecoratorHelper.setUpStaticOverScroll(view, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+```
+
+# Advanced Usage
+
+```java
+// Horizontal RecyclerView
+RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+new HorizontalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView));
+
+// ListView (vertical)
+ListView listView = (ListView) findViewById(R.id.list_view);
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(listView));
+
+// GridView (vertical)
+GridView gridView = (GridView) findViewById(R.id.grid_view);
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(gridView));
+
+// ViewPager
+ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
+new HorizontalOverScrollBounceEffectDecorator(new ViewPagerOverScrollDecorAdapter(viewPager));
+
+// A simple TextView - horizontal
+View textView = findViewById(R.id.title);
+new HorizontalOverScrollBounceEffectDecorator(new StaticOverScrollDecorAdapter(view));
+```
+
+### RecyclerView with [ItemTouchHelper](http://developer.android.com/reference/android/support/v7/widget/helper/ItemTouchHelper.html) based swiping / dragging
+As of version 1.0.1, the effect can work smoothly with the RecyclerView's built-in mechanism for items swiping and dragging (based on [ItemTouchHelper](http://developer.android.com/reference/android/support/v7/widget/helper/ItemTouchHelper.html)). BUT, it requires some (very little) explicit configuration work:
+
+```java
+// Normally you would attach an ItemTouchHelper & a callback to a RecyclerView, this way:
+RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+ItemTouchHelper.Callback myCallback = new ItemTouchHelper.Callback() {
+	...
+};
+ItemTouchHelper myHelper = new ItemTouchHelper(myCallback);
+myHelper.attachToRecyclerView(recyclerView);
+
+// INSTEAD of attaching the helper yourself, simply use the dedicated adapter c'tor, e.g.:
+new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView, myCallback));
+
+```
+
+For more info on the swiping / dragging mechanism, try [this useful tutorial](https://medium.com/@ipaulpro/drag-and-swipe-with-recyclerview-b9456d2b1aaf).
+
+### Over-Scroll Listeners
+As of version 1.0.2, the effect provides a means for registering listeners of over-scroll related events. There are two types of listeners, as follows.
+
+#### State-Change Listener
+The over-scroll manager dispatches events onto a state-change listener denoting transitions in the effect's state:
+
+```java
+
+// Note: over-scroll is set-up using the helper method.
+IOverScrollDecor decor = OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+
+decor.setOverScrollStateListener(new IOverScrollStateListener() {
+    @Override
+	public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) {
+	    switch (newState) {
+	        case STATE_IDLE:
+	            // No over-scroll is in effect.
+	            break;
+	        case STATE_DRAG_START_SIDE:
+	            // Dragging started at the left-end.
+	            break;
+	        case STATE_DRAG_END_SIDE:
+	            // Dragging started at the right-end.
+	            break;
+	        case STATE_BOUNCE_BACK:
+	            if (oldState == STATE_DRAG_START_SIDE) {
+	                // Dragging stopped -- view is starting to bounce back from the *left-end* onto natural position.
+	            } else { // i.e. (oldState == STATE_DRAG_END_SIDE)
+	                // View is starting to bounce back from the *right-end*.
+	            }
+	            break;
+	    }
+	}
+}
+```
+
+#### Real-time Updates Listener
+The over-scroll manager can also dispatch *real-time*, as-it-happens over-scroll events denoting the current offset resulting due to an over-scroll being in-effect (the offset thus denotes the current 'intensity').
+
+```java
+// Note: over-scroll is set-up by explicity instantiating a decorator rather than using the helper; The two methods can be used interchangeably for registering listeners.
+VerticalOverScrollBounceEffectDecorator decor = new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView, itemTouchHelperCallback));
+
+decor.setOverScrollUpdateListener(new IOverScrollUpdateListener() {
+    @Override
+    public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) {
+    	final View view = decor.getView();
+    	if (offset > 0) {
+    		// 'view' is currently being over-scrolled from the top.
+    	} else if (offset < 0) {
+    		// 'view' is currently being over-scrolled from the bottom.
+    	} else {
+    		// No over-scroll is in-effect.
+    		// This is synonymous with having (state == STATE_IDLE).
+    	}
+    }
+});
+
+```
+
+
+The two type of listeners can be used either separately or in conjunction, depending on your needs. Refer to the demo project's RecyclerView-demo section for actual concrete usage.
+    
+### Custom Views
+
+```java
+public class CustomView extends View {
+    // ...
+}
+    
+final CustomView view = (CustomView) findViewById(R.id.custom_view);
+new VerticalOverScrollBounceEffectDecorator(new IOverScrollDecoratorAdapter() {
+
+    @Override
+    public View getView() {
+        return view;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+	    // canScrollUp() is an example of a method you must implement
+        return !view.canScrollUp();
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+	     // canScrollDown() is an example of a method you must implement
+        return !view.canScrollDown();
+    }
+});
+```
+
+### Effect Behavior Configuration
+
+```java
+/// Make over-scroll applied over a list-view feel more 'stiff'
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(view),
+        5f, // Default is 3
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK,
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_DECELERATE_FACTOR);
+                
+// Make over-scroll applied over a list-view bounce-back more softly
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(view),
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD,
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK,
+        -1f // Default is -2
+        );
+```
+
+### Dynamic Effect Disabling
+
+As of version 1.0.4, the effect can be dynamically disabled (detached) and reenabled (attached) at runtime:
+
+```java
+IOverScrollDecor decor = OverScrollDecoratorHelper.setUpOverScroll(view);
+
+// Detach. You are strongly encouraged to only call this when overscroll isn't
+// in-effect: Either add getCurrentState()==STATE_IDLE as a precondition,
+// or use a state-change listener.
+decor.detach();
+// Attach.
+decor.attach();
+```
+
+`attach()` and `detach()` can be used repeatedly - as necessary, as can be seen in the demo project (refer to action-bar menu in recycler-view demo).
+
+## Credits
+
+App icons by <a href="http://somerandomdude.com/work/iconic/">P.J. Onori</a>,
+<a href="http://graphicriver.net/item/wirecons-vector-icons/4586710?ref=tmthymllr">Timothy Miller</a>,
+<a href="http://icons4android.com">Icons4Android</a>, 
+<a href="http://icons8.com/android-icons">Icons8.com</a>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/.gitignore b/OnTime_Merchant_live/lib/overscroll-decor/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/build.gradle b/OnTime_Merchant_live/lib/overscroll-decor/app/build.gradle
new file mode 100755
index 0000000..74329bd
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion '29.0.3'
+
+    defaultConfig {
+        applicationId 'me.everything.overscrolldemo'
+        minSdkVersion 14
+        targetSdkVersion 30
+        versionCode 1
+        versionName '1.0'
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation project(':liboverscroll')
+//    implementation 'io.github.everythingme:overscroll-decor-android:1.1.1'
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/proguard-rules.pro b/OnTime_Merchant_live/lib/overscroll-decor/app/proguard-rules.pro
new file mode 100755
index 0000000..8e4e143
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/amit/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..b452bdf
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="me.everything.overscrolldemo" >
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/app_icon"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name=".OverScrollDemoActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/OverScrollDemoActivity.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/OverScrollDemoActivity.java
new file mode 100755
index 0000000..3d162b5
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/OverScrollDemoActivity.java
@@ -0,0 +1,105 @@
+package me.everything.overscrolldemo;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import com.google.android.material.navigation.NavigationView;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import android.view.MenuItem;
+
+import me.everything.overscrolldemo.view.GridViewDemoFragment;
+import me.everything.overscrolldemo.view.ListViewDemoFragment;
+import me.everything.overscrolldemo.view.MiscViewsDemoFragment;
+import me.everything.overscrolldemo.view.NestedScrollViewDemoFragment;
+import me.everything.overscrolldemo.view.RecyclerViewDemoFragment;
+import me.everything.overscrolldemo.view.RecyclerViewStaggeredGridDemoFragment;
+import me.everything.overscrolldemo.view.ScrollViewDemoFragment;
+import me.everything.overscrolldemo.view.ViewPagerDemoFragment;
+
+public class OverScrollDemoActivity extends AppCompatActivity
+        implements NavigationView.OnNavigationItemSelectedListener {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_overscroll_demo);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setTitle(R.string.recycler_view_demo_title);
+        setSupportActionBar(toolbar);
+
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+        drawer.addDrawerListener(toggle);
+        toggle.syncState();
+
+        NavigationView navigationView = (NavigationView) findViewById(R.id.drawer_nav);
+        navigationView.setNavigationItemSelectedListener(this);
+
+        if (savedInstanceState == null) {
+            getSupportFragmentManager().beginTransaction()
+                    .add(R.id.fragment_placeholder, new RecyclerViewDemoFragment())
+                    .commit();
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        if (drawer.isDrawerOpen(GravityCompat.START)) {
+            drawer.closeDrawer(GravityCompat.START);
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+    @Override
+    public boolean onNavigationItemSelected(MenuItem item) {
+        final int id = item.getItemId();
+        item.setChecked(true);
+
+        switch (id) {
+            case R.id.drawer_item_recyclerview_demo:
+                replaceMainFragment(new RecyclerViewDemoFragment(), R.string.recycler_view_demo_title);
+                break;
+            case R.id.drawer_item_gridview_demo:
+                replaceMainFragment(new GridViewDemoFragment(), R.string.grid_view_demo_title);
+                break;
+            case R.id.drawer_item_listview_demo:
+                replaceMainFragment(new ListViewDemoFragment(), R.string.list_view_demo_title);
+                break;
+            case R.id.drawer_item_recyclerview_staggered_grid_demo:
+                replaceMainFragment(new RecyclerViewStaggeredGridDemoFragment(), R.string.recycler_view_staggered_grid_demo_title);
+                break;
+            case R.id.drawer_item_scrollview_demo:
+                replaceMainFragment(new ScrollViewDemoFragment(), R.string.scroll_view_demo_title);
+                break;
+            case R.id.drawer_item_viewpager_demo:
+                replaceMainFragment(new ViewPagerDemoFragment(),R.string.viewpager_demo_title);
+                break;
+            case R.id.drawer_item_nested_scrollview_demo:
+                replaceMainFragment(new NestedScrollViewDemoFragment(), R.string.nested_scrollview_demo_title);
+                break;
+            case R.id.drawer_item_misc_demo:
+                replaceMainFragment(new MiscViewsDemoFragment(), R.string.misc_views_demo_title);
+                break;
+        }
+
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        drawer.closeDrawer(GravityCompat.START);
+        return true;
+    }
+
+    private void replaceMainFragment(Fragment fragment, int titleResId) {
+        getSupportFragmentManager().beginTransaction()
+                .setCustomAnimations(R.animator.fade_in_slow, R.animator.fade_out_quick)
+                .replace(R.id.fragment_placeholder, fragment)
+                .commit();
+        getSupportActionBar().setTitle(titleResId);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoContentHelper.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoContentHelper.java
new file mode 100755
index 0000000..87213f1
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoContentHelper.java
@@ -0,0 +1,52 @@
+package me.everything.overscrolldemo.control;
+
+import android.content.res.Resources;
+
+import java.util.Arrays;
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+
+public class DemoContentHelper {
+
+    private static List<DemoItem> sSpectrumItemsVioletToRed;
+    private static List<DemoItem> sSpectrumItemsRedToViolet;
+
+    public static List<DemoItem> getSpectrumItems(Resources res) {
+        if (sSpectrumItemsVioletToRed == null) {
+            sSpectrumItemsVioletToRed = Arrays.asList(
+                    new DemoItem(res.getColor(android.R.color.holo_purple), "PURPLE"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_dark), "BLUE"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_light), "LIGHT BLUE"),
+                    new DemoItem(res.getColor(R.color.spectrum_cyan), "CYAN"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_dark), "GREEN"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_light), "LIGHT GREEN"),
+                    new DemoItem(res.getColor(R.color.spectrum_yellow), "YELLOW"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_light), "LIGHT ORANGE"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_dark), "ORANGE"),
+                    new DemoItem(res.getColor(android.R.color.holo_red_light), "LIGHT RED"),
+                    new DemoItem(res.getColor(android.R.color.holo_red_dark), "RED")
+            );
+        }
+        return sSpectrumItemsVioletToRed;
+    }
+
+    public static List<DemoItem> getReverseSpectrumItems(Resources res) {
+        if (sSpectrumItemsRedToViolet == null) {
+            sSpectrumItemsRedToViolet = Arrays.asList(
+                    new DemoItem(res.getColor(android.R.color.holo_red_dark), "RED"),
+                    new DemoItem(res.getColor(android.R.color.holo_red_light), "LIGHT RED"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_dark), "ORANGE"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_light), "LIGHT ORANGE"),
+                    new DemoItem(res.getColor(R.color.spectrum_yellow), "YELLOW"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_light), "LIGHT GREEN"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_dark), "GREEN"),
+                    new DemoItem(res.getColor(R.color.spectrum_cyan), "CYAN"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_light), "LIGHT BLUE"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_dark), "BLUE"),
+                    new DemoItem(res.getColor(android.R.color.holo_purple), "PURPLE")
+            );
+        }
+        return sSpectrumItemsRedToViolet;
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoItem.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoItem.java
new file mode 100755
index 0000000..c9927a5
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoItem.java
@@ -0,0 +1,32 @@
+package me.everything.overscrolldemo.control;
+
+public class DemoItem {
+
+    private int mColor;
+    private String mColorName;
+
+    public DemoItem() {
+    }
+
+    public DemoItem(int color, String colorName) {
+        mColorName = colorName;
+        mColor = color;
+    }
+
+    public int getColor() {
+        return mColor;
+    }
+
+    public void setColor(int color) {
+        mColor = color;
+    }
+
+    public String getColorName() {
+        return mColorName;
+    }
+
+    public void setColorName(String colorName) {
+        mColorName = colorName;
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoGridAdapter.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoGridAdapter.java
new file mode 100755
index 0000000..aa16470
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoGridAdapter.java
@@ -0,0 +1,25 @@
+package me.everything.overscrolldemo.view;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class DemoGridAdapter extends DemoListAdapterBase {
+
+    protected DemoGridAdapter(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoGridAdapter(LayoutInflater inflater, List<DemoItem> items) {
+        super(inflater, items);
+    }
+
+    @Override
+    protected DemoViewHolder createViewHolder(ViewGroup parent) {
+        return new DemoViewHolder(R.layout.grid_item, parent, mInflater);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapter.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapter.java
new file mode 100755
index 0000000..58c8bfd
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapter.java
@@ -0,0 +1,25 @@
+package me.everything.overscrolldemo.view;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class DemoListAdapter extends DemoListAdapterBase {
+
+    protected DemoListAdapter(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoListAdapter(LayoutInflater inflater, List<DemoItem> items) {
+        super(inflater, items);
+    }
+
+    @Override
+    protected DemoViewHolder createViewHolder(ViewGroup parent) {
+        return new DemoViewHolder(R.layout.vertical_list_item, parent, mInflater);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapterBase.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapterBase.java
new file mode 100755
index 0000000..cb322b0
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapterBase.java
@@ -0,0 +1,104 @@
+package me.everything.overscrolldemo.view;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.control.DemoItem;
+
+public abstract class DemoListAdapterBase extends BaseAdapter {
+
+    private static final int COLOR_VIEW_TYPE = 0;
+
+    public static class DemoViewHolder {
+
+        TextView mTextView;
+
+        public DemoViewHolder(int resId, ViewGroup parent, LayoutInflater inflater) {
+            mTextView = (TextView) inflater.inflate(resId, parent, false);
+            mTextView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Toast.makeText(mTextView.getContext(), "Tapped on: "+mTextView.getText(), Toast.LENGTH_SHORT).show();
+                }
+            });
+            mTextView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    Toast.makeText(mTextView.getContext(), "Long-tapped on: "+mTextView.getText(), Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            });
+        }
+
+        public void init(DemoItem item) {
+            mTextView.setText(item.getColorName());
+
+            int color = item.getColor();
+            mTextView.setBackgroundColor(color);
+        }
+
+        public View getView() {
+            return mTextView;
+        }
+    }
+
+    protected final LayoutInflater mInflater;
+    protected List<DemoItem> mItems;
+
+    protected DemoListAdapterBase(LayoutInflater inflater) {
+        mInflater = inflater;
+    }
+
+    public DemoListAdapterBase(LayoutInflater inflater, List<DemoItem> items) {
+        mInflater = inflater;
+        mItems = items;
+    }
+
+    public void setItems(List items) {
+        mItems = items;
+    }
+
+    @Override
+    public int getCount() {
+        return mItems.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return mItems.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+
+        DemoViewHolder holder;
+        if (convertView == null) {
+            holder = createViewHolder(parent);
+            holder.getView().setTag(holder);
+        } else {
+            holder = (DemoViewHolder) convertView.getTag();
+        }
+
+        holder.init((DemoItem) getItem(position));
+        return holder.getView();
+    }
+
+    protected abstract DemoViewHolder createViewHolder(ViewGroup parent);
+
+    @Override
+    public int getItemViewType(int position) {
+        return COLOR_VIEW_TYPE;
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterBase.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterBase.java
new file mode 100755
index 0000000..5e4eaf1
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterBase.java
@@ -0,0 +1,85 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.control.DemoItem;
+
+public abstract class DemoRecyclerAdapterBase extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private static final int COLOR_VIEW_TYPE = 0;
+
+    public static class DemoViewHolder extends RecyclerView.ViewHolder {
+
+        public DemoViewHolder(int resId, ViewGroup parent, LayoutInflater inflater) {
+            super(inflater.inflate(resId, parent, false));
+
+            getTextView().setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Toast.makeText(getTextView().getContext(), "Tapped on: "+getTextView().getText(), Toast.LENGTH_SHORT).show();
+                }
+            });
+            getTextView().setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    Toast.makeText(getTextView().getContext(), "Long-tapped on: "+getTextView().getText(), Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            });
+        }
+
+        public void init(DemoItem item) {
+            TextView textView = getTextView();
+            textView.setText(item.getColorName());
+
+            int color = item.getColor();
+            textView.setBackgroundColor(color);
+        }
+
+        private TextView getTextView() {
+            return (TextView) itemView;
+        }
+    }
+
+    protected final LayoutInflater mInflater;
+    protected List<DemoItem> mItems;
+
+    protected DemoRecyclerAdapterBase(LayoutInflater inflater) {
+        mInflater = inflater;
+    }
+
+    public DemoRecyclerAdapterBase(LayoutInflater inflater, List<DemoItem> items) {
+        mInflater = inflater;
+        mItems = items;
+    }
+
+    public void setItems(List items) {
+        mItems = items;
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        DemoItem item = mItems.get(position);
+
+        DemoViewHolder demoHolder = (DemoViewHolder) holder;
+        demoHolder.init(item);
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return COLOR_VIEW_TYPE;
+    }
+
+    @Override
+    public int getItemCount() {
+        return mItems.size();
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterHorizontal.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterHorizontal.java
new file mode 100755
index 0000000..88baed5
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterHorizontal.java
@@ -0,0 +1,28 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+
+public class DemoRecyclerAdapterHorizontal extends DemoRecyclerAdapterBase {
+
+    public DemoRecyclerAdapterHorizontal(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoRecyclerAdapterHorizontal(List items, LayoutInflater inflater) {
+        super(inflater, items);
+    }
+
+    @Override
+    @NonNull
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new DemoViewHolder(R.layout.horizontal_list_item, parent, mInflater);
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterVertical.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterVertical.java
new file mode 100755
index 0000000..4956e76
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterVertical.java
@@ -0,0 +1,27 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+
+public class DemoRecyclerAdapterVertical extends DemoRecyclerAdapterBase {
+
+    public DemoRecyclerAdapterVertical(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoRecyclerAdapterVertical(List items, LayoutInflater inflater) {
+        super(inflater, items);
+    }
+
+    @Override
+    @NonNull
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new DemoViewHolder(R.layout.vertical_list_item, parent, mInflater);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/GridViewDemoFragment.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/GridViewDemoFragment.java
new file mode 100755
index 0000000..c93bab1
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/GridViewDemoFragment.java
@@ -0,0 +1,34 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.GridView;
+import android.widget.ListAdapter;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class GridViewDemoFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.gridview_overscroll_demo, null, false);
+        initVerticalGridView(DemoContentHelper.getSpectrumItems(getResources()), (GridView) fragmentView.findViewById(R.id.grid_view));
+        return fragmentView;
+    }
+
+    private void initVerticalGridView(List<DemoItem> content, GridView gridView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        ListAdapter adapter = new DemoGridAdapter(appInflater, content);
+        gridView.setAdapter(adapter);
+
+        OverScrollDecoratorHelper.setUpOverScroll(gridView);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ListViewDemoFragment.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ListViewDemoFragment.java
new file mode 100755
index 0000000..d4b4f9d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ListViewDemoFragment.java
@@ -0,0 +1,36 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class ListViewDemoFragment extends Fragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.listview_overscroll_demo, null, false);
+        initVerticalListView(DemoContentHelper.getSpectrumItems(getResources()), (ListView) fragmentView.findViewById(R.id.list_view));
+        return fragmentView;
+    }
+
+    private void initVerticalListView(List<DemoItem> content, ListView listView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        ListAdapter adapter = new DemoListAdapter(appInflater, content);
+        listView.setAdapter(adapter);
+
+        OverScrollDecoratorHelper.setUpOverScroll(listView);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/MiscViewsDemoFragment.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/MiscViewsDemoFragment.java
new file mode 100755
index 0000000..bca35af
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/MiscViewsDemoFragment.java
@@ -0,0 +1,45 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Chronometer;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+
+public class MiscViewsDemoFragment extends Fragment {
+
+    private static final String CHRONO_TIME_SAVE_ID = "chronoTime";
+
+    private Chronometer mChrono;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.misc_overscroll_demo, null, false);
+
+        View textView = fragmentView.findViewById(R.id.demo_text);
+        OverScrollDecoratorHelper.setUpStaticOverScroll(textView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+
+        View imageView = fragmentView.findViewById(R.id.demo_image);
+        OverScrollDecoratorHelper.setUpStaticOverScroll(imageView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+
+        mChrono = (Chronometer) fragmentView.findViewById(R.id.demo_chronometer);
+        if (savedInstanceState != null) {
+            mChrono.setBase(savedInstanceState.getLong(CHRONO_TIME_SAVE_ID));
+        }
+        OverScrollDecoratorHelper.setUpStaticOverScroll(mChrono, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+        mChrono.start();
+
+        return fragmentView;
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putLong(CHRONO_TIME_SAVE_ID, mChrono.getBase());
+
+        super.onSaveInstanceState(outState);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/NestedScrollViewDemoFragment.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/NestedScrollViewDemoFragment.java
new file mode 100755
index 0000000..f57d411
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/NestedScrollViewDemoFragment.java
@@ -0,0 +1,21 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+
+public class NestedScrollViewDemoFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final ScrollView rootView = (ScrollView) inflater.inflate(R.layout.nested_scrollview_demo, null, false);
+        OverScrollDecoratorHelper.setUpOverScroll(rootView);
+        return rootView;
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewDemoFragment.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewDemoFragment.java
new file mode 100755
index 0000000..ad656eb
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewDemoFragment.java
@@ -0,0 +1,190 @@
+package me.everything.overscrolldemo.view;
+
+import android.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+import me.everything.android.ui.overscroll.IOverScrollDecor;
+import me.everything.android.ui.overscroll.IOverScrollStateListener;
+import me.everything.android.ui.overscroll.IOverScrollUpdateListener;
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.adapters.RecyclerViewOverScrollDecorAdapter;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+
+public class RecyclerViewDemoFragment extends Fragment {
+
+    private TextView mHorizScrollMeasure;
+    private TextView mVertScrollMeasure;
+
+    private IOverScrollDecor mHorizOverScrollEffect;
+    private IOverScrollDecor mVertOverScrollEffect;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        setHasOptionsMenu(true);
+
+        View fragmentView = inflater.inflate(R.layout.recyclerview_overscroll_demo, null, false);
+
+        mHorizScrollMeasure = (TextView) fragmentView.findViewById(R.id.horizontal_scroll_measure);
+        mVertScrollMeasure = (TextView) fragmentView.findViewById(R.id.vertical_scroll_measure);
+
+        initHorizontalRecyclerView((RecyclerView) fragmentView.findViewById(R.id.horizontal_recycler_view));
+        initVerticalRecyclerView((RecyclerView) fragmentView.findViewById(R.id.vertical_recycler_view));
+        return fragmentView;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        final MenuItem detachMenuItem = menu.add("Detach over-scroll").setVisible(true);
+        final MenuItem attachMenuItem = menu.add("Attach over-scroll").setVisible(false);
+        detachMenuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                detachMenuItem.setVisible(false);
+                attachMenuItem.setVisible(true);
+                mHorizOverScrollEffect.detach();
+                mVertOverScrollEffect.detach();
+                return true;
+            }
+        });
+        attachMenuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                detachMenuItem.setVisible(true);
+                attachMenuItem.setVisible(false);
+                initHorizontalRecyclerView((RecyclerView) getView().findViewById(R.id.horizontal_recycler_view));
+                initVerticalRecyclerView((RecyclerView) getView().findViewById(R.id.vertical_recycler_view));
+                return true;
+            }
+        });
+
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    private void initHorizontalRecyclerView(RecyclerView recyclerView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        RecyclerView.Adapter adapter = new DemoRecyclerAdapterHorizontal(DemoContentHelper.getSpectrumItems(getResources()), appInflater);
+        recyclerView.setAdapter(adapter);
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false));
+
+        // Apply over-scroll in 'standard form' - i.e. using the helper.
+        mHorizOverScrollEffect = OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+
+        // Over-scroll listeners can be applied in standard form as well.
+        mHorizOverScrollEffect.setOverScrollUpdateListener(new IOverScrollUpdateListener() {
+            @Override
+            public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) {
+                mHorizScrollMeasure.setText(String.valueOf((int) offset));
+            }
+        });
+        mHorizOverScrollEffect.setOverScrollStateListener(new IOverScrollStateListener() {
+
+            private final int mDragColorLeft = getResources().getColor(android.R.color.holo_purple);
+            private final int mBounceBackColorLeft = getResources().getColor(android.R.color.holo_blue_light);
+            private final int mDragColorRight = getResources().getColor(android.R.color.holo_red_light);
+            private final int mBounceBackColorRight = getResources().getColor(android.R.color.holo_orange_dark);
+            private final int mClearColor = mHorizScrollMeasure.getCurrentTextColor();
+
+            @Override
+            public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) {
+                if (newState == STATE_DRAG_START_SIDE) {
+                    mHorizScrollMeasure.setTextColor(mDragColorLeft);
+                } else if (newState == STATE_DRAG_END_SIDE) {
+                    mHorizScrollMeasure.setTextColor(mDragColorRight);
+                } else if (newState == STATE_BOUNCE_BACK) {
+                    mHorizScrollMeasure.setTextColor((oldState == STATE_DRAG_START_SIDE) ? mBounceBackColorLeft : mBounceBackColorRight);
+                } else {
+                    mHorizScrollMeasure.setTextColor(mClearColor);
+                }
+            }
+        });
+    }
+
+    private void initVerticalRecyclerView(RecyclerView recyclerView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        final DemoRecyclerAdapterBase adapter = new DemoRecyclerAdapterVertical(new ArrayList<>(DemoContentHelper.getReverseSpectrumItems(getResources())), appInflater);
+        recyclerView.setAdapter(adapter);
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+
+        // Set-up of recycler-view's native item swiping.
+        ItemTouchHelper.Callback itemTouchHelperCallback = new ItemTouchHelper.Callback() {
+            @Override
+            public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+                return makeMovementFlags(0, ItemTouchHelper.RIGHT);
+            }
+
+            @Override
+            public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+                return false;
+            }
+
+            @Override
+            public void onSwiped(final RecyclerView.ViewHolder viewHolder, int direction) {
+                AlertDialog dialog = new AlertDialog.Builder(getActivity())
+                        .setTitle("Item swiping is supported!")
+                        .setMessage("Recycler-view's native item swiping and the over-scrolling effect can co-exist! But, to get them to work WELL -- please apply the effect using the dedicated helper method!")
+                        .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                adapter.notifyDataSetChanged();
+                            }
+                        })
+                        .create();
+                dialog.show();
+            }
+        };
+
+        // Apply over-scroll in 'advanced form' - i.e. create an instance manually.
+        mVertOverScrollEffect = new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView, itemTouchHelperCallback));
+
+        // Over-scroll listeners are applied here via the mVertOverScrollEffect explicitly.
+        mVertOverScrollEffect.setOverScrollUpdateListener(new IOverScrollUpdateListener() {
+            @Override
+            public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) {
+                mVertScrollMeasure.setText(String.valueOf((int) offset));
+            }
+        });
+        mVertOverScrollEffect.setOverScrollStateListener(new IOverScrollStateListener() {
+            private final int mDragColorTop = getResources().getColor(android.R.color.holo_red_light);
+            private final int mBounceBackColorTop = getResources().getColor(android.R.color.holo_orange_dark);
+            private final int mDragColorBottom = getResources().getColor(android.R.color.holo_purple);
+            private final int mBounceBackColorBottom = getResources().getColor(android.R.color.holo_blue_light);
+            private final int mClearColor = mHorizScrollMeasure.getCurrentTextColor();
+
+            @Override
+            public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) {
+                if (newState == STATE_DRAG_START_SIDE) {
+                    mVertScrollMeasure.setTextColor(mDragColorTop);
+                } else if (newState == STATE_DRAG_END_SIDE) {
+                    mVertScrollMeasure.setTextColor(mDragColorBottom);
+                } else if (newState == STATE_BOUNCE_BACK) {
+                    mVertScrollMeasure.setTextColor(oldState == STATE_DRAG_START_SIDE ? mBounceBackColorTop : mBounceBackColorBottom);
+                } else {
+                    mVertScrollMeasure.setTextColor(mClearColor);
+                }
+            }
+        });
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewStaggeredGridDemoFragment.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewStaggeredGridDemoFragment.java
new file mode 100755
index 0000000..bbbc314
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewStaggeredGridDemoFragment.java
@@ -0,0 +1,39 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+
+public class RecyclerViewStaggeredGridDemoFragment extends Fragment {
+
+    private static final int GRID_SPAN_COUNT = 2;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.recyclerview_stgrid_overscroll_demo, null, false);
+        initVerticalRecyclerView((RecyclerView) fragmentView.findViewById(R.id.vertical_recycler_view));
+        return fragmentView;
+    }
+
+    private void initVerticalRecyclerView(RecyclerView recyclerView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        final DemoRecyclerAdapterBase adapter = new DemoRecyclerAdapterVertical(new ArrayList<>(DemoContentHelper.getReverseSpectrumItems(getResources())), appInflater);
+        recyclerView.setAdapter(adapter);
+
+        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(GRID_SPAN_COUNT, StaggeredGridLayoutManager.VERTICAL));
+        OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ScrollViewDemoFragment.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ScrollViewDemoFragment.java
new file mode 100755
index 0000000..2557eb2
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ScrollViewDemoFragment.java
@@ -0,0 +1,34 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+
+public class ScrollViewDemoFragment extends Fragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.scrollview_overscroll_demo, null, false);
+        initHorizontalScrollView((HorizontalScrollView) fragmentView.findViewById(R.id.horizontal_scroll_view));
+        initVerticalScrollView((ScrollView) fragmentView.findViewById(R.id.vertical_scroll_view));
+        return fragmentView;
+    }
+
+    private void initHorizontalScrollView(HorizontalScrollView scrollView) {
+        OverScrollDecoratorHelper.setUpOverScroll(scrollView);
+    }
+
+    private void initVerticalScrollView(ScrollView scrollView) {
+        OverScrollDecoratorHelper.setUpOverScroll(scrollView);
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ViewPagerDemoFragment.java b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ViewPagerDemoFragment.java
new file mode 100755
index 0000000..fd81c12
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ViewPagerDemoFragment.java
@@ -0,0 +1,78 @@
+package me.everything.overscrolldemo.view;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class ViewPagerDemoFragment extends Fragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.viewpager_overscroll_demo,null,false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initHorizontalViewPager(DemoContentHelper.getSpectrumItems(getResources()), ((ViewPager) view.findViewById(R.id.view_pager)));
+    }
+
+    private void initHorizontalViewPager(List<DemoItem> items, ViewPager viewPager) {
+
+        ViewPagerAdapter adapter = new ViewPagerAdapter(items);
+        viewPager.setAdapter(adapter);
+        OverScrollDecoratorHelper.setUpOverScroll(viewPager);
+    }
+
+    public static class ViewPagerAdapter extends PagerAdapter{
+
+        private List<DemoItem> items;
+        public ViewPagerAdapter(List<DemoItem> items){
+            this.items = items;
+        }
+
+        @Override
+        public int getCount() {
+            return items.size();
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object object) {
+            return view == object;
+        }
+
+        @Override
+        @NonNull
+        public Object instantiateItem(ViewGroup container, int position) {
+            TextView textView = new TextView(container.getContext());
+            textView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+            textView.setText(items.get(position).getColorName());
+            textView.setBackgroundColor(items.get(position).getColor());
+            textView.setGravity(Gravity.CENTER);
+            container.addView(textView);
+            return textView;
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            container.removeView((View) object);
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/animator/fade_in_slow.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/animator/fade_in_slow.xml
new file mode 100755
index 0000000..aa48445
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/animator/fade_in_slow.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/linear"
+    android:valueFrom="0.0"
+    android:valueTo="1.0"
+    android:propertyName="alpha"
+    android:duration="500"
+    />
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/animator/fade_out_quick.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/animator/fade_out_quick.xml
new file mode 100755
index 0000000..ea03297
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/animator/fade_out_quick.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/linear"
+    android:valueFrom="1.0"
+    android:valueTo="0.0"
+    android:propertyName="alpha"
+    android:duration="80"
+    />
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/color/drawer_items_text.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/color/drawer_items_text.xml
new file mode 100755
index 0000000..1c5b9ac
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/color/drawer_items_text.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:color="@android:color/white"
+        android:state_checked="true"
+        />
+    <item android:color="@android:color/darker_gray"/>
+</selector>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/app_icon.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/app_icon.png
new file mode 100755
index 0000000..1a06c30
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/app_icon.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_grid.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_grid.png
new file mode 100755
index 0000000..f1f6910
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_grid.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_list.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_list.png
new file mode 100755
index 0000000..1748953
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_list.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_misc.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_misc.png
new file mode 100755
index 0000000..60e5851
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_misc.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_recycler.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_recycler.png
new file mode 100755
index 0000000..be5e74d
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_recycler.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_scroller.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_scroller.png
new file mode 100755
index 0000000..43dd039
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_scroller.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_view_pager.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_view_pager.png
new file mode 100755
index 0000000..8003b4f
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_view_pager.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/app_icon.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/app_icon.png
new file mode 100755
index 0000000..b2d0ecd
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/app_icon.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_grid.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_grid.png
new file mode 100755
index 0000000..2ed88db
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_grid.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_list.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_list.png
new file mode 100755
index 0000000..43bd9d1
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_list.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_misc.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_misc.png
new file mode 100755
index 0000000..8a70585
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_misc.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_recycler.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_recycler.png
new file mode 100755
index 0000000..24826a0
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_recycler.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_scroller.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_scroller.png
new file mode 100755
index 0000000..a48a974
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_scroller.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_view_pager.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_view_pager.png
new file mode 100755
index 0000000..c7fcd53
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_view_pager.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/app_icon.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/app_icon.png
new file mode 100755
index 0000000..cb9e95e
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/app_icon.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_grid.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_grid.png
new file mode 100755
index 0000000..2ed2556
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_grid.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_list.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_list.png
new file mode 100755
index 0000000..52e0e49
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_list.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_misc.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_misc.png
new file mode 100755
index 0000000..d64883a
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_misc.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_recycler.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_recycler.png
new file mode 100755
index 0000000..7bf67b2
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_recycler.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_scroller.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_scroller.png
new file mode 100755
index 0000000..57689f0
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_scroller.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_view_pager.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_view_pager.png
new file mode 100755
index 0000000..61ec65e
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_view_pager.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/app_icon.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/app_icon.png
new file mode 100755
index 0000000..ff550d4
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/app_icon.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_grid.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_grid.png
new file mode 100755
index 0000000..051283b
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_grid.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_list.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_list.png
new file mode 100755
index 0000000..d24bc35
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_list.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_misc.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_misc.png
new file mode 100755
index 0000000..88eed60
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_misc.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_recycler.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_recycler.png
new file mode 100755
index 0000000..02291e8
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_recycler.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_scroller.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_scroller.png
new file mode 100755
index 0000000..cc3d3b1
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_scroller.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_view_pager.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_view_pager.png
new file mode 100755
index 0000000..edb43dc
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_view_pager.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/app_icon.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/app_icon.png
new file mode 100755
index 0000000..f9b9466
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/app_icon.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_grid.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_grid.png
new file mode 100755
index 0000000..003d111
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_grid.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_list.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_list.png
new file mode 100755
index 0000000..a499fff
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_list.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_misc.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_misc.png
new file mode 100755
index 0000000..c40b9fb
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_misc.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_recycler.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_recycler.png
new file mode 100755
index 0000000..17bd8fa
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_recycler.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_scroller.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_scroller.png
new file mode 100755
index 0000000..96d5ce4
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_scroller.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_view_pager.png b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_view_pager.png
new file mode 100755
index 0000000..e179580
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_view_pager.png differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_header_bkg.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_header_bkg.xml
new file mode 100755
index 0000000..99cea19
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_header_bkg.xml
@@ -0,0 +1,10 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <gradient
+        android:startColor="@android:color/holo_red_dark"
+        android:centerColor="@android:color/holo_green_light"
+        android:endColor="@android:color/holo_blue_dark"
+        android:type="linear"
+        android:angle="135"
+        />
+</shape>
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_items_bkg.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_items_bkg.xml
new file mode 100755
index 0000000..b8d7c41
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_items_bkg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@android:color/darker_gray"
+        android:state_checked="true"
+        />
+</selector>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo.xml
new file mode 100755
index 0000000..963e14f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.drawerlayout.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start"
+    >
+
+    <include layout="@layout/activity_overscroll_demo_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/drawer_nav"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+
+        app:headerLayout="@layout/drawer_header_overscroll_demo"
+        app:menu="@menu/activity_overscroll_demo_drawer_items"
+
+        app:itemBackground="@drawable/drawer_items_bkg"
+        />
+
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo_content.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo_content.xml
new file mode 100755
index 0000000..d860284
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo_content.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".OverscrollDemo"
+    >
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        >
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/fragment_placeholder"
+        android:layout_below="@id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        />
+
+</RelativeLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/drawer_header_overscroll_demo.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/drawer_header_overscroll_demo.xml
new file mode 100755
index 0000000..a8a57cc
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/drawer_header_overscroll_demo.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/nav_header_height"
+    android:background="@color/colorPrimary"
+    android:padding="16dp"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark"
+    android:orientation="horizontal"
+    android:gravity="fill_horizontal"
+    >
+
+    <ImageView
+        android:layout_height="64dp"
+        android:layout_width="64dp"
+        android:src="@drawable/app_icon"
+        android:layout_gravity="center_vertical"
+        />
+
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:gravity="center_vertical"
+        android:paddingLeft="16dp"
+        >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:text="@string/drawer_title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+            android:textSize="18dp"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/drawer_subtitle"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/grid_item.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/grid_item.xml
new file mode 100755
index 0000000..130584a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/grid_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_width="match_parent"
+    android:layout_height="200dp"
+    android:textSize="30dp"
+    android:textColor="@android:color/black"
+    android:gravity="center"
+    />
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/gridview_overscroll_demo.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/gridview_overscroll_demo.xml
new file mode 100755
index 0000000..b0f93e1
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/gridview_overscroll_demo.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/vert_drag_label"
+        android:lines="1"
+        />
+    <!--
+      When over-scrolling is applied over views that don't stretch over the entire vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:layout_weight="1"
+        >
+        <GridView
+            android:id="@+id/grid_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:numColumns="auto_fit"
+            android:stretchMode="columnWidth"
+            android:verticalSpacing="10dp"
+            android:horizontalSpacing="10dp"
+            android:gravity="center"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/horizontal_list_item.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/horizontal_list_item.xml
new file mode 100755
index 0000000..8b9fa98
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/horizontal_list_item.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_height="match_parent"
+    android:layout_width="100dp"
+    android:paddingTop="20dp"
+    android:paddingBottom="20dp"
+    android:paddingLeft="5dp"
+    android:paddingRight="5dp"
+    android:textSize="18dp"
+    android:textColor="@android:color/black"
+    android:gravity="center"
+    />
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/list_item.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/list_item.xml
new file mode 100755
index 0000000..53d3109
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/list_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="20dp"
+    android:paddingBottom="20dp"
+    android:textSize="40dp"
+    android:gravity="center"
+    android:clickable="true"
+    android:background="@android:color/black"
+    />
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/listview_overscroll_demo.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/listview_overscroll_demo.xml
new file mode 100755
index 0000000..d2dcc87
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/listview_overscroll_demo.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/vert_drag_label"
+        android:lines="1"
+        />
+    <!--
+      When over-scrolling is applied over views that don't stretch over the entire vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:layout_weight="1"
+        >
+        <ListView
+            android:id="@+id/list_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/misc_overscroll_demo.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/misc_overscroll_demo.xml
new file mode 100755
index 0000000..9c86bf9
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/misc_overscroll_demo.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:id="@+id/demo_text"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:clickable="true"
+        android:text="Practically any clickable widget can be over-scrolled.\nTry it!"
+        android:textSize="30sp"
+        android:layout_gravity="center"
+        android:gravity="center"
+        />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        >
+        <ImageView
+            android:id="@+id/demo_image"
+            android:layout_width="128dp"
+            android:layout_height="128dp"
+            android:layout_gravity="center"
+            android:clickable="true"
+            android:background="@drawable/app_icon"
+            />
+    </FrameLayout>
+
+    <Chronometer
+        android:id="@+id/demo_chronometer"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:textSize="30sp"
+        />
+
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/nested_scrollview_demo.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/nested_scrollview_demo.xml
new file mode 100755
index 0000000..0f7b172
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/nested_scrollview_demo.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbars="none"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        >
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/nested_scrollview_root"
+            android:layout_width="match_parent"
+            android:layout_height="180dp"
+            android:padding="14dp"
+            android:paddingTop="0dp"
+            >
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/nested_scrollview_text"
+                android:textSize="19sp"
+                android:textStyle="bold"
+                />
+        </androidx.core.widget.NestedScrollView>
+
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_overscroll_demo.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_overscroll_demo.xml
new file mode 100755
index 0000000..7ef1872
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_overscroll_demo.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+        <TextView
+            android:id="@+id/horizontal_recycler_view_header"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:textSize="@dimen/default_label_size"
+            android:text="@string/horiz_drag_label"
+            android:lines="1"
+            />
+        <TextView
+            android:id="@+id/horizontal_scroll_measure"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:textSize="@dimen/default_subtitle_size"
+            android:text="0"
+            android:textStyle="bold"
+            />
+    </LinearLayout>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/horizontal_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:layout_weight="3"
+        />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+        <TextView
+            android:id="@+id/vertical_recycler_view_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:textSize="@dimen/default_label_size"
+            android:text="@string/vert_drag_label"
+            android:lines="1"
+            />
+        <TextView
+            android:id="@+id/vertical_scroll_measure"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:textSize="@dimen/default_subtitle_size"
+            android:text="0"
+            android:textStyle="bold"
+            />
+    </LinearLayout>
+    <!--
+      When over-scrolling is applied over views that don't stretch though the full vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:layout_weight="7"
+        >
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/vertical_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_stgrid_overscroll_demo.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_stgrid_overscroll_demo.xml
new file mode 100755
index 0000000..9374ae6
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_stgrid_overscroll_demo.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:id="@+id/vertical_recycler_view_header"
+        >
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:textSize="@dimen/default_label_size"
+            android:text="@string/vert_drag_label"
+            android:lines="1"
+            />
+    </LinearLayout>
+    <!--
+      When over-scrolling is applied over views that don't stretch though the full vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="10dp"
+        >
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/vertical_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_horizontal_item.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_horizontal_item.xml
new file mode 100755
index 0000000..b211fd8
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_horizontal_item.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_marginRight="20dp"
+    >
+
+    <ImageView
+        android:layout_height="64dp"
+        android:layout_width="64dp"
+        android:src="@drawable/app_icon"
+        android:layout_gravity="center"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="EverythingMe"
+        />
+
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_overscroll_demo.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_overscroll_demo.xml
new file mode 100755
index 0000000..909b58f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_overscroll_demo.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/horiz_drag_label"
+        android:lines="1"
+        />
+    <HorizontalScrollView
+        android:id="@+id/horizontal_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:layout_weight="3"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            >
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+        </LinearLayout>
+    </HorizontalScrollView>
+
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/vert_drag_label"
+        android:lines="1"
+        />
+
+    <!--
+     When over-scrolling is applied over views that don't stretch over the full vertical region,
+     an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+     in effect.
+     -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:layout_weight="7"
+        >
+        <ScrollView
+            android:id="@+id/vertical_scroll_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                >
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+            </LinearLayout>
+        </ScrollView>
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_vertical_item.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_vertical_item.xml
new file mode 100755
index 0000000..b059e38
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_vertical_item.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginBottom="10dp"
+    >
+
+    <ImageView
+        android:layout_height="64dp"
+        android:layout_width="64dp"
+        android:src="@drawable/app_icon"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:text="EverythingMe"
+        android:textSize="21dp"
+        android:gravity="left|center_vertical"
+        android:layout_gravity="center"
+        />
+
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/vert_recycler.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/vert_recycler.xml
new file mode 100755
index 0000000..d0da0f3
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/vert_recycler.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:showIn="@layout/app_bar_overscroll_demo"
+    tools:context=".OverscrollDemo"
+    >
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
+
+    </androidx.recyclerview.widget.RecyclerView>
+
+</RelativeLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/vertical_list_item.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/vertical_list_item.xml
new file mode 100755
index 0000000..adbd570
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/vertical_list_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="20dp"
+    android:paddingBottom="20dp"
+    android:textSize="40dp"
+    android:textColor="@android:color/black"
+    android:gravity="center"
+    />
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/viewpager_overscroll_demo.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/viewpager_overscroll_demo.xml
new file mode 100755
index 0000000..400fa2f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/layout/viewpager_overscroll_demo.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/menu/activity_overscroll_demo_drawer_items.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/menu/activity_overscroll_demo_drawer_items.xml
new file mode 100755
index 0000000..c74bb49
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/menu/activity_overscroll_demo_drawer_items.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <group
+        android:checkableBehavior="single">
+
+        <item
+            android:id="@+id/drawer_item_recyclerview_demo"
+            android:icon="@drawable/ic_recycler"
+            android:title="RecyclerView Demo"
+            android:checked="true"
+            />
+        <item
+            android:id="@+id/drawer_item_recyclerview_staggered_grid_demo"
+            android:icon="@drawable/ic_recycler"
+            android:title="RecyclerView - St.Grid Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_gridview_demo"
+            android:icon="@drawable/ic_grid"
+            android:title="GridView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_listview_demo"
+            android:icon="@drawable/ic_list"
+            android:title="ListView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_scrollview_demo"
+            android:icon="@drawable/ic_scroller"
+            android:title="ScrollView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_viewpager_demo"
+            android:icon="@drawable/ic_view_pager"
+            android:title="ViewPager Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_nested_scrollview_demo"
+            android:title="NestedScrollView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_misc_demo"
+            android:icon="@drawable/ic_misc"
+            android:title="Misc-Views Demo"
+            />
+
+    </group>
+
+</menu>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values-v21/styles.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..65d0c39
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,8 @@
+<resources>>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values-w820dp/dimens.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/colors.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..bf11420
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/colors.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">@android:color/holo_orange_light</color>
+    <color name="colorPrimaryDark">@android:color/holo_orange_dark</color>
+    <color name="colorAccent">#FF4081</color>
+
+    <color name="spectrum_cyan">#00e0e0</color>
+    <color name="spectrum_yellow">#f0e000</color>
+</resources>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/dimens.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..730a34b
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/dimens.xml
@@ -0,0 +1,9 @@
+<resources>
+    <dimen name="nav_header_vertical_spacing">16dp</dimen>
+    <dimen name="nav_header_height">140dp</dimen>
+
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="default_label_size">26sp</dimen>
+    <dimen name="default_subtitle_size">22sp</dimen>
+</resources>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/strings.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..6fb15cf
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/strings.xml
@@ -0,0 +1,23 @@
+<resources>
+    <string name="app_name">OverscrollDemo</string>
+
+    <string name="drawer_title">Over-Scroll Demo App</string>
+    <string name="drawer_subtitle">EverythingMe</string>
+
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+
+    <string name="grid_view_demo_title">GridView Over-Scroll Demo</string>
+    <string name="list_view_demo_title">ListView Over-Scroll Demo</string>
+    <string name="recycler_view_demo_title">RecyclerView Over-Scroll Demo</string>
+    <string name="recycler_view_staggered_grid_demo_title">RecyclerView St.Grid Over-Scroll Demo</string>
+    <string name="scroll_view_demo_title">ScrollView Over-Scroll Demo</string>
+    <string name="viewpager_demo_title">ViewPager Over-Scroll Demo</string>
+    <string name="nested_scrollview_demo_title">NestedScrollView Over-Scroll Demo</string>
+    <string name="misc_views_demo_title">Misc. Over-Scroll Demo</string>
+    <string name="nested_scrollview_text">This text box is scrollable thanks to being situated inside a nested scroll view. That makes it scrollable regardless of the scrolling of the content of the entire screen, which can be scrolled independently.\nThe point here is to demonstrate how the over-scroll effect can work in the presence of nested scroll-views, provided it is applied over the parent (root) view, regardless of having inner nested scroll-views as children.\nIn this demo, the root view is merely a ScrollView, and therefore applying the effect over it is straightforward (i.e. using the OverScrollHelper).</string>
+
+    <string name="horiz_drag_label">⇔ Drag Horizontally</string>
+    <string name="vert_drag_label">⇳ Drag Vertically</string>
+
+</resources>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/styles.xml b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..44f664f
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/app/src/main/res/values/styles.xml
@@ -0,0 +1,17 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+</resources>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/build.gradle b/OnTime_Merchant_live/lib/overscroll-decor/build.gradle
new file mode 100755
index 0000000..6270b01
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/build.gradle
@@ -0,0 +1,26 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext {
+        _isOverscrollDecor = true
+    }
+
+    repositories {
+        mavenCentral()
+        google()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.0.2'
+    }
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+        google()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/gradle.properties b/OnTime_Merchant_live/lib/overscroll-decor/gradle.properties
new file mode 100755
index 0000000..915f0e6
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/gradle.properties
@@ -0,0 +1,20 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/gradle/wrapper/gradle-wrapper.properties b/OnTime_Merchant_live/lib/overscroll-decor/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..5a4891d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Mar 02 14:56:48 WIB 2026
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/gradlew b/OnTime_Merchant_live/lib/overscroll-decor/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/.gitignore b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/build.gradle b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/build.gradle
new file mode 100755
index 0000000..755b956
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/build.gradle
@@ -0,0 +1,33 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'me.everything.android.ui.overscroll'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName '1.0'
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:3.1.0'
+    testImplementation 'org.robolectric:robolectric:4.3.1'
+}
+
+// Enable publishing
+if (rootProject.hasProperty('_isOverscrollDecor')) {
+    apply from: './publishing.gradle'
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/publish-pom.gradle b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/publish-pom.gradle
new file mode 100755
index 0000000..0710b48
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/publish-pom.gradle
@@ -0,0 +1,39 @@
+// Based on https://stackoverflow.com/a/42160584/453052
+
+project.ext.buildPomXmlDependencies = { pom, configurations ->
+    pom.withXml {
+        final rootNode = asNode().appendNode('dependencies')
+        addConfigurationDependencies(rootNode, configurations.api, 'compile')
+        addConfigurationDependencies(rootNode, configurations.compile, 'compile')
+        addConfigurationDependencies(rootNode, configurations.implementation, 'runtime')
+    }
+}
+
+private static def addConfigurationDependencies(rootNode, Configuration configuration, String scope) {
+    configuration.dependencies.each { dep -> addChildDependency(rootNode, dep, scope) }
+}
+
+private static def addChildDependency(rootNode, Dependency dep, String scope) {
+    if (dep.group == null || dep.version == null || dep.name == null || dep.name == "unspecified")
+        return
+
+    final childNode = rootNode.appendNode('dependency')
+    childNode.appendNode('groupId', dep.group)
+    childNode.appendNode('artifactId', dep.name)
+    childNode.appendNode('version', dep.version)
+    childNode.appendNode('scope', scope)
+
+    if (!dep.transitive) {
+        // If this dependency is transitive, we should force exclude all its dependencies them from the POM
+        final exclusionNode = childNode.appendNode('exclusions').appendNode('exclusion')
+        exclusionNode.appendNode('groupId', '*')
+        exclusionNode.appendNode('artifactId', '*')
+    } else if (!dep.properties.excludeRules.empty) {
+        // Otherwise add specified exclude rules
+        final exclusionNode = childNode.appendNode('exclusions').appendNode('exclusion')
+        dep.properties.excludeRules.each { ExcludeRule rule ->
+            exclusionNode.appendNode('groupId', rule.group ?: '*')
+            exclusionNode.appendNode('artifactId', rule.module ?: '*')
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/publishing.gradle b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/publishing.gradle
new file mode 100755
index 0000000..1eafeda
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/publishing.gradle
@@ -0,0 +1,205 @@
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+apply from: './publish-pom.gradle'
+
+String TARGET_MAVEN_CENTRAL_URL = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
+
+List DEVELOPERS = [
+    [name: 'd4vidi', email: 'amit.d4vidi@gmail.com'],
+]
+
+String _sonatypeUsername = 'd4vidi'
+String _sonatypePassword = System.getProperty('sonatypePassword')
+String _versionName = System.getProperty('version')
+String _mavenRepoUrl = TARGET_MAVEN_CENTRAL_URL
+Map _mavenCredentials = [
+        username: _sonatypeUsername,
+        password: _sonatypePassword,
+]
+def _selectedVariant = null
+
+def onPrePublish = {
+    assertDefined(_versionName, "Publishing: Version not specified (run 'gradle publish' with a -Dversion=1.2.3 argument)")
+    assertDefined(_sonatypePassword, "Publishing: Please specify the password to use for sonatype (run 'gradle publish' with a -DsonatypePassword=<pw> argument)")
+    logger.lifecycle("Publishing is now in session! 📣\n  Version: $_versionName\n  Target URL: ${_mavenRepoUrl}\n  Build-variant: '${_selectedVariant.name}'")
+}
+
+def declareArchive = { target ->
+    project.artifacts {
+        archives target
+    }
+}
+
+// Running from Gradle tab in IDE would create liboverscroll/build/libs/liboverscroll-sources.jar
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+    failOnError false
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+// Running from Gradle tab in IDE would create liboverscroll/build/libs/liboverscroll-javadoc.jar
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+/*
+ * Signing configuration
+ * https://docs.gradle.org/current/userguide/signing_plugin.html
+ */
+
+// Tell signing task to sign everything current and future we set as a project archive...
+signing {
+    sign configurations.archives
+}
+
+/*
+ * Plumbing work for actually having the publishing task work properly, if executed
+ */
+
+project.afterEvaluate {
+    project.tasks.all { Task task ->
+        android.libraryVariants.all { variant ->
+            String variantName = variant.name.capitalize()
+            if (task.name == "publishMaven${variantName}AarPublicationToMavenRepository") {
+                task.dependsOn "assemble${variantName}"
+                task.dependsOn project.tasks.signArchives
+                task.doFirst {
+                    onPrePublish()
+                }
+            }
+        }
+    }
+}
+
+/*
+ * Publishing configuration
+ */
+
+publishing {
+    repositories {
+        maven {
+            url _mavenRepoUrl
+            if (_mavenCredentials != null) {
+                credentials {
+                    username _mavenCredentials.username
+                    password _mavenCredentials.password
+                }
+            }
+        }
+    }
+
+    publications {
+        android.libraryVariants.all { variant ->
+            if (isReleaseVariant(variant)) {
+                _selectedVariant = variant
+
+                String variantNameCapitalized = variant.name.capitalize()
+
+                "maven${variantNameCapitalized}Aar"(MavenPublication) {
+                    groupId 'io.github.everythingme'
+                    artifactId 'overscroll-decor-android'
+                    version "$_versionName"
+
+                    // Register built .aar as published artifact (as a file, explicitly)
+                    variant.outputs.forEach { output ->
+                        artifact output.outputFile
+
+                        // Also register as an archive-artifact, for signing (via equivalent task's output)
+                        declareArchive project.tasks["bundle${variantNameCapitalized}Aar"]
+                    }
+
+                    // Register sources, javadoc as published artifacts (via equivalent tasks' output)
+                    artifact sourcesJar
+                    artifact javadocJar
+
+                    // Also register source, javadoc as archive-artifacts, for signing
+                    declareArchive sourcesJar
+                    declareArchive javadocJar
+
+                    // Add package metadata to the .pom
+                    pom {
+                        name = 'Overscroll-Decor'
+                        description = 'iOS-like over-scrolling effect for Android'
+                        url = 'https://github.com/EverythingMe/overscroll-decor'
+                        packaging 'aar' // Oh so important - or apps would ignore our code!!!!!
+                        scm {
+                            connection = 'scm:git:git://github.com/EverythingMe/overscroll-decor'
+                            developerConnection = 'scm:git:git@github.com/EverythingMe/overscroll-decor.git'
+                            url = 'https://github.com/EverythingMe/overscroll-decor'
+                        }
+                        licenses {
+                            license {
+                                name = 'BSD-2'
+                                url = 'https://github.com/EverythingMe/overscroll-decor/blob/master/LICENSE'
+                            }
+                        }
+                        developers {
+                            DEVELOPERS.each { d ->
+                                developer {
+                                    name = d.name
+                                    email = d.email
+                                }
+                            }
+                        }
+                    }
+
+                    // Add dependencies to the .pom
+                    buildPomXmlDependencies(pom, configurations)
+
+                    // Register pom.xml's signature file (pom.xml.asc) as published artifact
+                    // Note: this is done manually, instead of registering the pom as an archived artifact
+                    pom.withXml {
+                        def pomFile = file("${project.buildDir}/generated-pom.xml")
+                        writeTo(pomFile) // Need to force-write so as to have the signature generated over the finalized content
+
+                        def pomAscFile = signing.sign(pomFile).signatureFiles[0]
+                        artifact(pomAscFile) {
+                            classifier = null
+                            extension = 'pom.asc'
+                        }
+                    }
+
+                    // Register all artifacts we've previously registered as archives (i.e. .jar.asc's, .aar.asc's) as published artifacts.
+                    // Note: this relies on preregistering the equivalent generator-tasks as archive artifacts
+                    // inside a project.artifacts { ... } clause.
+                    project.tasks.signArchives.signatureFiles.each {
+                        artifact(it) {
+                            def matcherSrcDocs = (it.file =~ /-(sources|javadoc)\.jar\.asc$/)
+                            def matcherAAR = (it.file =~ /\.aar\.asc$/)
+                            if (matcherSrcDocs.find()) {
+                                classifier = matcherSrcDocs.group(1)
+                                extension = 'jar.asc'
+                            } else if (matcherAAR.find()) {
+                                classifier = null
+                                extension = 'aar.asc'
+                            } else {
+                                classifier = null
+                                extension = null
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/*
+ * Utils
+ */
+
+private static def isReleaseVariant(variant) {
+    return variant.buildType.name == 'release'
+}
+
+private static def assertDefined(target, message) {
+    if (target == null) {
+        throw new IllegalArgumentException(message)
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/AndroidManifest.xml b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..e100076
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+
+</manifest>
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecorator.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecorator.java
new file mode 100755
index 0000000..8d23793
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecorator.java
@@ -0,0 +1,97 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+/**
+ * A concrete implementation of {@link OverScrollBounceEffectDecoratorBase} for a horizontal orientation.
+ */
+public class HorizontalOverScrollBounceEffectDecorator extends OverScrollBounceEffectDecoratorBase {
+
+    protected static class MotionAttributesHorizontal extends MotionAttributes {
+
+        public boolean init(View view, MotionEvent event) {
+
+            // We must have history available to calc the dx. Normally it's there - if it isn't temporarily,
+            // we declare the event 'invalid' and expect it in consequent events.
+            if (event.getHistorySize() == 0) {
+                return false;
+            }
+
+            // Allow for counter-orientation-direction operations (e.g. item swiping) to run fluently.
+            final float dy = event.getY(0) - event.getHistoricalY(0, 0);
+            final float dx = event.getX(0) - event.getHistoricalX(0, 0);
+            if (Math.abs(dx) < Math.abs(dy)) {
+                return false;
+            }
+
+            mAbsOffset = view.getTranslationX();
+            mDeltaOffset = dx;
+            mDir = mDeltaOffset > 0;
+
+            return true;
+        }
+    }
+
+    protected static class AnimationAttributesHorizontal extends AnimationAttributes {
+
+        public AnimationAttributesHorizontal() {
+            mProperty = View.TRANSLATION_X;
+        }
+
+        @Override
+        protected void init(View view) {
+            mAbsOffset = view.getTranslationX();
+            mMaxOffset = view.getWidth();
+        }
+    }
+
+    /**
+     * C'tor, creating the effect with default arguments:
+     * <br/>Touch-drag ratio in 'forward' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD.
+     * <br/>Touch-drag ratio in 'backwards' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK.
+     * <br/>Deceleration factor (for the bounce-back effect) will be set to DEFAULT_DECELERATE_FACTOR.
+     *
+     * @param viewAdapter The view's encapsulation.
+     */
+    public HorizontalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter) {
+        this(viewAdapter, DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD, DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK, DEFAULT_DECELERATE_FACTOR);
+    }
+
+    /**
+     * C'tor, creating the effect with explicit arguments.
+     * @param viewAdapter The view's encapsulation.
+     * @param touchDragRatioFwd Ratio of touch distance to actual drag distance when in 'forward' direction.
+     * @param touchDragRatioBck Ratio of touch distance to actual drag distance when in 'backward'
+     *                          direction (opposite to initial one).
+     * @param decelerateFactor Deceleration factor used when decelerating the motion to create the
+     *                         bounce-back effect.
+     */
+    public HorizontalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter,
+                                                     float touchDragRatioFwd, float touchDragRatioBck, float decelerateFactor) {
+        super(viewAdapter, decelerateFactor, touchDragRatioFwd, touchDragRatioBck);
+    }
+
+    @Override
+    protected MotionAttributes createMotionAttributes() {
+        return new MotionAttributesHorizontal();
+    }
+
+    @Override
+    protected AnimationAttributes createAnimationAttributes() {
+        return new AnimationAttributesHorizontal();
+    }
+
+    @Override
+    protected void translateView(View view, float offset) {
+        view.setTranslationX(offset);
+    }
+
+    @Override
+    protected void translateViewAndEvent(View view, float offset, MotionEvent event) {
+        view.setTranslationX(offset);
+        event.offsetLocation(offset - event.getX(0), 0f);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollDecor.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollDecor.java
new file mode 100755
index 0000000..a662b99
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollDecor.java
@@ -0,0 +1,30 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.View;
+
+public interface IOverScrollDecor {
+    View getView();
+
+    void setOverScrollStateListener(IOverScrollStateListener listener);
+    void setOverScrollUpdateListener(IOverScrollUpdateListener listener);
+
+    /**
+     * Get the current decorator's runtime state, i.e. one of the values specified by {@link IOverScrollState}.
+     * @return The state.
+     */
+    int getCurrentState();
+
+    /**
+     * Detach the decorator from its associated view, thus disabling it entirely.
+     *
+     * <p>It is best to call this only when over-scroll isn't currently in-effect - i.e. verify that
+     * <code>getCurrentState()==IOverScrollState.STATE_IDLE</code> as a precondition, or otherwise
+     * use a state listener previously installed using
+     * {@link #setOverScrollStateListener(IOverScrollStateListener)}.</p>
+     *
+     * <p>Note: Upon detachment completion, the view in question will return to the default
+     * Android over-scroll configuration (i.e. {@link View.OVER_SCROLL_ALWAYS} mode). This can be
+     * overridden by calling <code>View.setOverScrollMode(mode)</code> immediately thereafter.</p>
+     */
+    void detach();
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollState.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollState.java
new file mode 100755
index 0000000..919ab00
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollState.java
@@ -0,0 +1,16 @@
+package me.everything.android.ui.overscroll;
+
+public interface IOverScrollState {
+
+    /** No over-scroll is in-effect. */
+    int STATE_IDLE = 0;
+
+    /** User is actively touch-dragging, thus enabling over-scroll at the view's <i>start</i> side. */
+    int STATE_DRAG_START_SIDE = 1;
+
+    /** User is actively touch-dragging, thus enabling over-scroll at the view's <i>end</i> side. */
+    int STATE_DRAG_END_SIDE = 2;
+
+    /** User has released their touch, thus throwing the view back into place via bounce-back animation. */
+    int STATE_BOUNCE_BACK = 3;
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollStateListener.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollStateListener.java
new file mode 100755
index 0000000..5493f07
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollStateListener.java
@@ -0,0 +1,23 @@
+package me.everything.android.ui.overscroll;
+
+/**
+ * A callback-listener enabling over-scroll effect clients to be notified of effect state transitions.
+ * <br/>Invoked whenever state is transitioned onto one of {@link IOverScrollState#STATE_IDLE},
+ * {@link IOverScrollState#STATE_DRAG_START_SIDE}, {@link IOverScrollState#STATE_DRAG_END_SIDE}
+ * or {@link IOverScrollState#STATE_BOUNCE_BACK}.
+ *
+ * @see IOverScrollUpdateListener
+ */
+public interface IOverScrollStateListener {
+
+    /**
+     * The invoked callback.
+     *
+     * @param decor The associated over-scroll 'decorator'.
+     * @param oldState The old over-scroll state; ID's specified by {@link IOverScrollState}, e.g.
+     *                 {@link IOverScrollState#STATE_IDLE}.
+     * @param newState The <b>new</b> over-scroll state; ID's specified by {@link IOverScrollState},
+     *                 e.g. {@link IOverScrollState#STATE_IDLE}.
+     */
+    void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState);
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollUpdateListener.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollUpdateListener.java
new file mode 100755
index 0000000..f435d01
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollUpdateListener.java
@@ -0,0 +1,20 @@
+package me.everything.android.ui.overscroll;
+
+/**
+ * A callback-listener enabling over-scroll effect clients to subscribe to <b>real-time</b> updates
+ * of over-scrolling intensity, provided as the view-translation offset from pre-scroll position.
+ *
+ * @see IOverScrollStateListener
+ */
+public interface IOverScrollUpdateListener {
+
+    /**
+     * The invoked callback.
+     *
+     * @param decor The associated over-scroll 'decorator'.
+     * @param state One of: {@link IOverScrollState#STATE_IDLE}, {@link IOverScrollState#STATE_DRAG_START_SIDE},
+     *              {@link IOverScrollState#STATE_DRAG_START_SIDE} or {@link IOverScrollState#STATE_BOUNCE_BACK}.
+     * @param offset The currently visible offset created due to over-scroll.
+     */
+    void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset);
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/ListenerStubs.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/ListenerStubs.java
new file mode 100755
index 0000000..4feaaec
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/ListenerStubs.java
@@ -0,0 +1,14 @@
+package me.everything.android.ui.overscroll;
+
+public interface ListenerStubs {
+
+    class OverScrollStateListenerStub implements IOverScrollStateListener {
+        @Override
+        public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) { }
+    }
+
+    class OverScrollUpdateListenerStub implements IOverScrollUpdateListener {
+        @Override
+        public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) { }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollBounceEffectDecoratorBase.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollBounceEffectDecoratorBase.java
new file mode 100755
index 0000000..5ca6b6d
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollBounceEffectDecoratorBase.java
@@ -0,0 +1,481 @@
+package me.everything.android.ui.overscroll;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.util.Log;
+import android.util.Property;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.Interpolator;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+import me.everything.android.ui.overscroll.adapters.RecyclerViewOverScrollDecorAdapter;
+
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+import static me.everything.android.ui.overscroll.ListenerStubs.*;
+
+/**
+ * A standalone view decorator adding over-scroll with a smooth bounce-back effect to (potentially) any view -
+ * provided that an appropriate {@link IOverScrollDecoratorAdapter} implementation exists / can be written
+ * for that view type (e.g. {@link RecyclerViewOverScrollDecorAdapter}).
+ *
+ * <p>Design-wise, being a standalone class, this decorator powerfully provides the ability to add
+ * the over-scroll effect over any view without adjusting the view's implementation. In essence, this
+ * eliminates the need to repeatedly implement the effect per each view type (list-view,
+ * recycler-view, image-view, etc.). Therefore, using it is highly recommended compared to other
+ * more intrusive solutions.</p>
+ *
+ * <p>Note that this class is abstract, having {@link HorizontalOverScrollBounceEffectDecorator} and
+ * {@link VerticalOverScrollBounceEffectDecorator} providing concrete implementations that are
+ * view-orientation specific.</p>
+ *
+ * <hr width="97%"/>
+ * <h2>Implementation Notes</h2>
+ *
+ * <p>At it's core, the class simply registers itself as a touch-listener over the decorated view and
+ * intercepts touch events as needed.</p>
+ *
+ * <p>Internally, it delegates the over-scrolling calculations onto 3 state-based classes:
+ * <ol>
+ *     <li><b>Idle state</b> - monitors view state and touch events to intercept over-scrolling initiation
+ *     (in which case it hands control over to the Over-scrolling state).</li>
+ *     <li><b>Over-scrolling state</b> - handles motion events to apply the over-scroll effect as users
+ *     interact with the view.</li>
+ *     <li><b>Bounce-back state</b> - runs the bounce-back animation, all-the-while blocking all
+ *     touch events till the animation completes (in which case it hands control back to the idle
+ *     state).</li>
+ * </ol>
+ * </p>
+ *
+ * @see RecyclerViewOverScrollDecorAdapter
+ * @see IOverScrollDecoratorAdapter
+ */
+public abstract class OverScrollBounceEffectDecoratorBase implements IOverScrollDecor, View.OnTouchListener {
+
+    public static final String TAG = "OverScrollDecor";
+
+    public static final float DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD = 3f;
+    public static final float DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK = 1f;
+    public static final float DEFAULT_DECELERATE_FACTOR = -2f;
+
+    protected static final int MAX_BOUNCE_BACK_DURATION_MS = 800;
+    protected static final int MIN_BOUNCE_BACK_DURATION_MS = 200;
+
+    protected final OverScrollStartAttributes mStartAttr = new OverScrollStartAttributes();
+    protected final IOverScrollDecoratorAdapter mViewAdapter;
+
+    protected final IdleState mIdleState;
+    protected final OverScrollingState mOverScrollingState;
+    protected final BounceBackState mBounceBackState;
+    protected IDecoratorState mCurrentState;
+
+    protected IOverScrollStateListener mStateListener = new OverScrollStateListenerStub();
+    protected IOverScrollUpdateListener mUpdateListener = new OverScrollUpdateListenerStub();
+
+    /**
+     * When in over-scroll mode, keep track of dragging velocity to provide a smooth slow-down
+     * for the bounce-back effect.
+     */
+    protected float mVelocity;
+
+    /**
+     * Motion attributes: keeps data describing current motion event.
+     * <br/>Orientation agnostic: subclasses provide either horizontal or vertical
+     * initialization of the agnostic attributes.
+     */
+    protected abstract static class MotionAttributes {
+        public float mAbsOffset;
+        public float mDeltaOffset;
+        public boolean mDir; // True = 'forward', false = 'backwards'.
+
+        protected abstract boolean init(View view, MotionEvent event);
+    }
+
+    protected static class OverScrollStartAttributes {
+        protected int mPointerId;
+        protected float mAbsOffset;
+        protected boolean mDir; // True = 'forward', false = 'backwards'.
+    }
+
+    protected abstract static class AnimationAttributes {
+        public Property<View, Float> mProperty;
+        public float mAbsOffset;
+        public float mMaxOffset;
+
+        protected abstract void init(View view);
+    }
+
+    /**
+     * Interface of decorator-state delegation classes. Defines states as handles of two fundamental
+     * touch events: actual movement, up/cancel.
+     */
+    protected interface IDecoratorState {
+
+        /**
+         * Handle a motion (touch) event.
+         *
+         * @param event The event from onTouch.
+         * @return Return value for onTouch.
+         */
+        boolean handleMoveTouchEvent(MotionEvent event);
+
+        /**
+         * Handle up / touch-cancel events.
+         *
+         * @param event The event from onTouch.
+         * @return Return value for onTouch.
+         */
+        boolean handleUpOrCancelTouchEvent(MotionEvent event);
+
+        /**
+         * Handle a transition onto this state, as it becomes 'current' state.
+         * @param fromState
+         */
+        void handleEntryTransition(IDecoratorState fromState);
+
+        /**
+         * The client-perspective ID of the state associated with this (internal) one. ID's
+         * are as specified in {@link IOverScrollState}.
+         *
+         * @return The ID, e.g. {@link IOverScrollState#STATE_IDLE}.
+         */
+        int getStateId();
+    }
+
+    /**
+     * Idle state: monitors move events, trying to figure out whether over-scrolling should be
+     * initiated (i.e. when scrolled further when the view is at one of its displayable ends).
+     * <br/>When such is the case, it hands over control to the over-scrolling state.
+     */
+    protected class IdleState implements IDecoratorState {
+
+        final MotionAttributes mMoveAttr;
+
+        public IdleState() {
+            mMoveAttr = createMotionAttributes();
+        }
+
+        @Override
+        public int getStateId() {
+            return STATE_IDLE;
+        }
+
+        @Override
+        public boolean handleMoveTouchEvent(MotionEvent event) {
+
+            final View view = mViewAdapter.getView();
+            if (!mMoveAttr.init(view, event)) {
+                return false;
+            }
+
+            // Has over-scrolling officially started?
+            if ((mViewAdapter.isInAbsoluteStart() && mMoveAttr.mDir) ||
+                (mViewAdapter.isInAbsoluteEnd() && !mMoveAttr.mDir)) {
+
+                // Save initial over-scroll attributes for future reference.
+                mStartAttr.mPointerId = event.getPointerId(0);
+                mStartAttr.mAbsOffset = mMoveAttr.mAbsOffset;
+                mStartAttr.mDir = mMoveAttr.mDir;
+
+                issueStateTransition(mOverScrollingState);
+                return mOverScrollingState.handleMoveTouchEvent(event);
+            }
+
+            return false;
+        }
+
+        @Override
+        public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
+            return false;
+        }
+
+        @Override
+        public void handleEntryTransition(IDecoratorState fromState) {
+            mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
+        }
+    }
+
+    /**
+     * Handles the actual over-scrolling: thus translating the view according to configuration
+     * and user interactions, dynamically.
+     *
+     * <br/><br/>The state is exited - thus completing over-scroll handling, in one of two cases:
+     * <br/>When user lets go of the view, it transitions control to the bounce-back state.
+     * <br/>When user moves the view back onto a potential 'under-scroll' state, it abruptly
+     * transitions control to the idle-state, so as to return touch-events management to the
+     * normal over-scroll-less environment (thus preventing under-scrolling and potentially regaining
+     * regular scrolling).
+     */
+    protected class OverScrollingState implements IDecoratorState {
+
+        protected final float mTouchDragRatioFwd;
+        protected final float mTouchDragRatioBck;
+
+        final MotionAttributes mMoveAttr;
+        int mCurrDragState;
+
+        public OverScrollingState(float touchDragRatioFwd, float touchDragRatioBck) {
+            mMoveAttr = createMotionAttributes();
+            mTouchDragRatioFwd = touchDragRatioFwd;
+            mTouchDragRatioBck = touchDragRatioBck;
+        }
+
+        @Override
+        public int getStateId() {
+            // This is really a single class that implements 2 states, so our ID depends on what
+            // it was during the last invocation.
+            return mCurrDragState;
+        }
+
+        @Override
+        public boolean handleMoveTouchEvent(MotionEvent event) {
+
+            // Switching 'pointers' (e.g. fingers) on-the-fly isn't supported -- abort over-scroll
+            // smoothly using the default bounce-back animation in this case.
+            if (mStartAttr.mPointerId != event.getPointerId(0)) {
+                issueStateTransition(mBounceBackState);
+                return true;
+            }
+
+            final View view = mViewAdapter.getView();
+            if (!mMoveAttr.init(view, event)) {
+                // Keep intercepting the touch event as long as we're still over-scrolling...
+                return true;
+            }
+
+            float deltaOffset = mMoveAttr.mDeltaOffset / (mMoveAttr.mDir == mStartAttr.mDir ? mTouchDragRatioFwd : mTouchDragRatioBck);
+            float newOffset = mMoveAttr.mAbsOffset + deltaOffset;
+
+            // If moved in counter direction onto a potential under-scroll state -- don't. Instead, abort
+            // over-scrolling abruptly, thus returning control to which-ever touch handlers there
+            // are waiting (e.g. regular scroller handlers).
+            if ( (mStartAttr.mDir && !mMoveAttr.mDir && (newOffset <= mStartAttr.mAbsOffset)) ||
+                 (!mStartAttr.mDir && mMoveAttr.mDir && (newOffset >= mStartAttr.mAbsOffset)) ) {
+                translateViewAndEvent(view, mStartAttr.mAbsOffset, event);
+                mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, mCurrDragState, 0);
+
+                issueStateTransition(mIdleState);
+                return true;
+            }
+
+            if (view.getParent() != null) {
+                view.getParent().requestDisallowInterceptTouchEvent(true);
+            }
+
+            long dt = event.getEventTime() - event.getHistoricalEventTime(0);
+            if (dt > 0) { // Sometimes (though rarely) dt==0 cause originally timing is in nanos, but is presented in millis.
+                mVelocity = deltaOffset / dt;
+            }
+
+            translateView(view, newOffset);
+            mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, mCurrDragState, newOffset);
+
+            return true;
+        }
+
+        @Override
+        public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
+            issueStateTransition(mBounceBackState);
+            return false;
+        }
+
+        @Override
+        public void handleEntryTransition(IDecoratorState fromState) {
+            mCurrDragState = (mStartAttr.mDir ? STATE_DRAG_START_SIDE : STATE_DRAG_END_SIDE);
+            mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
+        }
+    }
+
+    /**
+     * When entered, starts the bounce-back animation.
+     * <br/>Upon animation completion, transitions control onto the idle state; Does so by
+     * registering itself as an animation listener.
+     * <br/>In the meantime, blocks (intercepts) all touch events.
+     */
+    protected class BounceBackState implements IDecoratorState, Animator.AnimatorListener, ValueAnimator.AnimatorUpdateListener {
+
+        protected final Interpolator mBounceBackInterpolator = new DecelerateInterpolator();
+        protected final float mDecelerateFactor;
+        protected final float mDoubleDecelerateFactor;
+
+        protected final AnimationAttributes mAnimAttributes;
+
+        public BounceBackState(float decelerateFactor) {
+            mDecelerateFactor = decelerateFactor;
+            mDoubleDecelerateFactor = 2f * decelerateFactor;
+
+            mAnimAttributes = createAnimationAttributes();
+        }
+
+        @Override
+        public int getStateId() {
+            return STATE_BOUNCE_BACK;
+        }
+
+        @Override
+        public void handleEntryTransition(IDecoratorState fromState) {
+
+            mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
+
+            Animator bounceBackAnim = createAnimator();
+            bounceBackAnim.addListener(this);
+
+            bounceBackAnim.start();
+        }
+
+        @Override
+        public boolean handleMoveTouchEvent(MotionEvent event) {
+            // Flush all touches down the drain till animation is over.
+            return true;
+        }
+
+        @Override
+        public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
+            // Flush all touches down the drain till animation is over.
+            return true;
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            issueStateTransition(mIdleState);
+        }
+
+        @Override
+        public void onAnimationUpdate(ValueAnimator animation) {
+            mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, STATE_BOUNCE_BACK, (Float) animation.getAnimatedValue());
+        }
+
+        @Override public void onAnimationStart(Animator animation) {}
+        @Override public void onAnimationCancel(Animator animation) {}
+        @Override public void onAnimationRepeat(Animator animation) {}
+
+        protected Animator createAnimator() {
+
+            final View view = mViewAdapter.getView();
+
+            mAnimAttributes.init(view);
+
+            // Set up a low-duration slow-down animation IN the drag direction.
+
+            // Exception: If wasn't dragging in 'forward' direction (or velocity=0 -- i.e. not dragging at all),
+            // skip slow-down anim directly to the bounce-back.
+            if (mVelocity == 0f || (mVelocity < 0 && mStartAttr.mDir) || (mVelocity > 0 && !mStartAttr.mDir)) {
+                return createBounceBackAnimator(mAnimAttributes.mAbsOffset);
+            }
+
+            // dt = (Vt - Vo) / a; Vt=0 ==> dt = -Vo / a
+            float slowdownDuration = -mVelocity / mDecelerateFactor;
+            slowdownDuration = (slowdownDuration < 0 ? 0 : slowdownDuration); // Happens in counter-direction dragging
+
+            // dx = (Vt^2 - Vo^2) / 2a; Vt=0 ==> dx = -Vo^2 / 2a
+            float slowdownDistance = -mVelocity * mVelocity / mDoubleDecelerateFactor;
+            float slowdownEndOffset = mAnimAttributes.mAbsOffset + slowdownDistance;
+
+            ObjectAnimator slowdownAnim = createSlowdownAnimator(view, (int) slowdownDuration, slowdownEndOffset);
+
+            // Set up the bounce back animation, bringing the view back into the original, pre-overscroll position (translation=0).
+
+            ObjectAnimator bounceBackAnim = createBounceBackAnimator(slowdownEndOffset);
+
+            // Play the 2 animations as a sequence.
+            AnimatorSet wholeAnim = new AnimatorSet();
+            wholeAnim.playSequentially(slowdownAnim, bounceBackAnim);
+            return wholeAnim;
+        }
+
+        protected ObjectAnimator createSlowdownAnimator(View view, int slowdownDuration, float slowdownEndOffset) {
+            ObjectAnimator slowdownAnim = ObjectAnimator.ofFloat(view, mAnimAttributes.mProperty, slowdownEndOffset);
+            slowdownAnim.setDuration(slowdownDuration);
+            slowdownAnim.setInterpolator(mBounceBackInterpolator);
+            slowdownAnim.addUpdateListener(this);
+            return slowdownAnim;
+        }
+
+        protected ObjectAnimator createBounceBackAnimator(float startOffset) {
+
+            final View view = mViewAdapter.getView();
+
+            // Duration is proportional to the view's size.
+            float bounceBackDuration = (Math.abs(startOffset) / mAnimAttributes.mMaxOffset) * MAX_BOUNCE_BACK_DURATION_MS;
+            ObjectAnimator bounceBackAnim = ObjectAnimator.ofFloat(view, mAnimAttributes.mProperty, mStartAttr.mAbsOffset);
+            bounceBackAnim.setDuration(Math.max((int) bounceBackDuration, MIN_BOUNCE_BACK_DURATION_MS));
+            bounceBackAnim.setInterpolator(mBounceBackInterpolator);
+            bounceBackAnim.addUpdateListener(this);
+            return bounceBackAnim;
+        }
+    }
+
+    public OverScrollBounceEffectDecoratorBase(IOverScrollDecoratorAdapter viewAdapter, float decelerateFactor, float touchDragRatioFwd, float touchDragRatioBck) {
+        mViewAdapter = viewAdapter;
+
+        mBounceBackState = new BounceBackState(decelerateFactor);
+        mOverScrollingState = new OverScrollingState(touchDragRatioFwd, touchDragRatioBck);
+        mIdleState = new IdleState();
+
+        mCurrentState = mIdleState;
+
+        attach();
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_MOVE:
+                return mCurrentState.handleMoveTouchEvent(event);
+
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP:
+                return mCurrentState.handleUpOrCancelTouchEvent(event);
+        }
+
+        return false;
+    }
+
+    @Override
+    public void setOverScrollStateListener(IOverScrollStateListener listener) {
+        mStateListener = (listener != null ? listener : new OverScrollStateListenerStub());
+    }
+
+    @Override
+    public void setOverScrollUpdateListener(IOverScrollUpdateListener listener) {
+        mUpdateListener = (listener != null ? listener : new OverScrollUpdateListenerStub());
+    }
+
+    @Override
+    public int getCurrentState() {
+        return mCurrentState.getStateId();
+    }
+
+    @Override
+    public View getView() {
+        return mViewAdapter.getView();
+    }
+
+    protected void issueStateTransition(IDecoratorState state) {
+        IDecoratorState oldState = mCurrentState;
+        mCurrentState = state;
+        mCurrentState.handleEntryTransition(oldState);
+    }
+
+    protected void attach() {
+        getView().setOnTouchListener(this);
+        getView().setOverScrollMode(View.OVER_SCROLL_NEVER);
+    }
+
+    @Override
+    public void detach() {
+        if (mCurrentState != mIdleState) {
+            Log.w(TAG, "Decorator detached while over-scroll is in effect. You might want to add a precondition of that getCurrentState()==STATE_IDLE, first.");
+        }
+        getView().setOnTouchListener(null);
+        getView().setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    protected abstract MotionAttributes createMotionAttributes();
+    protected abstract AnimationAttributes createAnimationAttributes();
+    protected abstract void translateView(View view, float offset);
+    protected abstract void translateViewAndEvent(View view, float offset, MotionEvent event);
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollDecoratorHelper.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollDecoratorHelper.java
new file mode 100755
index 0000000..25b246a
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollDecoratorHelper.java
@@ -0,0 +1,90 @@
+package me.everything.android.ui.overscroll;
+
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+import android.view.View;
+import android.widget.GridView;
+import android.widget.HorizontalScrollView;
+import android.widget.ListView;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.adapters.AbsListViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.HorizontalScrollViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.RecyclerViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.ScrollViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.StaticOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.ViewPagerOverScrollDecorAdapter;
+
+public class OverScrollDecoratorHelper {
+
+    public static final int ORIENTATION_VERTICAL = 0;
+    public static final int ORIENTATION_HORIZONTAL = 1;
+
+    /**
+     * Set up the over-scroll effect over a specified {@link RecyclerView} view.
+     * <br/>Only recycler-views using <b>native</b> Android layout managers (i.e. {@link LinearLayoutManager},
+     * {@link GridLayoutManager} and {@link StaggeredGridLayoutManager}) are currently supported
+     * by this convenience method.
+     *
+     * @param recyclerView The view.
+     * @param orientation Either {@link #ORIENTATION_HORIZONTAL} or {@link #ORIENTATION_VERTICAL}.
+     *
+     * @return The over-scroll effect 'decorator', enabling further effect configuration.
+     */
+    public static IOverScrollDecor setUpOverScroll(RecyclerView recyclerView, int orientation) {
+        switch (orientation) {
+            case ORIENTATION_HORIZONTAL:
+                return new HorizontalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView));
+            case ORIENTATION_VERTICAL:
+                return new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView));
+            default:
+                throw new IllegalArgumentException("orientation");
+        }
+    }
+
+    public static IOverScrollDecor setUpOverScroll(ListView listView) {
+        return new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(listView));
+    }
+
+    public static IOverScrollDecor setUpOverScroll(GridView gridView) {
+        return new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(gridView));
+    }
+
+    public static IOverScrollDecor setUpOverScroll(ScrollView scrollView) {
+        return new VerticalOverScrollBounceEffectDecorator(new ScrollViewOverScrollDecorAdapter(scrollView));
+    }
+
+    public static IOverScrollDecor setUpOverScroll(HorizontalScrollView scrollView) {
+        return new HorizontalOverScrollBounceEffectDecorator(new HorizontalScrollViewOverScrollDecorAdapter(scrollView));
+    }
+
+    /**
+     * Set up the over-scroll over a generic view, assumed to always be over-scroll ready (e.g.
+     * a plain text field, image view).
+     *
+     * @param view The view.
+     * @param orientation One of {@link #ORIENTATION_HORIZONTAL} or {@link #ORIENTATION_VERTICAL}.
+     *
+     * @return The over-scroll effect 'decorator', enabling further effect configuration.
+     */
+    public static IOverScrollDecor setUpStaticOverScroll(View view, int orientation) {
+        switch (orientation) {
+            case ORIENTATION_HORIZONTAL:
+                return new HorizontalOverScrollBounceEffectDecorator(new StaticOverScrollDecorAdapter(view));
+
+            case ORIENTATION_VERTICAL:
+                return new VerticalOverScrollBounceEffectDecorator(new StaticOverScrollDecorAdapter(view));
+
+            default:
+                throw new IllegalArgumentException("orientation");
+        }
+    }
+
+    public static IOverScrollDecor setUpOverScroll(ViewPager viewPager) {
+        return new HorizontalOverScrollBounceEffectDecorator(new ViewPagerOverScrollDecorAdapter(viewPager));
+    }
+
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecorator.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecorator.java
new file mode 100755
index 0000000..5d10f73
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecorator.java
@@ -0,0 +1,97 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+/**
+ * A concrete implementation of {@link OverScrollBounceEffectDecoratorBase} for a vertical orientation.
+ */
+public class VerticalOverScrollBounceEffectDecorator extends OverScrollBounceEffectDecoratorBase {
+
+    protected static class MotionAttributesVertical extends MotionAttributes {
+
+        public boolean init(View view, MotionEvent event) {
+
+            // We must have history available to calc the dx. Normally it's there - if it isn't temporarily,
+            // we declare the event 'invalid' and expect it in consequent events.
+            if (event.getHistorySize() == 0) {
+                return false;
+            }
+
+            // Allow for counter-orientation-direction operations (e.g. item swiping) to run fluently.
+            final float dy = event.getY(0) - event.getHistoricalY(0, 0);
+            final float dx = event.getX(0) - event.getHistoricalX(0, 0);
+            if (Math.abs(dx) > Math.abs(dy)) {
+                return false;
+            }
+
+            mAbsOffset = view.getTranslationY();
+            mDeltaOffset = dy;
+            mDir = mDeltaOffset > 0;
+
+            return true;
+        }
+    }
+
+    protected static class AnimationAttributesVertical extends AnimationAttributes {
+
+        public AnimationAttributesVertical() {
+            mProperty = View.TRANSLATION_Y;
+        }
+
+        @Override
+        protected void init(View view) {
+            mAbsOffset = view.getTranslationY();
+            mMaxOffset = view.getHeight();
+        }
+    }
+
+    /**
+     * C'tor, creating the effect with default arguments:
+     * <br/>Touch-drag ratio in 'forward' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD.
+     * <br/>Touch-drag ratio in 'backwards' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK.
+     * <br/>Deceleration factor (for the bounce-back effect) will be set to DEFAULT_DECELERATE_FACTOR.
+     *
+     * @param viewAdapter The view's encapsulation.
+     */
+    public VerticalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter) {
+        this(viewAdapter, DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD, DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK, DEFAULT_DECELERATE_FACTOR);
+    }
+
+    /**
+     * C'tor, creating the effect with explicit arguments.
+     * @param viewAdapter The view's encapsulation.
+     * @param touchDragRatioFwd Ratio of touch distance to actual drag distance when in 'forward' direction.
+     * @param touchDragRatioBck Ratio of touch distance to actual drag distance when in 'backward'
+     *                          direction (opposite to initial one).
+     * @param decelerateFactor Deceleration factor used when decelerating the motion to create the
+     *                         bounce-back effect.
+     */
+    public VerticalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter,
+                                                   float touchDragRatioFwd, float touchDragRatioBck, float decelerateFactor) {
+        super(viewAdapter, decelerateFactor, touchDragRatioFwd, touchDragRatioBck);
+    }
+
+    @Override
+    protected MotionAttributes createMotionAttributes() {
+        return new MotionAttributesVertical();
+    }
+
+    @Override
+    protected AnimationAttributes createAnimationAttributes() {
+        return new AnimationAttributesVertical();
+    }
+
+    @Override
+    protected void translateView(View view, float offset) {
+        view.setTranslationY(offset);
+    }
+
+    @Override
+    protected void translateViewAndEvent(View view, float offset, MotionEvent event) {
+        view.setTranslationY(offset);
+        event.offsetLocation(offset - event.getY(0), 0f);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/AbsListViewOverScrollDecorAdapter.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/AbsListViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..d873ad4
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/AbsListViewOverScrollDecorAdapter.java
@@ -0,0 +1,55 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+import android.widget.AbsListView;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter to enable over-scrolling over object of {@link AbsListView}, namely {@link
+ * android.widget.ListView} and it's extensions, and {@link android.widget.GridView}.
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class AbsListViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final AbsListView mView;
+
+    public AbsListViewOverScrollDecorAdapter(AbsListView view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return mView.getChildCount() > 0 && !canScrollListUp();
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return mView.getChildCount() > 0 && !canScrollListDown();
+    }
+
+    public boolean canScrollListUp() {
+        // Ported from AbsListView#canScrollList() which isn't compatible to all API levels
+        final int firstTop = mView.getChildAt(0).getTop();
+        final int firstPosition = mView.getFirstVisiblePosition();
+        return firstPosition > 0 || firstTop < mView.getListPaddingTop();
+    }
+
+    public boolean canScrollListDown() {
+        // Ported from AbsListView#canScrollList() which isn't compatible to all API levels
+        final int childCount = mView.getChildCount();
+        final int itemsCount = mView.getCount();
+        final int firstPosition = mView.getFirstVisiblePosition();
+        final int lastPosition = firstPosition + childCount;
+        final int lastBottom = mView.getChildAt(childCount - 1).getBottom();
+        return lastPosition < itemsCount || lastBottom > mView.getHeight() - mView.getListPaddingBottom();
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/HorizontalScrollViewOverScrollDecorAdapter.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/HorizontalScrollViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..3377f53
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/HorizontalScrollViewOverScrollDecorAdapter.java
@@ -0,0 +1,39 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+import android.widget.HorizontalScrollView;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter that enables over-scrolling support over a {@link HorizontalScrollView}.
+ * <br/>Seeing that {@link HorizontalScrollView} only supports horizontal scrolling, this adapter
+ * should only be used with a {@link HorizontalOverScrollBounceEffectDecorator}.
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class HorizontalScrollViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final HorizontalScrollView mView;
+
+    public HorizontalScrollViewOverScrollDecorAdapter(HorizontalScrollView view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return !mView.canScrollHorizontally(-1);
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return !mView.canScrollHorizontally(1);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/IOverScrollDecoratorAdapter.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/IOverScrollDecoratorAdapter.java
new file mode 100755
index 0000000..ed0c0f2
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/IOverScrollDecoratorAdapter.java
@@ -0,0 +1,31 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+
+/**
+ * @see HorizontalOverScrollBounceEffectDecorator
+ */
+public interface IOverScrollDecoratorAdapter {
+
+    View getView();
+
+    /**
+     * Is view in it's absolute start position - such that a negative over-scroll can potentially
+     * be initiated. For example, in list-views, this is synonymous with the first item being
+     * fully visible.
+     *
+     * @return Whether in absolute start position.
+     */
+    boolean isInAbsoluteStart();
+
+    /**
+     * Is view in it's absolute end position - such that an over-scroll can potentially
+     * be initiated. For example, in list-views, this is synonymous with the last item being
+     * fully visible.
+     *
+     * @return Whether in absolute end position.
+     */
+    boolean isInAbsoluteEnd();
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/RecyclerViewOverScrollDecorAdapter.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/RecyclerViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..08959d1
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/RecyclerViewOverScrollDecorAdapter.java
@@ -0,0 +1,226 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.graphics.Canvas;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import android.view.View;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class RecyclerViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    /**
+     * A delegation of the adapter implementation of this view that should provide the processing
+     * of {@link #isInAbsoluteStart()} and {@link #isInAbsoluteEnd()}. Essentially needed simply
+     * because the implementation depends on the layout manager implementation being used.
+     */
+    protected interface Impl {
+        boolean isInAbsoluteStart();
+        boolean isInAbsoluteEnd();
+    }
+
+    protected final RecyclerView mRecyclerView;
+    protected final Impl mImpl;
+
+    protected boolean mIsItemTouchInEffect = false;
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView) {
+
+        mRecyclerView = recyclerView;
+
+        final RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
+        if (layoutManager instanceof LinearLayoutManager ||
+            layoutManager instanceof StaggeredGridLayoutManager)
+        {
+            final int orientation =
+                    (layoutManager instanceof LinearLayoutManager
+                        ? ((LinearLayoutManager) layoutManager).getOrientation()
+                        : ((StaggeredGridLayoutManager) layoutManager).getOrientation());
+
+            if (orientation == LinearLayoutManager.HORIZONTAL) {
+                mImpl = new ImplHorizLayout();
+            } else {
+                mImpl = new ImplVerticalLayout();
+            }
+        }
+        else
+        {
+            throw new IllegalArgumentException("Recycler views with custom layout managers are not supported by this adapter out of the box." +
+                    "Try implementing and providing an explicit 'impl' parameter to the other c'tors, or otherwise create a custom adapter subclass of your own.");
+        }
+    }
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, Impl impl) {
+        mRecyclerView = recyclerView;
+        mImpl = impl;
+    }
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, ItemTouchHelper.Callback itemTouchHelperCallback) {
+        this(recyclerView);
+        setUpTouchHelperCallback(itemTouchHelperCallback);
+    }
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, Impl impl, ItemTouchHelper.Callback itemTouchHelperCallback) {
+        this(recyclerView, impl);
+        setUpTouchHelperCallback(itemTouchHelperCallback);
+    }
+
+    protected void setUpTouchHelperCallback(final ItemTouchHelper.Callback itemTouchHelperCallback) {
+        new ItemTouchHelper(new ItemTouchHelperCallbackWrapper(itemTouchHelperCallback) {
+            @Override
+            public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
+                mIsItemTouchInEffect = actionState != 0;
+                super.onSelectedChanged(viewHolder, actionState);
+            }
+        }).attachToRecyclerView(mRecyclerView);
+    }
+
+    @Override
+    public View getView() {
+        return mRecyclerView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return !mIsItemTouchInEffect && mImpl.isInAbsoluteStart();
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return !mIsItemTouchInEffect && mImpl.isInAbsoluteEnd();
+    }
+
+    protected class ImplHorizLayout implements Impl {
+
+        @Override
+        public boolean isInAbsoluteStart() {
+            return !mRecyclerView.canScrollHorizontally(-1);
+        }
+
+        @Override
+        public boolean isInAbsoluteEnd() {
+            return !mRecyclerView.canScrollHorizontally(1);
+        }
+    }
+
+    protected class ImplVerticalLayout implements Impl {
+
+        @Override
+        public boolean isInAbsoluteStart() {
+            return !mRecyclerView.canScrollVertically(-1);
+        }
+
+        @Override
+        public boolean isInAbsoluteEnd() {
+            return !mRecyclerView.canScrollVertically(1);
+        }
+    }
+
+    private static class ItemTouchHelperCallbackWrapper extends ItemTouchHelper.Callback {
+
+        final ItemTouchHelper.Callback mCallback;
+
+        private ItemTouchHelperCallbackWrapper(ItemTouchHelper.Callback callback) {
+            mCallback = callback;
+        }
+
+        @Override
+        public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+            return mCallback.getMovementFlags(recyclerView, viewHolder);
+        }
+
+        @Override
+        public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+            return mCallback.onMove(recyclerView, viewHolder, target);
+        }
+
+        @Override
+        public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+            mCallback.onSwiped(viewHolder, direction);
+        }
+
+        @Override
+        public int convertToAbsoluteDirection(int flags, int layoutDirection) {
+            return mCallback.convertToAbsoluteDirection(flags, layoutDirection);
+        }
+
+        @Override
+        public boolean canDropOver(RecyclerView recyclerView, RecyclerView.ViewHolder current, RecyclerView.ViewHolder target) {
+            return mCallback.canDropOver(recyclerView, current, target);
+        }
+
+        @Override
+        public boolean isLongPressDragEnabled() {
+            return mCallback.isLongPressDragEnabled();
+        }
+
+        @Override
+        public boolean isItemViewSwipeEnabled() {
+            return mCallback.isItemViewSwipeEnabled();
+        }
+
+        @Override
+        public int getBoundingBoxMargin() {
+            return mCallback.getBoundingBoxMargin();
+        }
+
+        @Override
+        public float getSwipeThreshold(RecyclerView.ViewHolder viewHolder) {
+            return mCallback.getSwipeThreshold(viewHolder);
+        }
+
+        @Override
+        public float getMoveThreshold(RecyclerView.ViewHolder viewHolder) {
+            return mCallback.getMoveThreshold(viewHolder);
+        }
+
+        @Override
+        public RecyclerView.ViewHolder chooseDropTarget(RecyclerView.ViewHolder selected, List<RecyclerView.ViewHolder> dropTargets, int curX, int curY) {
+            return mCallback.chooseDropTarget(selected, dropTargets, curX, curY);
+        }
+
+        @Override
+        public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
+            mCallback.onSelectedChanged(viewHolder, actionState);
+        }
+
+        @Override
+        public void onMoved(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, int fromPos, RecyclerView.ViewHolder target, int toPos, int x, int y) {
+            mCallback.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y);
+        }
+
+        @Override
+        public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+            mCallback.clearView(recyclerView, viewHolder);
+        }
+
+        @Override
+        public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+            mCallback.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+        }
+
+        @Override
+        public void onChildDrawOver(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+            mCallback.onChildDrawOver(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+        }
+
+        @Override
+        public long getAnimationDuration(RecyclerView recyclerView, int animationType, float animateDx, float animateDy) {
+            return mCallback.getAnimationDuration(recyclerView, animationType, animateDx, animateDy);
+        }
+
+        @Override
+        public int interpolateOutOfBoundsScroll(RecyclerView recyclerView, int viewSize, int viewSizeOutOfBounds, int totalSize, long msSinceStartScroll) {
+            return mCallback.interpolateOutOfBoundsScroll(recyclerView, viewSize, viewSizeOutOfBounds, totalSize, msSinceStartScroll);
+        }
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ScrollViewOverScrollDecorAdapter.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ScrollViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..d71ba43
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ScrollViewOverScrollDecorAdapter.java
@@ -0,0 +1,41 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter that enables over-scrolling over a {@link ScrollView}.
+ * <br/>Seeing that {@link ScrollView} only supports vertical scrolling, this adapter
+ * should only be used with a {@link VerticalOverScrollBounceEffectDecorator}. For horizontal
+ * over-scrolling, use {@link HorizontalScrollViewOverScrollDecorAdapter} in conjunction with
+ * a {@link android.widget.HorizontalScrollView}.
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class ScrollViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final ScrollView mView;
+
+    public ScrollViewOverScrollDecorAdapter(ScrollView view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return !mView.canScrollVertically(-1);
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return !mView.canScrollVertically(1);
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/StaticOverScrollDecorAdapter.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/StaticOverScrollDecorAdapter.java
new file mode 100755
index 0000000..024b413
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/StaticOverScrollDecorAdapter.java
@@ -0,0 +1,36 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * A static adapter for views that are ALWAYS over-scroll-able (e.g. image view).
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class StaticOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final View mView;
+
+    public StaticOverScrollDecorAdapter(View view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return true;
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return true;
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ViewPagerOverScrollDecorAdapter.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ViewPagerOverScrollDecorAdapter.java
new file mode 100755
index 0000000..7aaedbd
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ViewPagerOverScrollDecorAdapter.java
@@ -0,0 +1,63 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+
+import androidx.viewpager.widget.ViewPager;
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter to enable over-scrolling over object of {@link ViewPager}
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ */
+public class ViewPagerOverScrollDecorAdapter implements IOverScrollDecoratorAdapter, ViewPager.OnPageChangeListener {
+
+    protected final ViewPager mViewPager;
+
+    protected int mLastPagerPosition = 0;
+    protected float mLastPagerScrollOffset;
+
+    public ViewPagerOverScrollDecorAdapter(ViewPager viewPager) {
+        this.mViewPager = viewPager;
+
+        mViewPager.addOnPageChangeListener(this);
+
+        mLastPagerPosition = mViewPager.getCurrentItem();
+        mLastPagerScrollOffset = 0f;
+    }
+
+    @Override
+    public View getView() {
+        return mViewPager;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+
+        return mLastPagerPosition == 0 &&
+                mLastPagerScrollOffset == 0f;
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+
+        return mLastPagerPosition == mViewPager.getAdapter().getCount()-1 &&
+                mLastPagerScrollOffset == 0f;
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        mLastPagerPosition = position;
+        mLastPagerScrollOffset = positionOffset;
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecoratorTest.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecoratorTest.java
new file mode 100755
index 0000000..1e06199
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecoratorTest.java
@@ -0,0 +1,636 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+import static me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator.DEFAULT_DECELERATE_FACTOR;
+import static me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class HorizontalOverScrollBounceEffectDecoratorTest {
+
+    View mView;
+    IOverScrollDecoratorAdapter mViewAdapter;
+    IOverScrollStateListener mStateListener;
+    IOverScrollUpdateListener mUpdateListener;
+
+    @Before
+    public void setUp() {
+        mView = mock(View.class);
+        mViewAdapter = mock(IOverScrollDecoratorAdapter.class);
+        when(mViewAdapter.getView()).thenReturn(mView);
+
+        mStateListener = mock(IOverScrollStateListener.class);
+        mUpdateListener = mock(IOverScrollUpdateListener.class);
+    }
+
+    @Test
+    public void detach_decoratorIsAttached_detachFromView() {
+
+        // Arrange
+
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter);
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    @Test
+    public void detach_overScrollInEffect_detachFromView() {
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, createShortRightMoveEvent());
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    /*
+     * Move-action event
+     */
+
+    @Test
+    public void onTouchMoveAction_notInViewEnds_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragRightInLeftEnd_overscrollRight() {
+
+        // Arrange
+
+        MotionEvent event = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        final float expectedTransX = (event.getX() - event.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragLeftInRightEnd_overscrollLeft() {
+
+        // Arrange
+
+        MotionEvent event = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        final float expectedTransX = (event.getX() - event.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragLeftInLeftEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragRightInRightEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndRightDragInLeftEnd_overscrollRightFurther() {
+
+        // Arrange
+
+        // Bring UUT to a right-overscroll state
+        MotionEvent event1 = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd right-drag event
+        MotionEvent event2 = createLongRightMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransX1 = (event1.getX() - event1.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransX2 = (event2.getX() - event2.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX2);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndLeftDragInRightEnd_overscrollLeftFurther() {
+
+        // Arrange
+
+        // Bring UUT to a left-overscroll state
+        MotionEvent event1 = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd left-drag event
+        MotionEvent event2 = createLongLeftMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransX1 = (event1.getX() - event1.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransX2 = (event2.getX() - event2.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX2);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (to the right in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to
+     * remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragLeftWhenRightOverscolled_continueOverscrollingLeft() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a right-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveRight = createLongRightMoveEvent();
+        uut.onTouch(mView, eventMoveRight);
+        reset(mView);
+        float startTransX = (eventMoveRight.getX() - eventMoveRight.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the left-drag event
+        MotionEvent eventMoveLeft = createShortLeftMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveLeft);
+
+        // Assert
+
+        float expectedTransX = startTransX +
+                                (eventMoveLeft.getX() - eventMoveLeft.getHistoricalX(0)) / touchDragRatioBck;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (to the left in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragRightWhenLeftOverscolled_continueOverscrollingRight() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a left-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveLeft = createLongLeftMoveEvent();
+        uut.onTouch(mView, eventMoveLeft);
+        reset(mView);
+
+        float startTransX = (eventMoveLeft.getX() - eventMoveLeft.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the right-drag event
+        MotionEvent eventMoveRight = createShortRightMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveRight);
+
+        // Assert
+
+        float expectedTransX = startTransX + (eventMoveRight.getX() - eventMoveRight.getHistoricalX(0)) / touchDragRatioBck;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenRightOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a right-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveRight = createLongRightMoveEvent();
+        uut.onTouch(mView, eventMoveRight);
+        reset(mView);
+        float startTransX = (eventMoveRight.getX() - eventMoveRight.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the left-drag event
+        MotionEvent eventMoveLeft = createLongLeftMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveLeft);
+
+        // Assert
+
+        verify(mView).setTranslationX(0);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_START_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenLeftOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a left-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveLeft = createLongLeftMoveEvent();
+        uut.onTouch(mView, eventMoveLeft);
+        reset(mView);
+        float startTransX = (eventMoveLeft.getX() - eventMoveLeft.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the left-drag event
+        MotionEvent eventMoveRight = createLongRightMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveRight);
+
+        // Assert
+
+        verify(mView).setTranslationX(0);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_END_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+
+    /*
+     * Up action event
+     */
+
+    @Test
+    public void onTouchUpAction_eventWhenNotOverscrolled_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createDefaultUpActionEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * TODO: Make this work using a decent animation shadows / newer Robolectric
+     * @throws Exception
+     */
+    @Ignore
+    @Test
+    public void onTouchUpAction_eventWhenLeftOverscrolling_smoothScrollBackToRightEnd() {
+
+        // Arrange
+
+        // Bring UUT to a left-overscroll state
+        MotionEvent moveEvent = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, moveEvent);
+        reset(mView);
+
+        // Make the view as though it's been moved by the move event
+        float viewX = moveEvent.getX();
+        when(mView.getTranslationX()).thenReturn(viewX);
+
+        MotionEvent upEvent = createDefaultUpActionEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, upEvent);
+
+        // Assert
+
+        assertTrue(ret);
+
+        verify(mView, atLeastOnce()).setTranslationX(anyFloat());
+    }
+
+    protected MotionEvent createShortRightMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(100f);
+        when(event.getY()).thenReturn(200f);
+        when(event.getX(0)).thenReturn(100f);
+        when(event.getY(0)).thenReturn(200f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(80f);
+        when(event.getHistoricalY(eq(0))).thenReturn(190f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(80f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(190f);
+        return event;
+    }
+
+    protected MotionEvent createLongRightMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(150f);
+        when(event.getY()).thenReturn(250f);
+        when(event.getX(0)).thenReturn(150f);
+        when(event.getY(0)).thenReturn(250f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0))).thenReturn(200f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(200f);
+        return event;
+    }
+
+    protected MotionEvent createShortLeftMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(100f);
+        when(event.getY()).thenReturn(200f);
+        when(event.getX(0)).thenReturn(100f);
+        when(event.getY(0)).thenReturn(200f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(120f);
+        when(event.getHistoricalY(eq(0))).thenReturn(220f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(120f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(220f);
+        return event;
+    }
+
+    protected MotionEvent createLongLeftMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(50f);
+        when(event.getY()).thenReturn(150f);
+        when(event.getX(0)).thenReturn(50f);
+        when(event.getY(0)).thenReturn(150f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0))).thenReturn(200f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(200f);
+        return event;
+    }
+
+    protected MotionEvent createDefaultUpActionEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_UP);
+        return event;
+    }
+
+    protected HorizontalOverScrollBounceEffectDecorator getUUT() {
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+
+    protected HorizontalOverScrollBounceEffectDecorator getUUT(float touchDragRatioFwd, float touchDragRatioBck) {
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter, touchDragRatioFwd, touchDragRatioBck, DEFAULT_DECELERATE_FACTOR);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+}
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecoratorTest.java b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecoratorTest.java
new file mode 100755
index 0000000..eeb2102
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecoratorTest.java
@@ -0,0 +1,596 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+import static me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator.DEFAULT_DECELERATE_FACTOR;
+import static me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class VerticalOverScrollBounceEffectDecoratorTest {
+
+    View mView;
+    IOverScrollDecoratorAdapter mViewAdapter;
+    IOverScrollStateListener mStateListener;
+    IOverScrollUpdateListener mUpdateListener;
+
+    @Before
+    public void setUp() {
+        mView = mock(View.class);
+        mViewAdapter = mock(IOverScrollDecoratorAdapter.class);
+        when(mViewAdapter.getView()).thenReturn(mView);
+
+        mStateListener = mock(IOverScrollStateListener.class);
+        mUpdateListener = mock(IOverScrollUpdateListener.class);
+    }
+
+    @Test
+    public void detach_decoratorIsAttached_detachFromView() {
+
+        // Arrange
+
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter);
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    @Test
+    public void detach_overScrollInEffect_detachFromView() {
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, createShortDownwardsMoveEvent());
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    /*
+     * Move-action event
+     */
+
+    @Test
+    public void onTouchMoveAction_notInViewEnds_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut),anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragDownInUpperEnd_overscrollDownwards() {
+
+        // Arrange
+
+        MotionEvent event = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        float expectedTransY = (event.getY() - event.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragUpInBottomEnd_overscrollUpwards() {
+
+        // Arrange
+
+        MotionEvent event = createShortUpwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        float expectedTransY = (event.getY() - event.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragUpInUpperEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortUpwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragDownInBottomEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndDownDragInUpperEnd_overscrollDownwardsFurther() {
+
+        // Arrange
+
+        // Bring UUT to a downwards-overscroll state
+        MotionEvent event1 = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd downwards-drag event
+        MotionEvent event2 = createLongDownwardsMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransY1 = (event1.getY() - event1.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransY2 = (event2.getY() - event2.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY2);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndUpDragInBottomEnd_overscrollUpwardsFurther() {
+
+        // Arrange
+
+        // Bring UUT to an upwards-overscroll state
+        MotionEvent event1 = createShortUpwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd upward-drag event
+        MotionEvent event2 = createLongUpwardsMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransY1 = (event1.getY() - event1.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransY2 = (event2.getY() - event2.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY2);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (downwards in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragUpWhenDownOverscolled_continueOverscrollingUpwards() {
+
+        // Arrange
+
+        // In down & up drag tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a downwrads-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveRight = createLongDownwardsMoveEvent();
+        uut.onTouch(mView, eventMoveRight);
+        reset(mView);
+        float startTransY = (eventMoveRight.getY() - eventMoveRight.getHistoricalY(0)) / touchDragRatioFwd;
+        when(mView.getTranslationY()).thenReturn(startTransY);
+
+        // Create the up-drag event
+        MotionEvent eventMoveUpwards = createShortUpwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveUpwards);
+
+        // Assert
+
+        float expectedTransY = startTransY +
+                (eventMoveUpwards.getY() - eventMoveUpwards.getHistoricalY(0)) / touchDragRatioBck;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransY));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (upwards in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragDownWhenUpOverscolled_continueOverscrollingDownwards() {
+
+        // Arrange
+
+        // In up & down drag tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to an upwards-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveUp = createLongUpwardsMoveEvent();
+        uut.onTouch(mView, eventMoveUp);
+        reset(mView);
+
+        float startTransY = (eventMoveUp.getY() - eventMoveUp.getHistoricalY(0)) / touchDragRatioFwd;
+        when(mView.getTranslationY()).thenReturn(startTransY);
+
+        // Create the down-drag event
+        MotionEvent eventMoveDown = createShortDownwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveDown);
+
+        // Assert
+
+        float expectedTransY = startTransY + (eventMoveDown.getY() - eventMoveDown.getHistoricalY(0)) / touchDragRatioBck;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransY));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenDownOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a downwards-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveDown = createLongDownwardsMoveEvent();
+        uut.onTouch(mView, eventMoveDown);
+        reset(mView);
+        float startTransX = (eventMoveDown.getX() - eventMoveDown.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the (negative) upwards-drag event
+        MotionEvent eventMoveUp = createLongUpwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveUp);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView).setTranslationY(0);
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_START_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenUpOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a left-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveUp = createLongUpwardsMoveEvent();
+        uut.onTouch(mView, eventMoveUp);
+        reset(mView);
+        float startTransX = (eventMoveUp.getX() - eventMoveUp.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the (negative) downwards-drag event
+        MotionEvent eventMoveDown = createLongDownwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveDown);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView).setTranslationY(0);
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_END_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /*
+     * Up action event
+     */
+
+    @Test
+    public void onTouchUpAction_eventWhenNotOverscrolled_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createDefaultUpActionEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    protected MotionEvent createShortDownwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(200f);
+        when(event.getY()).thenReturn(100f);
+        when(event.getX(0)).thenReturn(200f);
+        when(event.getY(0)).thenReturn(100f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(190f);
+        when(event.getHistoricalY(eq(0))).thenReturn(80f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(190f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(80f);
+        return event;
+    }
+
+    protected MotionEvent createLongDownwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(250f);
+        when(event.getY()).thenReturn(150f);
+        when(event.getX(0)).thenReturn(250f);
+        when(event.getY(0)).thenReturn(150f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(200f);
+        when(event.getHistoricalY(eq(0))).thenReturn(100f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(200f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(100f);
+        return event;
+    }
+
+    protected MotionEvent createShortUpwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(200f);
+        when(event.getY()).thenReturn(100f);
+        when(event.getX(0)).thenReturn(200f);
+        when(event.getY(0)).thenReturn(100f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(220f);
+        when(event.getHistoricalY(eq(0))).thenReturn(120f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(220f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(120f);
+        return event;
+    }
+
+    protected MotionEvent createLongUpwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(200f);
+        when(event.getY()).thenReturn(100f);
+        when(event.getX(0)).thenReturn(200f);
+        when(event.getY(0)).thenReturn(100f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(250f);
+        when(event.getHistoricalY(eq(0))).thenReturn(150f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(250f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(150f);
+        return event;
+    }
+
+    protected MotionEvent createDefaultUpActionEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_UP);
+        return event;
+    }
+
+    protected VerticalOverScrollBounceEffectDecorator getUUT() {
+        VerticalOverScrollBounceEffectDecorator uut = new VerticalOverScrollBounceEffectDecorator(mViewAdapter);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+
+    protected VerticalOverScrollBounceEffectDecorator getUUT(float touchDragRatioFwd, float touchDragRatioBck) {
+        VerticalOverScrollBounceEffectDecorator uut = new VerticalOverScrollBounceEffectDecorator(mViewAdapter, touchDragRatioFwd, touchDragRatioBck, DEFAULT_DECELERATE_FACTOR);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+}
\ No newline at end of file
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/recyclerview_demo.gif b/OnTime_Merchant_live/lib/overscroll-decor/recyclerview_demo.gif
new file mode 100755
index 0000000..3610e9d
Binary files /dev/null and b/OnTime_Merchant_live/lib/overscroll-decor/recyclerview_demo.gif differ
diff --git a/OnTime_Merchant_live/lib/overscroll-decor/settings.gradle b/OnTime_Merchant_live/lib/overscroll-decor/settings.gradle
new file mode 100755
index 0000000..cddea94
--- /dev/null
+++ b/OnTime_Merchant_live/lib/overscroll-decor/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':liboverscroll'
diff --git a/OnTime_Merchant_live/settings.gradle b/OnTime_Merchant_live/settings.gradle
old mode 100644
new mode 100755
index 636a244..655952c
--- a/OnTime_Merchant_live/settings.gradle
+++ b/OnTime_Merchant_live/settings.gradle
@@ -1,13 +1,13 @@
 include ':app'
 
-// Local lib modules (prefer Maven Central where available; these are not on Maven Central or need local build)
+// Local lib modules (in this app's lib/ folder)
 include ':rating-view'
-project(':rating-view').projectDir = new File(settingsDir, '../lib/RatingView/rating-view')
+project(':rating-view').projectDir = new File(settingsDir, 'lib/RatingView/rating-view')
 include ':liboverscroll'
-project(':liboverscroll').projectDir = new File(settingsDir, '../lib/overscroll-decor/liboverscroll')
+project(':liboverscroll').projectDir = new File(settingsDir, 'lib/overscroll-decor/liboverscroll')
 include ':prdownloader'
-project(':prdownloader').projectDir = new File(settingsDir, '../lib/PRDownloader/prdownloader')
+project(':prdownloader').projectDir = new File(settingsDir, 'lib/PRDownloader/prdownloader')
 include ':textdrawable'
-project(':textdrawable').projectDir = new File(settingsDir, '../lib/TextDrawable/library')
+project(':textdrawable').projectDir = new File(settingsDir, 'lib/TextDrawable/library')
 include ':fragmentanimations'
-project(':fragmentanimations').projectDir = new File(settingsDir, '../lib/FragmentAnimations/fragmentanimations')
+project(':fragmentanimations').projectDir = new File(settingsDir, 'lib/FragmentAnimations/fragmentanimations')
diff --git a/OnTime_User_live/.gitignore b/OnTime_User_live/.gitignore
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/.gitignore b/OnTime_User_live/app/.gitignore
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/build.gradle b/OnTime_User_live/app/build.gradle
old mode 100644
new mode 100755
index 827dc41..64e47c3
--- a/OnTime_User_live/app/build.gradle
+++ b/OnTime_User_live/app/build.gradle
@@ -14,12 +14,12 @@ android {
             keyPassword '123456@ontime'
         }
     }
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "id.ontime.customer"
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdkVersion 23
+        targetSdkVersion 34
         versionCode 10
         versionName '1.1.0'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -60,12 +60,12 @@ dependencies {
     implementation 'com.google.android.libraries.places:places:2.5.0'
     implementation 'com.google.android.gms:play-services-maps:18.0.2'
     implementation 'com.google.android.gms:play-services-auth:20.1.0'
-    implementation 'com.google.firebase:firebase-database:20.0.3'
-    implementation 'com.google.firebase:firebase-storage:20.0.0'
-    implementation 'com.google.firebase:firebase-core:20.1.0'
-    implementation 'com.google.firebase:firebase-messaging:20.2.0'
-    implementation 'com.google.firebase:firebase-auth:19.3.1'
-    implementation 'com.google.firebase:firebase-appcheck-playintegrity:16.1.0'
+    implementation platform('com.google.firebase:firebase-bom:33.1.0')
+    implementation 'com.google.firebase:firebase-database'
+    implementation 'com.google.firebase:firebase-storage'
+    implementation 'com.google.firebase:firebase-messaging'
+    implementation 'com.google.firebase:firebase-auth'
+    implementation 'com.google.firebase:firebase-appcheck-playintegrity'
     implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
diff --git a/OnTime_User_live/app/butterknife-proguard-rules.pro b/OnTime_User_live/app/butterknife-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/google-services.json.old b/OnTime_User_live/app/google-services.json.old
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/guava-proguard-rules.pro b/OnTime_User_live/app/guava-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/okhttp3-proguard-rules.pro b/OnTime_User_live/app/okhttp3-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/proguard-rules.pro b/OnTime_User_live/app/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/release/output-metadata.json b/OnTime_User_live/app/release/output-metadata.json
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/retrofit-proguard-rules.pro b/OnTime_User_live/app/retrofit-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/saripaar-proguard-rules.pro b/OnTime_User_live/app/saripaar-proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/sharuser.txt b/OnTime_User_live/app/sharuser.txt
new file mode 100644
index 0000000..a0d02f6
--- /dev/null
+++ b/OnTime_User_live/app/sharuser.txt
@@ -0,0 +1,26 @@
+Alias name: ontimekeystore
+Creation date: Oct 26, 2022
+Entry type: PrivateKeyEntry
+Certificate chain length: 1
+Certificate[1]:
+Owner: CN=Ontime Apps
+Issuer: CN=Ontime Apps
+Serial number: 39fdbb23
+Valid from: Wed Oct 26 11:27:28 WIB 2022 until: Thu Oct 13 11:27:28 WIB 2072
+Certificate fingerprints:
+	 SHA1: DC:13:DA:DC:9F:5F:A8:AD:3A:6C:F7:1C:5C:94:55:BB:AD:2E:F6:10
+	 SHA256: 73:17:40:D3:E1:63:4A:2E:AB:C1:BA:0A:65:BD:A4:77:A2:FB:CC:F5:46:C1:87:3D:AE:6D:87:4B:94:5C:2B:66
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+
+Extensions: 
+
+#1: ObjectId: 2.5.29.14 Criticality=false
+SubjectKeyIdentifier [
+KeyIdentifier [
+0000: 04 8E EC F7 50 72 86 16   C2 AF 1C 2B A9 B4 63 47  ....Pr.....+..cG
+0010: 71 55 24 44                                        qU$D
+]
+]
+
diff --git a/OnTime_User_live/app/src/main/AndroidManifest.xml b/OnTime_User_live/app/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
index 718ec87..e97e936
--- a/OnTime_User_live/app/src/main/AndroidManifest.xml
+++ b/OnTime_User_live/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="id.ontime.customer"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/OnTime_User_live/app/src/main/assets/fonts/Montserrat_Bold.ttf b/OnTime_User_live/app/src/main/assets/fonts/Montserrat_Bold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/assets/fonts/Montserrat_Medium.ttf b/OnTime_User_live/app/src/main/assets/fonts/Montserrat_Medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/assets/fonts/Montserrat_Regular.ttf b/OnTime_User_live/app/src/main/assets/fonts/Montserrat_Regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/assets/fonts/Montserrat_SemiBold.ttf b/OnTime_User_live/app/src/main/assets/fonts/Montserrat_SemiBold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/assets/fonts/NeoSansPro_Medium.ttf b/OnTime_User_live/app/src/main/assets/fonts/NeoSansPro_Medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/assets/fonts/NeoSans_Pro_Regular.ttf b/OnTime_User_live/app/src/main/assets/fonts/NeoSans_Pro_Regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/assets/fonts/OpenSans-Bold.ttf b/OnTime_User_live/app/src/main/assets/fonts/OpenSans-Bold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/assets/fonts/OpenSans-Light.ttf b/OnTime_User_live/app/src/main/assets/fonts/OpenSans-Light.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/assets/fonts/OpenSans-Regular.ttf b/OnTime_User_live/app/src/main/assets/fonts/OpenSans-Regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/assets/fonts/ride_rewrite_bungee.ttf b/OnTime_User_live/app/src/main/assets/fonts/ride_rewrite_bungee.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/ic_launcher-playstore.png b/OnTime_User_live/app/src/main/ic_launcher-playstore.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/customfonts/AutoCompleteTextViewSFProDisplayRegular.java b/OnTime_User_live/app/src/main/java/customfonts/AutoCompleteTextViewSFProDisplayRegular.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/customfonts/Button_SF_Pro_Display_Medium.java b/OnTime_User_live/app/src/main/java/customfonts/Button_SF_Pro_Display_Medium.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/customfonts/EditTextSFProDisplayMedium.java b/OnTime_User_live/app/src/main/java/customfonts/EditTextSFProDisplayMedium.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/customfonts/EditTextSFProDisplayRegular.java b/OnTime_User_live/app/src/main/java/customfonts/EditTextSFProDisplayRegular.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/customfonts/RadioButton_SF_Pro_Display_Medium.java b/OnTime_User_live/app/src/main/java/customfonts/RadioButton_SF_Pro_Display_Medium.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/customfonts/TextViewSFProDisplayMedium.java b/OnTime_User_live/app/src/main/java/customfonts/TextViewSFProDisplayMedium.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/customfonts/TextViewSFProDisplayRegular.java b/OnTime_User_live/app/src/main/java/customfonts/TextViewSFProDisplayRegular.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/AllBeritaActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/AllBeritaActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/AllMerchantActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/AllMerchantActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/BeritaDetailActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/BeritaDetailActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ChangepassActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ChangepassActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ChatActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ChatActivity.java
old mode 100644
new mode 100755
index 6409bee..5083329
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ChatActivity.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ChatActivity.java
@@ -660,7 +660,7 @@ public class ChatActivity extends AppCompatActivity {
                         chat.tokendriver = tokendriver;
                         chat.tokenuser = tokenku;
                         chat.message = message;
-                        sendMessageToDriver(tokenku, chat);
+                        sendMessageToDriver(tokendriver, chat);
                     }
                 });
             }
@@ -781,7 +781,7 @@ public class ChatActivity extends AppCompatActivity {
                                         chat.tokendriver = tokendriver;
                                         chat.tokenuser = tokenku;
                                         chat.message = "Send Image.......";
-                                        sendMessageToDriver(tokenku, chat);
+                                        sendMessageToDriver(tokendriver, chat);
 
 
                                     }
@@ -1372,7 +1372,10 @@ public class ChatActivity extends AppCompatActivity {
     }
 
     private void sendMessageToDriver(final String regIDTujuan, final Chat chat) {
-
+        // Only use Firebase service when target token is ready (as in test).
+        if (regIDTujuan == null || regIDTujuan.trim().isEmpty()) {
+            return;
+        }
         final FCMMessage message = new FCMMessage();
         message.setTo(regIDTujuan);
         message.setData(chat);
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/Config.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/Config.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ConfirmWAActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ConfirmWAActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/DetailMerchantActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/DetailMerchantActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/DetailOrderActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/DetailOrderActivity.java
old mode 100644
new mode 100755
index 850d5f8..1b3d60b
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/DetailOrderActivity.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/DetailOrderActivity.java
@@ -1,874 +1,876 @@
-package id.ontime.customer.activity;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.util.Log;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import id.ontime.customer.R;
-import id.ontime.customer.constants.BaseApp;
-import id.ontime.customer.constants.Constants;
-import id.ontime.customer.item.ItemItem;
-import id.ontime.customer.json.CheckStatusTransaksiRequest;
-import id.ontime.customer.json.CheckStatusTransaksiResponse;
-import id.ontime.customer.json.GetNearRideCarRequestJson;
-import id.ontime.customer.json.GetNearRideCarResponseJson;
-import id.ontime.customer.json.ItemRequestJson;
-import id.ontime.customer.json.PromoRequestJson;
-import id.ontime.customer.json.PromoResponseJson;
-import id.ontime.customer.json.RideCarResponseJson;
-import id.ontime.customer.json.fcm.DriverRequest;
-import id.ontime.customer.json.fcm.DriverResponse;
-import id.ontime.customer.json.fcm.FCMMessage;
-import id.ontime.customer.models.DriverModel;
-import id.ontime.customer.models.FiturModel;
-import id.ontime.customer.models.ItemModel;
-import id.ontime.customer.models.PesananMerchant;
-import id.ontime.customer.models.TransaksiModel;
-import id.ontime.customer.models.User;
-import id.ontime.customer.utils.SettingPreference;
-import id.ontime.customer.utils.Utility;
-import id.ontime.customer.utils.api.FCMHelper;
-import id.ontime.customer.utils.api.MapDirectionAPI;
-import id.ontime.customer.utils.api.ServiceGenerator;
-import id.ontime.customer.utils.api.service.BookService;
-import id.ontime.customer.utils.api.service.UserService;
-import com.google.android.gms.maps.model.LatLng;
-import com.mikepenz.fastadapter.FastAdapter;
-import com.mikepenz.fastadapter.adapters.FastItemAdapter;
-import com.mikepenz.fastadapter.listeners.ClickEventHook;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-
-import io.realm.Realm;
-import io.realm.RealmResults;
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-import static id.ontime.customer.json.fcm.FCMType.ORDER;
-
-public class DetailOrderActivity extends AppCompatActivity implements ItemItem.OnCalculatePrice {
-
-    public static final String FITUR_KEY = "FiturKey";
-    private final int DESTINATION_ID = 1;
-    TextView location, orderprice, deliveryfee, diskon, total, diskontext, topuptext, textnotif, saldotext;
-    Button order;
-    RecyclerView rvmerchantnear;
-    LinearLayout llcheckedcash, llcheckedwallet, llbtn;
-    ImageButton checkedcash, checkedwallet;
-    RelativeLayout rlprogress;
-    Thread thread;
-    boolean threadRun = true;
-    TransaksiModel transaksi;
-    TextView cashpayment, walletpayment;
-    String alamat, biayaminimum, getbiaya, biayaakhir, biayadistance;
-    double lat, lon, merlat, merlon, distance;
-    ImageView backbtn;
-    int fitur;
-    SettingPreference sp;
-    RelativeLayout rlnotif;
-    EditText promokode;
-    String home, layanan, keterangan, icon;
-    Button btnpromo;
-    double km;
-    private DriverRequest request;
-    private double jarak;
-    private long harga, promocode;
-    private FiturModel designedFitur;
-    private LatLng pickUpLatLang;
-    private LatLng destinationLatLang;
-    private FastItemAdapter<ItemItem> itemAdapter;
-    private Realm realm;
-    private List<DriverModel> driverAvailable;
-    private long foodCostLong = 0, maksimum;
-    private long deliveryCostLong = 0;
-    private String saldoWallet, checkedpaywallet, checkedpaycash, idresto, alamatresto, namamerchant, back;
-    private okhttp3.Callback updateRouteCallback = new okhttp3.Callback() {
-        @Override
-        public void onFailure(@NonNull okhttp3.Call call, @NonNull IOException e) {
-            DetailOrderActivity.this.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    rlprogress.setVisibility(View.GONE);
-                    notif("Kesalahan koneksi, pilih lokasi lagi.");
-                }
-            });
-        }
-
-        @Override
-        public void onResponse(@NonNull okhttp3.Call call, okhttp3.Response response) throws IOException {
-            if (response.isSuccessful()) {
-                final String json = Objects.requireNonNull(response.body()).string();
-                final String errorMsg = MapDirectionAPI.getDirectionErrorMessage(json);
-                if (errorMsg != null) {
-                    DetailOrderActivity.this.runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            rlprogress.setVisibility(View.GONE);
-                            notif(errorMsg);
-                        }
-                    });
-                    return;
-                }
-                final long distancetext = MapDirectionAPI.getDistance(DetailOrderActivity.this, json);
-                if (distancetext >= 0) {
-                    DetailOrderActivity.this.runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            String format = String.format(Locale.US, "%.0f", ((float) (distancetext)) / 1000f);
-                            long dist = Long.parseLong(format);
-                            promocode = 0;
-                            promokode.setText("");
-                            distance = ((float) (distancetext)) / 1000f;
-                            updateDistance();
-                            if (dist < maksimum) {
-                                order.setOnClickListener(new View.OnClickListener() {
-                                    @Override
-                                    public void onClick(View v) {
-                                        if (readyToOrder()) {
-                                            sendOrder();
-                                            back = "1";
-                                        }
-                                    }
-                                });
-                            } else {
-                                notif("Tujuan terlalu jauh!");
-                                order.setOnClickListener(new View.OnClickListener() {
-                                    @Override
-                                    public void onClick(View v) {
-                                        if (readyToOrder()) {
-                                            notif("Tujuan terlalu jauh!");
-                                            back = "0";
-                                        }
-                                    }
-                                });
-
-                            }
-
-                        }
-                    });
-                } else {
-                    DetailOrderActivity.this.runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            rlprogress.setVisibility(View.GONE);
-                            notif("Gagal memuat rute, pilih lokasi lagi.");
-                        }
-                    });
-                }
-            } else {
-                DetailOrderActivity.this.runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        rlprogress.setVisibility(View.GONE);
-                        notif("Gagal memuat rute, coba lagi.");
-                    }
-                });
-            }
-        }
-    };
-
-    @SuppressLint("SetTextI18n")
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_detail_order);
-        promocode = 0;
-        realm = Realm.getDefaultInstance();
-        rvmerchantnear = findViewById(R.id.merchantnear);
-        location = findViewById(R.id.pickUpText);
-        orderprice = findViewById(R.id.orderprice);
-        llcheckedcash = findViewById(R.id.llcheckedcash);
-        llcheckedwallet = findViewById(R.id.llcheckedwallet);
-        cashpayment = findViewById(R.id.cashPayment);
-        walletpayment = findViewById(R.id.walletpayment);
-        deliveryfee = findViewById(R.id.cost);
-        checkedcash = findViewById(R.id.checkedcash);
-        checkedwallet = findViewById(R.id.checkedwallet);
-        total = findViewById(R.id.price);
-        diskon = findViewById(R.id.diskon);
-        backbtn = findViewById(R.id.back_btn);
-        diskontext = findViewById(R.id.ketsaldo);
-        topuptext = findViewById(R.id.topUp);
-        order = findViewById(R.id.order);
-        rlprogress = findViewById(R.id.rlprogress);
-        textnotif = findViewById(R.id.textnotif);
-        rlnotif = findViewById(R.id.rlnotif);
-        saldotext = findViewById(R.id.saldo);
-        promokode = findViewById(R.id.promocode);
-        btnpromo = findViewById(R.id.btnpromo);
-        back = "0";
-        llbtn = findViewById(R.id.llbtn);
-
-        driverAvailable = new ArrayList<>();
-        fitur = 0;
-        topuptext.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(getApplicationContext(), TopupSaldoActivity.class));
-            }
-        });
-
-        location.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(DetailOrderActivity.this, PicklocationActivity.class);
-                intent.putExtra(PicklocationActivity.FORM_VIEW_INDICATOR, DESTINATION_ID);
-                startActivityForResult(intent, PicklocationActivity.LOCATION_PICKER_ID);
-            }
-        });
-
-        backbtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        });
-
-        sp = new SettingPreference(this);
-        Intent intent = getIntent();
-        lat = intent.getDoubleExtra("lat", 0);
-        lon = intent.getDoubleExtra("lon", 0);
-        merlat = intent.getDoubleExtra("merlat", 0);
-        merlon = intent.getDoubleExtra("merlon", 0);
-        distance = intent.getDoubleExtra("distance", 0);
-        alamatresto = intent.getStringExtra("alamatresto");
-        idresto = intent.getStringExtra("idresto");
-        alamat = intent.getStringExtra("alamat");
-        namamerchant = intent.getStringExtra("namamerchant");
-        fitur = intent.getIntExtra(FITUR_KEY, -1);
-        if (fitur != -1)
-            designedFitur = realm.where(FiturModel.class).equalTo("idFitur", fitur).findFirst();
-        home = Objects.requireNonNull(designedFitur).getHome();
-        layanan = designedFitur.getFitur();
-        keterangan = designedFitur.getKeterangan();
-        icon = designedFitur.getIcon();
-
-        RealmResults<FiturModel> fiturs = realm.where(FiturModel.class).findAll();
-
-        for (FiturModel fitur : fiturs) {
-            Log.e("ID_FITUR", fitur.getIdFitur() + " " + fitur.getFitur() + " " + fitur.getBiayaAkhir());
-        }
-        getbiaya = String.valueOf(designedFitur.getBiaya());
-        biayaminimum = String.valueOf(designedFitur.getBiaya_minimum());
-        biayaakhir = String.valueOf(designedFitur.getBiayaAkhir());
-        maksimum = Long.parseLong(designedFitur.getMaksimumdist());
-
-        diskontext.setText("Diskon " + designedFitur.getDiskon() + " pakai koin");
-        total.setText("wait");
-        deliveryfee.setText("wait");
-        Utility.currencyTXT(diskon, String.valueOf(promocode), DetailOrderActivity.this);
-        User userLogin = BaseApp.getInstance(this).getLoginUser();
-        saldoWallet = String.valueOf(userLogin.getWalletSaldo());
-
-        pickUpLatLang = new LatLng(merlat, merlon);
-        destinationLatLang = new LatLng(lat, lon);
-        location.setText(alamat);
-
-        btnpromo.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-                    InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
-                    Objects.requireNonNull(imm).hideSoftInputFromWindow(Objects.requireNonNull(getCurrentFocus()).getWindowToken(), 0);
-                } catch (Exception ignored) {
-
-                }
-                if (promokode.getText().toString().isEmpty()) {
-                    notif("Kode promo tidak boleh kosong!");
-                } else {
-                    promokodedata();
-                }
-            }
-        });
-
-        itemAdapter = new FastItemAdapter<>();
-        itemAdapter.notifyDataSetChanged();
-        itemAdapter.withSelectable(true);
-        itemAdapter.withItemEvent(new ClickEventHook<ItemItem>() {
-            @Nullable
-            @Override
-            public View onBind(@NonNull RecyclerView.ViewHolder viewHolder) {
-                if (viewHolder instanceof ItemItem.ViewHolder) {
-                    return ((ItemItem.ViewHolder) viewHolder).itemView;
-                }
-                return null;
-            }
-
-            @Override
-            public void onClick(View v, int position, FastAdapter<ItemItem> fastAdapter, ItemItem item) {
-                //sheetlist(position);
-            }
-        });
-        rvmerchantnear.setLayoutManager(new LinearLayoutManager(this));
-        rvmerchantnear.setAdapter(itemAdapter);
-        updateEstimatedItemCost();
-        loadItem();
-    }
-
-    public void notif(String text) {
-        rlnotif.setVisibility(View.VISIBLE);
-        textnotif.setText(text);
-
-        new Handler().postDelayed(new Runnable() {
-            public void run() {
-                rlnotif.setVisibility(View.GONE);
-            }
-        }, 3000);
-    }
-
-    private boolean readyToOrder() {
-        if (destinationLatLang == null) {
-            Toast.makeText(this, "Silahkan pilih lokasi kamu.", Toast.LENGTH_SHORT).show();
-            return false;
-        } else if (total.getText().toString().isEmpty() || total.getText().toString().equals("wait")) {
-            Toast.makeText(this, "Mohon tunggu...", Toast.LENGTH_SHORT).show();
-            return false;
-        }
-
-        List<PesananMerchant> existingFood = realm.copyFromRealm(realm.where(PesananMerchant.class).findAll());
-
-        int quantity = 0;
-        for (int p = 0; p < existingFood.size(); p++) {
-            quantity += existingFood.get(p).getQty();
-        }
-
-        if (quantity == 0) {
-            Toast.makeText(this, "Harap pesan minimal 1 item.", Toast.LENGTH_SHORT).show();
-            return false;
-        }
-
-        if (jarak == -99.0) {
-            Toast.makeText(this, "Tolong tunggu sebentar...", Toast.LENGTH_SHORT).show();
-        }
-
-        return true;
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == PicklocationActivity.LOCATION_PICKER_ID) {
-            if (resultCode == Activity.RESULT_OK) {
-                String addressset = data.getStringExtra(PicklocationActivity.LOCATION_NAME);
-                LatLng latLng = data.getParcelableExtra(PicklocationActivity.LOCATION_LATLNG);
-                location.setText(addressset);
-                destinationLatLang = new LatLng(Objects.requireNonNull(latLng).latitude, latLng.longitude);
-                if (pickUpLatLang != null) {
-                    MapDirectionAPI.getDirection(DetailOrderActivity.this, pickUpLatLang, destinationLatLang).enqueue(updateRouteCallback);
-                }
-            }
-        }
-    }
-
-    private void loadItem() {
-        List<ItemModel> makananList = realm.copyFromRealm(realm.where(ItemModel.class).findAll());
-        List<PesananMerchant> pesananFoods = realm.copyFromRealm(realm.where(PesananMerchant.class).findAll());
-        itemAdapter.clear();
-        for (PesananMerchant pesanan : pesananFoods) {
-            ItemItem makananItem = new ItemItem(this, this);
-            for (ItemModel makanan : makananList) {
-                if (makanan.getId_item() == pesanan.getIdItem()) {
-                    makananItem.quantity = pesanan.getQty();
-                    makananItem.id = makanan.getId_item();
-                    makananItem.namaMenu = makanan.getNama_item();
-                    makananItem.deskripsiMenu = makanan.getDeskripsi_item();
-                    makananItem.foto = makanan.getFoto_item();
-                    makananItem.harga = Long.parseLong(makanan.getHarga_item());
-                    makananItem.promo = makanan.getStatus_promo();
-                    if (makanan.getHarga_promo().isEmpty()) {
-                        makananItem.hargapromo = 0;
-                    } else {
-                        makananItem.hargapromo = Long.parseLong(makanan.getHarga_promo());
-                    }
-                    makananItem.catatan = pesanan.getCatatan();
-
-                    break;
-                }
-            }
-
-            itemAdapter.add(makananItem);
-        }
-
-        itemAdapter.notifyDataSetChanged();
-    }
-
-    @SuppressLint("SetTextI18n")
-    private void promokodedata() {
-        btnpromo.setEnabled(false);
-        btnpromo.setText("tunggu...");
-        final User user = BaseApp.getInstance(this).getLoginUser();
-        PromoRequestJson request = new PromoRequestJson();
-        request.setFitur(String.valueOf(fitur));
-        request.setCode(promokode.getText().toString());
-
-        UserService service = ServiceGenerator.createService(UserService.class, user.getNoTelepon(), user.getPassword());
-        service.promocode(request).enqueue(new Callback<PromoResponseJson>() {
-            @Override
-            public void onResponse(@NonNull Call<PromoResponseJson> call, @NonNull Response<PromoResponseJson> response) {
-                if (response.isSuccessful()) {
-                    if (Objects.requireNonNull(response.body()).getMessage().equalsIgnoreCase("success")) {
-                        final long finalBiayaTotalpay = foodCostLong + harga;
-                        btnpromo.setEnabled(true);
-                        btnpromo.setText("Use");
-                        if (response.body().getType().equals("persen")) {
-                            promocode = (Long.parseLong(response.body().getNominal()) * finalBiayaTotalpay) / 100;
-                        } else {
-                            promocode = Long.parseLong(response.body().getNominal());
-                        }
-                        updateDistance();
-                    } else {
-                        notif("Kode promo tidak berlaku!");
-                        btnpromo.setEnabled(true);
-                        btnpromo.setText("Use");
-                        promocode = 0;
-                        updateDistance();
-                    }
-                } else {
-                    notif("error!");
-                }
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<PromoResponseJson> call, @NonNull Throwable t) {
-                t.printStackTrace();
-                notif("error");
-            }
-        });
-    }
-
-    @Override
-    public void calculatePrice() {
-        updateEstimatedItemCost();
-    }
-
-    private void updateEstimatedItemCost() {
-        List<PesananMerchant> existingFood = realm.copyFromRealm(realm.where(PesananMerchant.class).findAll());
-        long cost = 0;
-        for (int p = 0; p < existingFood.size(); p++) {
-            cost += existingFood.get(p).getTotalHarga();
-        }
-        foodCostLong = cost;
-        Utility.currencyTXT(orderprice, String.valueOf(foodCostLong), this);
-        MapDirectionAPI.getDirection(DetailOrderActivity.this, pickUpLatLang, destinationLatLang).enqueue(updateRouteCallback);
-    }
-
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        if (back.equals("1")) {
-            Intent intent = new Intent(DetailOrderActivity.this, MainActivity.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            startActivity(intent);
-            finish();
-        } else {
-            finish();
-        }
-    }
-
-    private void updateDistance() {
-
-        checkedpaycash = "1";
-        checkedpaywallet = "0";
-        Log.e("CHECKEDWALLET", checkedpaywallet);
-        checkedcash.setSelected(true);
-        checkedwallet.setSelected(false);
-        cashpayment.setTextColor(getResources().getColor(R.color.colorgradient));
-        walletpayment.setTextColor(getResources().getColor(R.color.gray));
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            checkedcash.setBackgroundTintList(getResources().getColorStateList(R.color.colorgradient));
-            checkedwallet.setBackgroundTintList(getResources().getColorStateList(R.color.gray));
-        }
-        km = distance;
-
-
-        this.jarak = km;
-
-        String biaya = String.valueOf(biayaminimum);
-        long biayaTotal = (long) (Double.parseDouble(getbiaya) * km);
-        if (biayaTotal < Double.parseDouble(biayaminimum)) {
-            this.harga = Long.parseLong(biayaminimum);
-            biayaTotal = Long.parseLong(biayaminimum);
-            biayadistance = biaya;
-        } else {
-            biayadistance = getbiaya;
-        }
-        this.harga = biayaTotal;
-
-        deliveryCostLong = biayaTotal;
-        Log.e("distance", String.valueOf(deliveryCostLong));
-
-        Utility.currencyTXT(deliveryfee, String.valueOf(deliveryCostLong), this);
-        final long finalBiayaTotalpay = foodCostLong + harga;
-
-        Utility.currencyTXT(total, String.valueOf(finalBiayaTotalpay - promocode), DetailOrderActivity.this);
-        Utility.currencyTXT(diskon, String.valueOf(promocode), DetailOrderActivity.this);
-        long saldokini = Long.parseLong(saldoWallet);
-        if (saldokini < ((foodCostLong + harga) - (finalBiayaTotalpay * Double.parseDouble(biayaakhir)))) {
-            llcheckedcash.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    Utility.currencyTXT(total, String.valueOf(finalBiayaTotalpay - promocode), DetailOrderActivity.this);
-                    Utility.currencyTXT(diskon, String.valueOf(promocode), DetailOrderActivity.this);
-                    checkedcash.setSelected(true);
-                    checkedwallet.setSelected(false);
-                    checkedpaycash = "1";
-                    checkedpaywallet = "0";
-                    Log.e("CHECKEDWALLET", checkedpaywallet);
-                    cashpayment.setTextColor(getResources().getColor(R.color.colorgradient));
-                    walletpayment.setTextColor(getResources().getColor(R.color.gray));
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        checkedcash.setBackgroundTintList(getResources().getColorStateList(R.color.colorgradient));
-                        checkedwallet.setBackgroundTintList(getResources().getColorStateList(R.color.gray));
-                    }
-                }
-            });
-            llcheckedwallet.setEnabled(false);
-        } else {
-            llcheckedwallet.setEnabled(true);
-            llcheckedcash.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    Utility.currencyTXT(total, String.valueOf(finalBiayaTotalpay - promocode), DetailOrderActivity.this);
-                    Utility.currencyTXT(diskon, String.valueOf(promocode), DetailOrderActivity.this);
-                    checkedcash.setSelected(true);
-                    checkedwallet.setSelected(false);
-                    checkedpaycash = "1";
-                    checkedpaywallet = "0";
-                    Log.e("CHECKEDWALLET", checkedpaywallet);
-                    cashpayment.setTextColor(getResources().getColor(R.color.colorgradient));
-                    walletpayment.setTextColor(getResources().getColor(R.color.gray));
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        checkedcash.setBackgroundTintList(getResources().getColorStateList(R.color.colorgradient));
-                        checkedwallet.setBackgroundTintList(getResources().getColorStateList(R.color.gray));
-                    }
-                }
-            });
-
-            llcheckedwallet.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    long diskonwallet = (long) ((finalBiayaTotalpay * Double.parseDouble(biayaakhir)) + promocode);
-                    Log.e("distance", String.valueOf((foodCostLong + harga) - (finalBiayaTotalpay * Double.parseDouble(biayaakhir))));
-                    String totalwallet = String.valueOf(diskonwallet);
-                    Utility.currencyTXT(diskon, totalwallet, DetailOrderActivity.this);
-                    Utility.currencyTXT(total, String.valueOf(finalBiayaTotalpay - diskonwallet), DetailOrderActivity.this);
-                    checkedcash.setSelected(false);
-                    checkedwallet.setSelected(true);
-                    checkedpaycash = "0";
-                    checkedpaywallet = "1";
-                    Log.e("CHECKEDWALLET", checkedpaywallet);
-                    walletpayment.setTextColor(getResources().getColor(R.color.colorgradient));
-                    cashpayment.setTextColor(getResources().getColor(R.color.gray));
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                        checkedwallet.setBackgroundTintList(getResources().getColorStateList(R.color.colorgradient));
-                        checkedcash.setBackgroundTintList(getResources().getColorStateList(R.color.gray));
-                    }
-                }
-            });
-        }
-    }
-
-    private void sendOrder() {
-        List<PesananMerchant> existingItem = realm.copyFromRealm(realm.where(PesananMerchant.class).findAll());
-
-        for (PesananMerchant pesanan : existingItem) {
-            if (pesanan.getCatatan() == null || pesanan.getCatatan().trim().equals(""))
-                pesanan.setCatatan("");
-        }
-
-        ItemRequestJson param = new ItemRequestJson();
-        User userLogin = BaseApp.getInstance(this).getLoginUser();
-        param.setIdPelanggan(userLogin.getId());
-        param.setOrderFitur(String.valueOf(fitur));
-        param.setStartLatitude(destinationLatLang.latitude);
-        param.setStartLongitude(destinationLatLang.longitude);
-        param.setEndLatitude(merlat);
-        param.setEndLongitude(merlon);
-        param.setAlamatTujuan(location.getText().toString());
-        param.setAlamatAsal(alamatresto);
-        param.setJarak(jarak);
-        param.setEstimasi(String.valueOf(distance));
-        param.setHarga(deliveryCostLong);
-        if (checkedpaycash.equals("1")) {
-            param.setPakaiWallet(0);
-            param.setKreditpromo(String.valueOf(promocode));
-        } else {
-            param.setPakaiWallet(1);
-            param.setKreditpromo(diskon.getText().toString().replace(".", "").replace(sp.getSetting()[0], ""));
-        }
-        param.setIdResto(idresto);
-        param.setTotalBiayaBelanja(foodCostLong);
-        param.setCatatan("");
-        param.setPesanan(existingItem);
-
-        Log.e("Bookingdata", ServiceGenerator.gson.toJson(param));
-
-        fetchNearDriver(param);
-    }
-
-    private void fetchNearDriver(final ItemRequestJson paramdata) {
-        rlprogress.setVisibility(View.VISIBLE);
-        if (destinationLatLang != null) {
-            User loginUser = BaseApp.getInstance(this).getLoginUser();
-
-            BookService service = ServiceGenerator.createService(BookService.class, loginUser.getEmail(), loginUser.getPassword());
-            GetNearRideCarRequestJson param = new GetNearRideCarRequestJson();
-            param.setLatitude(merlat);
-            param.setLongitude(merlon);
-            param.setFitur(String.valueOf(fitur));
-
-            service.getNearRide(param).enqueue(new Callback<GetNearRideCarResponseJson>() {
-                @Override
-                public void onResponse(@NonNull Call<GetNearRideCarResponseJson> call, @NonNull Response<GetNearRideCarResponseJson> response) {
-                    if (response.isSuccessful()) {
-                        driverAvailable = Objects.requireNonNull(response.body()).getData();
-                        if (driverAvailable.isEmpty()) {
-                            finish();
-                            Toast.makeText(DetailOrderActivity.this, "tidak ada pengemudi di sekitar Anda!", Toast.LENGTH_SHORT).show();
-                        } else {
-                            sendRequestTransaksi(paramdata, driverAvailable);
-                        }
-                    }
-                }
-
-                @Override
-                public void onFailure(@NonNull retrofit2.Call<GetNearRideCarResponseJson> call, @NonNull Throwable t) {
-
-                }
-            });
-
-        }
-    }
-
-    private void buildDriverRequest(RideCarResponseJson response) {
-        transaksi = response.getData().get(0);
-        Log.e("wallet", String.valueOf(transaksi.isPakaiWallet()));
-        User loginUser = BaseApp.getInstance(this).getLoginUser();
-        if (request == null) {
-            request = new DriverRequest();
-            request.setIdTransaksi(transaksi.getId());
-            request.setIdPelanggan(transaksi.getIdPelanggan());
-            request.setRegIdPelanggan(loginUser.getToken());
-            request.setOrderFitur(home);
-            request.setStartLatitude(transaksi.getStartLatitude());
-            request.setStartLongitude(transaksi.getStartLongitude());
-            request.setEndLatitude(transaksi.getEndLatitude());
-            request.setEndLongitude(transaksi.getEndLongitude());
-            request.setJarak(transaksi.getJarak());
-            request.setHarga(transaksi.getHarga() + foodCostLong);
-            request.setWaktuOrder(transaksi.getWaktuOrder());
-            request.setAlamatAsal(transaksi.getAlamatAsal());
-            request.setAlamatTujuan(transaksi.getAlamatTujuan());
-            request.setKodePromo(transaksi.getKodePromo());
-            request.setKreditPromo(transaksi.getKreditPromo());
-            request.setPakaiWallet(String.valueOf(transaksi.isPakaiWallet()));
-            request.setEstimasi(namamerchant);
-            request.setLayanan(layanan);
-            request.setLayanandesc(keterangan);
-            request.setIcon(icon);
-            request.setBiaya(String.valueOf(foodCostLong));
-            request.setTokenmerchant(transaksi.getToken_merchant());
-            request.setIdtransmerchant(transaksi.getIdtransmerchant());
-            request.setDistance(String.valueOf(deliveryCostLong));
-
-
-            String namaLengkap = String.format("%s", loginUser.getFullnama());
-            request.setNamaPelanggan(namaLengkap);
-            request.setTelepon(loginUser.getNoTelepon());
-            request.setType(ORDER);
-        }
-    }
-
-    private void sendRequestTransaksi(ItemRequestJson param, final List<DriverModel> driverList) {
-        User loginUser = BaseApp.getInstance(this).getLoginUser();
-        final BookService service = ServiceGenerator.createService(BookService.class, loginUser.getEmail(), loginUser.getPassword());
-
-        service.requestTransaksiMerchant(param).enqueue(new Callback<RideCarResponseJson>() {
-            @Override
-            public void onResponse(@NonNull Call<RideCarResponseJson> call, @NonNull Response<RideCarResponseJson> response) {
-                if (response.isSuccessful()) {
-                    buildDriverRequest(Objects.requireNonNull(response.body()));
-                    thread = new Thread(new Runnable() {
-                        @Override
-                        public void run() {
-                            for (int i = 0; i < driverList.size(); i++) {
-                                fcmBroadcast(i, driverList);
-                            }
-
-                            try {
-                                Thread.sleep(30000);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-
-                            if (threadRun) {
-                                CheckStatusTransaksiRequest param = new CheckStatusTransaksiRequest();
-                                param.setIdTransaksi(transaksi.getId());
-                                service.checkStatusTransaksi(param).enqueue(new Callback<CheckStatusTransaksiResponse>() {
-                                    @Override
-                                    public void onResponse(@NonNull Call<CheckStatusTransaksiResponse> call, @NonNull Response<CheckStatusTransaksiResponse> response) {
-                                        if (response.isSuccessful()) {
-                                            CheckStatusTransaksiResponse checkStatus = response.body();
-                                            if (!Objects.requireNonNull(checkStatus).isStatus()) {
-                                                notif("Driver tidak ditemukan!");
-                                                runOnUiThread(new Runnable() {
-                                                    @Override
-                                                    public void run() {
-                                                        notif("Driver tidak ditemukan!");
-                                                    }
-                                                });
-
-                                                new Handler().postDelayed(new Runnable() {
-                                                    public void run() {
-                                                        finish();
-                                                    }
-                                                }, 3000);
-                                            }
-                                        }
-                                    }
-
-                                    @Override
-                                    public void onFailure(@NonNull Call<CheckStatusTransaksiResponse> call, @NonNull Throwable t) {
-                                        notif("Driver tidak ditemukan!");
-                                        runOnUiThread(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                notif("Driver tidak ditemukan!");
-                                            }
-                                        });
-
-                                        new Handler().postDelayed(new Runnable() {
-                                            public void run() {
-                                                finish();
-                                            }
-                                        }, 3000);
-
-                                    }
-                                });
-                            }
-
-                        }
-                    });
-                    thread.start();
-
-
-                }
-            }
-
-            @Override
-            public void onFailure(@NonNull Call<RideCarResponseJson> call, @NonNull Throwable t) {
-                t.printStackTrace();
-                notif("Ada masalah di akun anda, silahkan hubungi team admin!");
-                new Handler().postDelayed(new Runnable() {
-                    public void run() {
-                        finish();
-                    }
-                }, 3000);
-            }
-        });
-    }
-
-    private void fcmBroadcast(int index, List<DriverModel> driverList) {
-        DriverModel driverToSend = driverList.get(index);
-        request.setTime_accept(new Date().getTime() + "");
-        final FCMMessage message = new FCMMessage();
-        message.setTo(driverToSend.getRegId());
-        message.setData(request);
-
-        Log.e("REQUEST TO DRIVER", message.getData().toString());
-
-        FCMHelper.sendMessage(message).enqueue(new okhttp3.Callback() {
-            @Override
-            public void onResponse(@NonNull okhttp3.Call call, @NonNull okhttp3.Response response) {
-                Log.e("REQUEST TO DRIVER", message.getData().toString());
-            }
-
-            @Override
-            public void onFailure(@NonNull okhttp3.Call call, @NonNull IOException e) {
-                e.printStackTrace();
-            }
-        });
-    }
-
-    @SuppressWarnings("unused")
-    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(final DriverResponse response) {
-        Log.e("DRIVER RESPONSE (W)", response.getResponse() + " " + response.getId() + " " + response.getIdTransaksi());
-        if (response.getResponse().equalsIgnoreCase(DriverResponse.ACCEPT) || response.getResponse().equals("3") || response.getResponse().equals("4")) {
-            runOnUiThread(new Runnable() {
-                public void run() {
-                    threadRun = false;
-                    for (DriverModel cDriver : driverAvailable) {
-                        if (cDriver.getId().equals(response.getId())) {
-                            Intent intent = new Intent(DetailOrderActivity.this, ProgressActivity.class);
-                            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                            intent.putExtra("id_driver", cDriver.getId());
-                            intent.putExtra("id_transaksi", request.getIdTransaksi());
-                            intent.putExtra("response", "2");
-                            intent.putExtra("complete", "1");
-                            startActivity(intent);
-                            DriverResponse response = new DriverResponse();
-                            response.setId("");
-                            response.setIdTransaksi("");
-                            response.setResponse("");
-                            EventBus.getDefault().postSticky(response);
-                            finish();
-                        }
-                    }
-                }
-            });
-        }
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        EventBus.getDefault().register(this);
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        EventBus.getDefault().unregister(this);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        User userLogin = BaseApp.getInstance(this).getLoginUser();
-        saldoWallet = String.valueOf(userLogin.getWalletSaldo());
-        Utility.koinTXT(saldotext,saldoWallet, this);
-    }
-
-
-}
+package id.ontime.customer.activity;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import id.ontime.customer.R;
+import id.ontime.customer.constants.BaseApp;
+import id.ontime.customer.constants.Constants;
+import id.ontime.customer.item.ItemItem;
+import id.ontime.customer.json.CheckStatusTransaksiRequest;
+import id.ontime.customer.json.CheckStatusTransaksiResponse;
+import id.ontime.customer.json.GetNearRideCarRequestJson;
+import id.ontime.customer.json.GetNearRideCarResponseJson;
+import id.ontime.customer.json.ItemRequestJson;
+import id.ontime.customer.json.PromoRequestJson;
+import id.ontime.customer.json.PromoResponseJson;
+import id.ontime.customer.json.RideCarResponseJson;
+import id.ontime.customer.json.fcm.DriverRequest;
+import id.ontime.customer.json.fcm.DriverResponse;
+import id.ontime.customer.json.fcm.FCMMessage;
+import id.ontime.customer.models.DriverModel;
+import id.ontime.customer.models.FiturModel;
+import id.ontime.customer.models.ItemModel;
+import id.ontime.customer.models.PesananMerchant;
+import id.ontime.customer.models.TransaksiModel;
+import id.ontime.customer.models.User;
+import id.ontime.customer.utils.SettingPreference;
+import id.ontime.customer.utils.Utility;
+import id.ontime.customer.utils.api.FCMHelper;
+import id.ontime.customer.utils.api.MapDirectionAPI;
+import id.ontime.customer.utils.api.ServiceGenerator;
+import id.ontime.customer.utils.api.service.BookService;
+import id.ontime.customer.utils.api.service.UserService;
+import com.google.android.gms.maps.model.LatLng;
+import com.mikepenz.fastadapter.FastAdapter;
+import com.mikepenz.fastadapter.adapters.FastItemAdapter;
+import com.mikepenz.fastadapter.listeners.ClickEventHook;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+import static id.ontime.customer.json.fcm.FCMType.ORDER;
+
+public class DetailOrderActivity extends AppCompatActivity implements ItemItem.OnCalculatePrice {
+
+    public static final String FITUR_KEY = "FiturKey";
+    private final int DESTINATION_ID = 1;
+    TextView location, orderprice, deliveryfee, diskon, total, diskontext, topuptext, textnotif, saldotext;
+    Button order;
+    RecyclerView rvmerchantnear;
+    LinearLayout llcheckedcash, llcheckedwallet, llbtn;
+    ImageButton checkedcash, checkedwallet;
+    RelativeLayout rlprogress;
+    Thread thread;
+    boolean threadRun = true;
+    TransaksiModel transaksi;
+    TextView cashpayment, walletpayment;
+    String alamat, biayaminimum, getbiaya, biayaakhir, biayadistance;
+    double lat, lon, merlat, merlon, distance;
+    ImageView backbtn;
+    int fitur;
+    SettingPreference sp;
+    RelativeLayout rlnotif;
+    EditText promokode;
+    String home, layanan, keterangan, icon;
+    Button btnpromo;
+    double km;
+    private DriverRequest request;
+    private double jarak;
+    private long harga, promocode;
+    private FiturModel designedFitur;
+    private LatLng pickUpLatLang;
+    private LatLng destinationLatLang;
+    private FastItemAdapter<ItemItem> itemAdapter;
+    private Realm realm;
+    private List<DriverModel> driverAvailable;
+    private long foodCostLong = 0, maksimum;
+    private long deliveryCostLong = 0;
+    private String saldoWallet, checkedpaywallet, checkedpaycash, idresto, alamatresto, namamerchant, back;
+    private okhttp3.Callback updateRouteCallback = new okhttp3.Callback() {
+        @Override
+        public void onFailure(@NonNull okhttp3.Call call, @NonNull IOException e) {
+            DetailOrderActivity.this.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    rlprogress.setVisibility(View.GONE);
+                    notif("Kesalahan koneksi, pilih lokasi lagi.");
+                }
+            });
+        }
+
+        @Override
+        public void onResponse(@NonNull okhttp3.Call call, okhttp3.Response response) throws IOException {
+            if (response.isSuccessful()) {
+                final String json = Objects.requireNonNull(response.body()).string();
+                final String errorMsg = MapDirectionAPI.getDirectionErrorMessage(json);
+                if (errorMsg != null) {
+                    DetailOrderActivity.this.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            rlprogress.setVisibility(View.GONE);
+                            notif(errorMsg);
+                        }
+                    });
+                    return;
+                }
+                final long distancetext = MapDirectionAPI.getDistance(DetailOrderActivity.this, json);
+                if (distancetext >= 0) {
+                    DetailOrderActivity.this.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            String format = String.format(Locale.US, "%.0f", ((float) (distancetext)) / 1000f);
+                            long dist = Long.parseLong(format);
+                            promocode = 0;
+                            promokode.setText("");
+                            distance = ((float) (distancetext)) / 1000f;
+                            updateDistance();
+                            if (dist < maksimum) {
+                                order.setOnClickListener(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        if (readyToOrder()) {
+                                            sendOrder();
+                                            back = "1";
+                                        }
+                                    }
+                                });
+                            } else {
+                                notif("Tujuan terlalu jauh!");
+                                order.setOnClickListener(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        if (readyToOrder()) {
+                                            notif("Tujuan terlalu jauh!");
+                                            back = "0";
+                                        }
+                                    }
+                                });
+
+                            }
+
+                        }
+                    });
+                } else {
+                    DetailOrderActivity.this.runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            rlprogress.setVisibility(View.GONE);
+                            notif("Gagal memuat rute, pilih lokasi lagi.");
+                        }
+                    });
+                }
+            } else {
+                DetailOrderActivity.this.runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        rlprogress.setVisibility(View.GONE);
+                        notif("Gagal memuat rute, coba lagi.");
+                    }
+                });
+            }
+        }
+    };
+
+    @SuppressLint("SetTextI18n")
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_detail_order);
+        promocode = 0;
+        realm = Realm.getDefaultInstance();
+        rvmerchantnear = findViewById(R.id.merchantnear);
+        location = findViewById(R.id.pickUpText);
+        orderprice = findViewById(R.id.orderprice);
+        llcheckedcash = findViewById(R.id.llcheckedcash);
+        llcheckedwallet = findViewById(R.id.llcheckedwallet);
+        cashpayment = findViewById(R.id.cashPayment);
+        walletpayment = findViewById(R.id.walletpayment);
+        deliveryfee = findViewById(R.id.cost);
+        checkedcash = findViewById(R.id.checkedcash);
+        checkedwallet = findViewById(R.id.checkedwallet);
+        total = findViewById(R.id.price);
+        diskon = findViewById(R.id.diskon);
+        backbtn = findViewById(R.id.back_btn);
+        diskontext = findViewById(R.id.ketsaldo);
+        topuptext = findViewById(R.id.topUp);
+        order = findViewById(R.id.order);
+        rlprogress = findViewById(R.id.rlprogress);
+        textnotif = findViewById(R.id.textnotif);
+        rlnotif = findViewById(R.id.rlnotif);
+        saldotext = findViewById(R.id.saldo);
+        promokode = findViewById(R.id.promocode);
+        btnpromo = findViewById(R.id.btnpromo);
+        back = "0";
+        llbtn = findViewById(R.id.llbtn);
+
+        driverAvailable = new ArrayList<>();
+        fitur = 0;
+        topuptext.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(getApplicationContext(), TopupSaldoActivity.class));
+            }
+        });
+
+        location.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(DetailOrderActivity.this, PicklocationActivity.class);
+                intent.putExtra(PicklocationActivity.FORM_VIEW_INDICATOR, DESTINATION_ID);
+                startActivityForResult(intent, PicklocationActivity.LOCATION_PICKER_ID);
+            }
+        });
+
+        backbtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
+
+        sp = new SettingPreference(this);
+        Intent intent = getIntent();
+        lat = intent.getDoubleExtra("lat", 0);
+        lon = intent.getDoubleExtra("lon", 0);
+        merlat = intent.getDoubleExtra("merlat", 0);
+        merlon = intent.getDoubleExtra("merlon", 0);
+        distance = intent.getDoubleExtra("distance", 0);
+        alamatresto = intent.getStringExtra("alamatresto");
+        idresto = intent.getStringExtra("idresto");
+        alamat = intent.getStringExtra("alamat");
+        namamerchant = intent.getStringExtra("namamerchant");
+        fitur = intent.getIntExtra(FITUR_KEY, -1);
+        if (fitur != -1)
+            designedFitur = realm.where(FiturModel.class).equalTo("idFitur", fitur).findFirst();
+        home = Objects.requireNonNull(designedFitur).getHome();
+        layanan = designedFitur.getFitur();
+        keterangan = designedFitur.getKeterangan();
+        icon = designedFitur.getIcon();
+
+        RealmResults<FiturModel> fiturs = realm.where(FiturModel.class).findAll();
+
+        for (FiturModel fitur : fiturs) {
+            Log.e("ID_FITUR", fitur.getIdFitur() + " " + fitur.getFitur() + " " + fitur.getBiayaAkhir());
+        }
+        getbiaya = String.valueOf(designedFitur.getBiaya());
+        biayaminimum = String.valueOf(designedFitur.getBiaya_minimum());
+        biayaakhir = String.valueOf(designedFitur.getBiayaAkhir());
+        maksimum = Long.parseLong(designedFitur.getMaksimumdist());
+
+        diskontext.setText("Diskon " + designedFitur.getDiskon() + " pakai koin");
+        total.setText("wait");
+        deliveryfee.setText("wait");
+        Utility.currencyTXT(diskon, String.valueOf(promocode), DetailOrderActivity.this);
+        User userLogin = BaseApp.getInstance(this).getLoginUser();
+        saldoWallet = String.valueOf(userLogin.getWalletSaldo());
+
+        pickUpLatLang = new LatLng(merlat, merlon);
+        destinationLatLang = new LatLng(lat, lon);
+        location.setText(alamat);
+
+        btnpromo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+                    Objects.requireNonNull(imm).hideSoftInputFromWindow(Objects.requireNonNull(getCurrentFocus()).getWindowToken(), 0);
+                } catch (Exception ignored) {
+
+                }
+                if (promokode.getText().toString().isEmpty()) {
+                    notif("Kode promo tidak boleh kosong!");
+                } else {
+                    promokodedata();
+                }
+            }
+        });
+
+        itemAdapter = new FastItemAdapter<>();
+        itemAdapter.notifyDataSetChanged();
+        itemAdapter.withSelectable(true);
+        itemAdapter.withItemEvent(new ClickEventHook<ItemItem>() {
+            @Nullable
+            @Override
+            public View onBind(@NonNull RecyclerView.ViewHolder viewHolder) {
+                if (viewHolder instanceof ItemItem.ViewHolder) {
+                    return ((ItemItem.ViewHolder) viewHolder).itemView;
+                }
+                return null;
+            }
+
+            @Override
+            public void onClick(View v, int position, FastAdapter<ItemItem> fastAdapter, ItemItem item) {
+                //sheetlist(position);
+            }
+        });
+        rvmerchantnear.setLayoutManager(new LinearLayoutManager(this));
+        rvmerchantnear.setAdapter(itemAdapter);
+        updateEstimatedItemCost();
+        loadItem();
+    }
+
+    public void notif(String text) {
+        rlnotif.setVisibility(View.VISIBLE);
+        textnotif.setText(text);
+
+        new Handler().postDelayed(new Runnable() {
+            public void run() {
+                rlnotif.setVisibility(View.GONE);
+            }
+        }, 3000);
+    }
+
+    private boolean readyToOrder() {
+        if (destinationLatLang == null) {
+            Toast.makeText(this, "Silahkan pilih lokasi kamu.", Toast.LENGTH_SHORT).show();
+            return false;
+        } else if (total.getText().toString().isEmpty() || total.getText().toString().equals("wait")) {
+            Toast.makeText(this, "Mohon tunggu...", Toast.LENGTH_SHORT).show();
+            return false;
+        }
+
+        List<PesananMerchant> existingFood = realm.copyFromRealm(realm.where(PesananMerchant.class).findAll());
+
+        int quantity = 0;
+        for (int p = 0; p < existingFood.size(); p++) {
+            quantity += existingFood.get(p).getQty();
+        }
+
+        if (quantity == 0) {
+            Toast.makeText(this, "Harap pesan minimal 1 item.", Toast.LENGTH_SHORT).show();
+            return false;
+        }
+
+        if (jarak == -99.0) {
+            Toast.makeText(this, "Tolong tunggu sebentar...", Toast.LENGTH_SHORT).show();
+        }
+
+        return true;
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == PicklocationActivity.LOCATION_PICKER_ID) {
+            if (resultCode == Activity.RESULT_OK) {
+                String addressset = data.getStringExtra(PicklocationActivity.LOCATION_NAME);
+                LatLng latLng = data.getParcelableExtra(PicklocationActivity.LOCATION_LATLNG);
+                location.setText(addressset);
+                destinationLatLang = new LatLng(Objects.requireNonNull(latLng).latitude, latLng.longitude);
+                if (pickUpLatLang != null) {
+                    MapDirectionAPI.getDirection(DetailOrderActivity.this, pickUpLatLang, destinationLatLang).enqueue(updateRouteCallback);
+                }
+            }
+        }
+    }
+
+    private void loadItem() {
+        List<ItemModel> makananList = realm.copyFromRealm(realm.where(ItemModel.class).findAll());
+        List<PesananMerchant> pesananFoods = realm.copyFromRealm(realm.where(PesananMerchant.class).findAll());
+        itemAdapter.clear();
+        for (PesananMerchant pesanan : pesananFoods) {
+            ItemItem makananItem = new ItemItem(this, this);
+            for (ItemModel makanan : makananList) {
+                if (makanan.getId_item() == pesanan.getIdItem()) {
+                    makananItem.quantity = pesanan.getQty();
+                    makananItem.id = makanan.getId_item();
+                    makananItem.namaMenu = makanan.getNama_item();
+                    makananItem.deskripsiMenu = makanan.getDeskripsi_item();
+                    makananItem.foto = makanan.getFoto_item();
+                    makananItem.harga = Long.parseLong(makanan.getHarga_item());
+                    makananItem.promo = makanan.getStatus_promo();
+                    if (makanan.getHarga_promo().isEmpty()) {
+                        makananItem.hargapromo = 0;
+                    } else {
+                        makananItem.hargapromo = Long.parseLong(makanan.getHarga_promo());
+                    }
+                    makananItem.catatan = pesanan.getCatatan();
+
+                    break;
+                }
+            }
+
+            itemAdapter.add(makananItem);
+        }
+
+        itemAdapter.notifyDataSetChanged();
+    }
+
+    @SuppressLint("SetTextI18n")
+    private void promokodedata() {
+        btnpromo.setEnabled(false);
+        btnpromo.setText("tunggu...");
+        final User user = BaseApp.getInstance(this).getLoginUser();
+        PromoRequestJson request = new PromoRequestJson();
+        request.setFitur(String.valueOf(fitur));
+        request.setCode(promokode.getText().toString());
+
+        UserService service = ServiceGenerator.createService(UserService.class, user.getNoTelepon(), user.getPassword());
+        service.promocode(request).enqueue(new Callback<PromoResponseJson>() {
+            @Override
+            public void onResponse(@NonNull Call<PromoResponseJson> call, @NonNull Response<PromoResponseJson> response) {
+                if (response.isSuccessful()) {
+                    if (Objects.requireNonNull(response.body()).getMessage().equalsIgnoreCase("success")) {
+                        final long finalBiayaTotalpay = foodCostLong + harga;
+                        btnpromo.setEnabled(true);
+                        btnpromo.setText("Use");
+                        if (response.body().getType().equals("persen")) {
+                            promocode = (Long.parseLong(response.body().getNominal()) * finalBiayaTotalpay) / 100;
+                        } else {
+                            promocode = Long.parseLong(response.body().getNominal());
+                        }
+                        updateDistance();
+                    } else {
+                        notif("Kode promo tidak berlaku!");
+                        btnpromo.setEnabled(true);
+                        btnpromo.setText("Use");
+                        promocode = 0;
+                        updateDistance();
+                    }
+                } else {
+                    notif("error!");
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<PromoResponseJson> call, @NonNull Throwable t) {
+                t.printStackTrace();
+                notif("error");
+            }
+        });
+    }
+
+    @Override
+    public void calculatePrice() {
+        updateEstimatedItemCost();
+    }
+
+    private void updateEstimatedItemCost() {
+        List<PesananMerchant> existingFood = realm.copyFromRealm(realm.where(PesananMerchant.class).findAll());
+        long cost = 0;
+        for (int p = 0; p < existingFood.size(); p++) {
+            cost += existingFood.get(p).getTotalHarga();
+        }
+        foodCostLong = cost;
+        Utility.currencyTXT(orderprice, String.valueOf(foodCostLong), this);
+        MapDirectionAPI.getDirection(DetailOrderActivity.this, pickUpLatLang, destinationLatLang).enqueue(updateRouteCallback);
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        if (back.equals("1")) {
+            Intent intent = new Intent(DetailOrderActivity.this, MainActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(intent);
+            finish();
+        } else {
+            finish();
+        }
+    }
+
+    private void updateDistance() {
+
+        checkedpaycash = "1";
+        checkedpaywallet = "0";
+        Log.e("CHECKEDWALLET", checkedpaywallet);
+        checkedcash.setSelected(true);
+        checkedwallet.setSelected(false);
+        cashpayment.setTextColor(getResources().getColor(R.color.colorgradient));
+        walletpayment.setTextColor(getResources().getColor(R.color.gray));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            checkedcash.setBackgroundTintList(getResources().getColorStateList(R.color.colorgradient));
+            checkedwallet.setBackgroundTintList(getResources().getColorStateList(R.color.gray));
+        }
+        km = distance;
+
+
+        this.jarak = km;
+
+        String biaya = String.valueOf(biayaminimum);
+        long biayaTotal = (long) (Double.parseDouble(getbiaya) * km);
+        if (biayaTotal < Double.parseDouble(biayaminimum)) {
+            this.harga = Long.parseLong(biayaminimum);
+            biayaTotal = Long.parseLong(biayaminimum);
+            biayadistance = biaya;
+        } else {
+            biayadistance = getbiaya;
+        }
+        this.harga = biayaTotal;
+
+        deliveryCostLong = biayaTotal;
+        Log.e("distance", String.valueOf(deliveryCostLong));
+
+        Utility.currencyTXT(deliveryfee, String.valueOf(deliveryCostLong), this);
+        final long finalBiayaTotalpay = foodCostLong + harga;
+
+        Utility.currencyTXT(total, String.valueOf(finalBiayaTotalpay - promocode), DetailOrderActivity.this);
+        Utility.currencyTXT(diskon, String.valueOf(promocode), DetailOrderActivity.this);
+        long saldokini = Long.parseLong(saldoWallet);
+        if (saldokini < ((foodCostLong + harga) - (finalBiayaTotalpay * Double.parseDouble(biayaakhir)))) {
+            llcheckedcash.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Utility.currencyTXT(total, String.valueOf(finalBiayaTotalpay - promocode), DetailOrderActivity.this);
+                    Utility.currencyTXT(diskon, String.valueOf(promocode), DetailOrderActivity.this);
+                    checkedcash.setSelected(true);
+                    checkedwallet.setSelected(false);
+                    checkedpaycash = "1";
+                    checkedpaywallet = "0";
+                    Log.e("CHECKEDWALLET", checkedpaywallet);
+                    cashpayment.setTextColor(getResources().getColor(R.color.colorgradient));
+                    walletpayment.setTextColor(getResources().getColor(R.color.gray));
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                        checkedcash.setBackgroundTintList(getResources().getColorStateList(R.color.colorgradient));
+                        checkedwallet.setBackgroundTintList(getResources().getColorStateList(R.color.gray));
+                    }
+                }
+            });
+            llcheckedwallet.setEnabled(false);
+        } else {
+            llcheckedwallet.setEnabled(true);
+            llcheckedcash.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Utility.currencyTXT(total, String.valueOf(finalBiayaTotalpay - promocode), DetailOrderActivity.this);
+                    Utility.currencyTXT(diskon, String.valueOf(promocode), DetailOrderActivity.this);
+                    checkedcash.setSelected(true);
+                    checkedwallet.setSelected(false);
+                    checkedpaycash = "1";
+                    checkedpaywallet = "0";
+                    Log.e("CHECKEDWALLET", checkedpaywallet);
+                    cashpayment.setTextColor(getResources().getColor(R.color.colorgradient));
+                    walletpayment.setTextColor(getResources().getColor(R.color.gray));
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                        checkedcash.setBackgroundTintList(getResources().getColorStateList(R.color.colorgradient));
+                        checkedwallet.setBackgroundTintList(getResources().getColorStateList(R.color.gray));
+                    }
+                }
+            });
+
+            llcheckedwallet.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    long diskonwallet = (long) ((finalBiayaTotalpay * Double.parseDouble(biayaakhir)) + promocode);
+                    Log.e("distance", String.valueOf((foodCostLong + harga) - (finalBiayaTotalpay * Double.parseDouble(biayaakhir))));
+                    String totalwallet = String.valueOf(diskonwallet);
+                    Utility.currencyTXT(diskon, totalwallet, DetailOrderActivity.this);
+                    Utility.currencyTXT(total, String.valueOf(finalBiayaTotalpay - diskonwallet), DetailOrderActivity.this);
+                    checkedcash.setSelected(false);
+                    checkedwallet.setSelected(true);
+                    checkedpaycash = "0";
+                    checkedpaywallet = "1";
+                    Log.e("CHECKEDWALLET", checkedpaywallet);
+                    walletpayment.setTextColor(getResources().getColor(R.color.colorgradient));
+                    cashpayment.setTextColor(getResources().getColor(R.color.gray));
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                        checkedwallet.setBackgroundTintList(getResources().getColorStateList(R.color.colorgradient));
+                        checkedcash.setBackgroundTintList(getResources().getColorStateList(R.color.gray));
+                    }
+                }
+            });
+        }
+    }
+
+    private void sendOrder() {
+        List<PesananMerchant> existingItem = realm.copyFromRealm(realm.where(PesananMerchant.class).findAll());
+
+        for (PesananMerchant pesanan : existingItem) {
+            if (pesanan.getCatatan() == null || pesanan.getCatatan().trim().equals(""))
+                pesanan.setCatatan("");
+        }
+
+        ItemRequestJson param = new ItemRequestJson();
+        User userLogin = BaseApp.getInstance(this).getLoginUser();
+        param.setIdPelanggan(userLogin.getId());
+        param.setOrderFitur(String.valueOf(fitur));
+        param.setStartLatitude(destinationLatLang.latitude);
+        param.setStartLongitude(destinationLatLang.longitude);
+        param.setEndLatitude(merlat);
+        param.setEndLongitude(merlon);
+        param.setAlamatTujuan(location.getText().toString());
+        param.setAlamatAsal(alamatresto);
+        param.setJarak(jarak);
+        param.setEstimasi(String.valueOf(distance));
+        param.setHarga(deliveryCostLong);
+        if (checkedpaycash.equals("1")) {
+            param.setPakaiWallet(0);
+            param.setKreditpromo(String.valueOf(promocode));
+        } else {
+            param.setPakaiWallet(1);
+            param.setKreditpromo(diskon.getText().toString().replace(".", "").replace(sp.getSetting()[0], ""));
+        }
+        param.setIdResto(idresto);
+        param.setTotalBiayaBelanja(foodCostLong);
+        param.setCatatan("");
+        param.setPesanan(existingItem);
+
+        Log.e("Bookingdata", ServiceGenerator.gson.toJson(param));
+
+        fetchNearDriver(param);
+    }
+
+    private void fetchNearDriver(final ItemRequestJson paramdata) {
+        rlprogress.setVisibility(View.VISIBLE);
+        if (destinationLatLang != null) {
+            User loginUser = BaseApp.getInstance(this).getLoginUser();
+
+            BookService service = ServiceGenerator.createService(BookService.class, loginUser.getEmail(), loginUser.getPassword());
+            GetNearRideCarRequestJson param = new GetNearRideCarRequestJson();
+            param.setLatitude(merlat);
+            param.setLongitude(merlon);
+            param.setFitur(String.valueOf(fitur));
+            int radiusKm = new id.ontime.customer.utils.SettingPreference(this).getDriverSearchRadiusKm();
+            if (radiusKm > 0) param.setRadiusKm((double) radiusKm);
+
+            service.getNearRide(param).enqueue(new Callback<GetNearRideCarResponseJson>() {
+                @Override
+                public void onResponse(@NonNull Call<GetNearRideCarResponseJson> call, @NonNull Response<GetNearRideCarResponseJson> response) {
+                    if (response.isSuccessful()) {
+                        driverAvailable = Objects.requireNonNull(response.body()).getData();
+                        if (driverAvailable.isEmpty()) {
+                            finish();
+                            Toast.makeText(DetailOrderActivity.this, "tidak ada pengemudi di sekitar Anda!", Toast.LENGTH_SHORT).show();
+                        } else {
+                            sendRequestTransaksi(paramdata, driverAvailable);
+                        }
+                    }
+                }
+
+                @Override
+                public void onFailure(@NonNull retrofit2.Call<GetNearRideCarResponseJson> call, @NonNull Throwable t) {
+
+                }
+            });
+
+        }
+    }
+
+    private void buildDriverRequest(RideCarResponseJson response) {
+        transaksi = response.getData().get(0);
+        Log.e("wallet", String.valueOf(transaksi.isPakaiWallet()));
+        User loginUser = BaseApp.getInstance(this).getLoginUser();
+        if (request == null) {
+            request = new DriverRequest();
+            request.setIdTransaksi(transaksi.getId());
+            request.setIdPelanggan(transaksi.getIdPelanggan());
+            request.setRegIdPelanggan(loginUser.getToken());
+            request.setOrderFitur(home);
+            request.setStartLatitude(transaksi.getStartLatitude());
+            request.setStartLongitude(transaksi.getStartLongitude());
+            request.setEndLatitude(transaksi.getEndLatitude());
+            request.setEndLongitude(transaksi.getEndLongitude());
+            request.setJarak(transaksi.getJarak());
+            request.setHarga(transaksi.getHarga() + foodCostLong);
+            request.setWaktuOrder(transaksi.getWaktuOrder());
+            request.setAlamatAsal(transaksi.getAlamatAsal());
+            request.setAlamatTujuan(transaksi.getAlamatTujuan());
+            request.setKodePromo(transaksi.getKodePromo());
+            request.setKreditPromo(transaksi.getKreditPromo());
+            request.setPakaiWallet(String.valueOf(transaksi.isPakaiWallet()));
+            request.setEstimasi(namamerchant);
+            request.setLayanan(layanan);
+            request.setLayanandesc(keterangan);
+            request.setIcon(icon);
+            request.setBiaya(String.valueOf(foodCostLong));
+            request.setTokenmerchant(transaksi.getToken_merchant());
+            request.setIdtransmerchant(transaksi.getIdtransmerchant());
+            request.setDistance(String.valueOf(deliveryCostLong));
+
+
+            String namaLengkap = String.format("%s", loginUser.getFullnama());
+            request.setNamaPelanggan(namaLengkap);
+            request.setTelepon(loginUser.getNoTelepon());
+            request.setType(ORDER);
+        }
+    }
+
+    private void sendRequestTransaksi(ItemRequestJson param, final List<DriverModel> driverList) {
+        User loginUser = BaseApp.getInstance(this).getLoginUser();
+        final BookService service = ServiceGenerator.createService(BookService.class, loginUser.getEmail(), loginUser.getPassword());
+
+        service.requestTransaksiMerchant(param).enqueue(new Callback<RideCarResponseJson>() {
+            @Override
+            public void onResponse(@NonNull Call<RideCarResponseJson> call, @NonNull Response<RideCarResponseJson> response) {
+                if (response.isSuccessful()) {
+                    buildDriverRequest(Objects.requireNonNull(response.body()));
+                    thread = new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            for (int i = 0; i < driverList.size(); i++) {
+                                fcmBroadcast(i, driverList);
+                            }
+
+                            try {
+                                Thread.sleep(30000);
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                            }
+
+                            if (threadRun) {
+                                CheckStatusTransaksiRequest param = new CheckStatusTransaksiRequest();
+                                param.setIdTransaksi(transaksi.getId());
+                                service.checkStatusTransaksi(param).enqueue(new Callback<CheckStatusTransaksiResponse>() {
+                                    @Override
+                                    public void onResponse(@NonNull Call<CheckStatusTransaksiResponse> call, @NonNull Response<CheckStatusTransaksiResponse> response) {
+                                        if (response.isSuccessful()) {
+                                            CheckStatusTransaksiResponse checkStatus = response.body();
+                                            if (!Objects.requireNonNull(checkStatus).isStatus()) {
+                                                notif("Driver tidak ditemukan!");
+                                                runOnUiThread(new Runnable() {
+                                                    @Override
+                                                    public void run() {
+                                                        notif("Driver tidak ditemukan!");
+                                                    }
+                                                });
+
+                                                new Handler().postDelayed(new Runnable() {
+                                                    public void run() {
+                                                        finish();
+                                                    }
+                                                }, 3000);
+                                            }
+                                        }
+                                    }
+
+                                    @Override
+                                    public void onFailure(@NonNull Call<CheckStatusTransaksiResponse> call, @NonNull Throwable t) {
+                                        notif("Driver tidak ditemukan!");
+                                        runOnUiThread(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                notif("Driver tidak ditemukan!");
+                                            }
+                                        });
+
+                                        new Handler().postDelayed(new Runnable() {
+                                            public void run() {
+                                                finish();
+                                            }
+                                        }, 3000);
+
+                                    }
+                                });
+                            }
+
+                        }
+                    });
+                    thread.start();
+
+
+                }
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<RideCarResponseJson> call, @NonNull Throwable t) {
+                t.printStackTrace();
+                notif("Ada masalah di akun anda, silahkan hubungi team admin!");
+                new Handler().postDelayed(new Runnable() {
+                    public void run() {
+                        finish();
+                    }
+                }, 3000);
+            }
+        });
+    }
+
+    private void fcmBroadcast(int index, List<DriverModel> driverList) {
+        DriverModel driverToSend = driverList.get(index);
+        request.setTime_accept(new Date().getTime() + "");
+        final FCMMessage message = new FCMMessage();
+        message.setTo(driverToSend.getRegId());
+        message.setData(request);
+
+        Log.e("REQUEST TO DRIVER", message.getData().toString());
+
+        FCMHelper.sendMessage(message).enqueue(new okhttp3.Callback() {
+            @Override
+            public void onResponse(@NonNull okhttp3.Call call, @NonNull okhttp3.Response response) {
+                Log.e("REQUEST TO DRIVER", message.getData().toString());
+            }
+
+            @Override
+            public void onFailure(@NonNull okhttp3.Call call, @NonNull IOException e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
+    public void onMessageEvent(final DriverResponse response) {
+        Log.e("DRIVER RESPONSE (W)", response.getResponse() + " " + response.getId() + " " + response.getIdTransaksi());
+        if (response.getResponse().equalsIgnoreCase(DriverResponse.ACCEPT) || response.getResponse().equals("3") || response.getResponse().equals("4")) {
+            runOnUiThread(new Runnable() {
+                public void run() {
+                    threadRun = false;
+                    for (DriverModel cDriver : driverAvailable) {
+                        if (cDriver.getId().equals(response.getId())) {
+                            Intent intent = new Intent(DetailOrderActivity.this, ProgressActivity.class);
+                            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                            intent.putExtra("id_driver", cDriver.getId());
+                            intent.putExtra("id_transaksi", request.getIdTransaksi());
+                            intent.putExtra("response", "2");
+                            intent.putExtra("complete", "1");
+                            startActivity(intent);
+                            DriverResponse response = new DriverResponse();
+                            response.setId("");
+                            response.setIdTransaksi("");
+                            response.setResponse("");
+                            EventBus.getDefault().postSticky(response);
+                            finish();
+                        }
+                    }
+                }
+            });
+        }
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        User userLogin = BaseApp.getInstance(this).getLoginUser();
+        saldoWallet = String.valueOf(userLogin.getWalletSaldo());
+        Utility.koinTXT(saldotext,saldoWallet, this);
+    }
+
+
+}
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/EditProfileActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/EditProfileActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/FavoriteNewsActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/FavoriteNewsActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/IntroActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/IntroActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/LoginActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/LoginActivity.java
old mode 100644
new mode 100755
index ef379a8..42976df
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/LoginActivity.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/LoginActivity.java
@@ -47,7 +47,7 @@ import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.PhoneAuthCredential;
 import com.google.firebase.auth.PhoneAuthProvider;
-import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.ybs.countrypicker.CountryPicker;
 import com.ybs.countrypicker.CountryPickerListener;
 
@@ -67,6 +67,8 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public class LoginActivity extends AppCompatActivity {
 
+    private static final String TAG = "UserLogin";
+
     EditText phoneText, password, email, numOne, numTwo, numThree, numFour, numFive, numSix;
     TextView countryCode, sendTo, privacypolicy, textnotif, daftar, textnotif2, lupapass;
     Button buttonLogin, confirmButton;
@@ -164,6 +166,12 @@ public class LoginActivity extends AppCompatActivity {
                     notif(getString(R.string.phonepass));
                 } else {
                     if (NetworkUtils.isConnected(LoginActivity.this)) {
+                        // Phone login requires Firebase for SMS verification. When unavailable, only email works.
+                        if (!hasEmail && fbAuth == null) {
+                            notif(getString(R.string.phone_verification_unavailable));
+                            return;
+                        }
+
                         // For email+password login, skip SMS verification.
                         verify = hasEmail ? "true" : "false";
 
@@ -413,7 +421,7 @@ public class LoginActivity extends AppCompatActivity {
     public void Send_Number_tofirebase(String phoneNumber) {
         if (fbAuth == null) {
             progresshide();
-            notif2(getString(R.string.text_noInternet));
+            notif2(getString(R.string.phone_verification_unavailable));
             return;
         }
 
@@ -480,7 +488,7 @@ public class LoginActivity extends AppCompatActivity {
     private void signInWithPhoneAuthCredential(PhoneAuthCredential credential) {
         if (fbAuth == null) {
             progresshide();
-            notif2(getString(R.string.text_noInternet));
+            notif2(getString(R.string.phone_verification_unavailable));
             return;
         }
 
@@ -509,7 +517,7 @@ public class LoginActivity extends AppCompatActivity {
 
         if (fbAuth == null) {
             progresshide();
-            notif2(getString(R.string.text_noInternet));
+            notif2(getString(R.string.phone_verification_unavailable));
             return;
         }
 
@@ -525,56 +533,116 @@ public class LoginActivity extends AppCompatActivity {
 
     private void onSignInClick() {
         progressshow();
-        LoginRequestJson request = new LoginRequestJson();
+        final LoginRequestJson request = new LoginRequestJson();
         String emailText = email.getText().toString().trim();
         String phoneDigits = phoneText.getText().toString().trim();
 
         if (!TextUtils.isEmpty(emailText)) {
-            // Login using email + password
             request.setEmail(emailText);
             request.setNotelepon("");
         } else {
-            // Login using phone number + password (legacy flow)
             request.setEmail(null);
             request.setNotelepon(countryCode.getText().toString().replace("+", "") + phoneDigits);
         }
         request.setPassword(password.getText().toString());
-        try {
-            FirebaseInstanceId token = FirebaseInstanceId.getInstance();
-            request.setRegId(token.getToken());
-        } catch (Exception e) {
-            Log.e("LoginActivity", "Failed to get FirebaseInstanceId token; continuing without regId", e);
-            request.setRegId(null);
+
+        // FCM token is required: prefer cached token from Realm, otherwise fetch a fresh one.
+        Realm realm = BaseApp.getInstance(this).getRealmInstance();
+        FirebaseToken storedToken = realm.where(FirebaseToken.class).findFirst();
+        if (storedToken != null && storedToken.getTokenId() != null && !storedToken.getTokenId().isEmpty()) {
+            request.setRegId(storedToken.getTokenId());
+            doLoginRequest(request, emailText);
+            return;
         }
 
+        try {
+            FirebaseMessaging.getInstance().getToken()
+                    .addOnCompleteListener(task -> {
+                        if (task.isSuccessful() && task.getResult() != null && !task.getResult().isEmpty()) {
+                            String fcmToken = task.getResult();
+                            request.setRegId(fcmToken);
+                            // Persist for subsequent logins.
+                            realm.executeTransaction(r -> {
+                                FirebaseToken t = new FirebaseToken(fcmToken);
+                                r.delete(FirebaseToken.class);
+                                r.copyToRealm(t);
+                            });
+                            doLoginRequest(request, emailText);
+                        } else {
+                            progresshide();
+                            Log.e(TAG, "FCM getToken failed: " + (task.getException() != null ? task.getException().getMessage() : "empty token"));
+                            notif(getString(R.string.fcm_token_required));
+                        }
+                    });
+        } catch (IllegalStateException e) {
+            progresshide();
+            Log.e(TAG, "FirebaseMessaging not available; FCM token is required", e);
+            notif(getString(R.string.fcm_token_required));
+        }
+    }
+
+    private void doLoginRequest(LoginRequestJson request, String emailText) {
+        Log.d(TAG, "Login request: baseUrl=" + Constants.CONNECTION + " endpoint=pelanggan/login");
+        Log.d(TAG, "Login request: email=" + (request.getEmail() != null ? request.getEmail() : "null")
+                + " no_telepon=" + (request.getNotelepon() != null ? "[" + request.getNotelepon().length() + " chars]" : "null")
+                + " passwordLength=" + (request.getPassword() != null ? request.getPassword().length() : 0)
+                + " hasFcmToken=" + (request.getRegId() != null && !request.getRegId().isEmpty()));
         String basicUser = !TextUtils.isEmpty(emailText) ? emailText : request.getNotelepon();
+        Log.d(TAG, "Login request: Basic auth user (identifier)=" + basicUser);
+
         UserService service = ServiceGenerator.createService(UserService.class, basicUser, request.getPassword());
         service.login(request).enqueue(new Callback<LoginResponseJson>() {
             @Override
             public void onResponse(@NonNull Call<LoginResponseJson> call, @NonNull Response<LoginResponseJson> response) {
                 progresshide();
-                if (response.isSuccessful()) {
+                int code = response.code();
+                boolean ok = response.isSuccessful();
+                Log.d(TAG, "Login response: code=" + code + " isSuccessful=" + ok);
+
+                if (ok) {
                     LoginResponseJson body = response.body();
-                    if (body != null && body.getMessage().equalsIgnoreCase("found")) {
-                        // On any successful login (email or phone), go straight to home.
+                    String msg = body != null ? body.getMessage() : "null";
+                    int dataSize = (body != null && body.getData() != null) ? body.getData().size() : -1;
+                    Log.d(TAG, "Login response body: message=" + msg + " dataSize=" + dataSize);
+
+                    if (body != null && body.getMessage().equalsIgnoreCase("found") && body.getData() != null && !body.getData().isEmpty()) {
                         User user = body.getData().get(0);
                         saveUser(user);
+                        Log.d(TAG, "Login success: user id=" + (user.getId() != null ? user.getId() : "?"));
                         loginPanic();
                         Intent intent = new Intent(LoginActivity.this, MainActivity.class);
                         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
                         startActivity(intent);
                         finish();
                     } else {
-                        notif(getString(R.string.phoneemailwrong));
+                        String showMsg = (body != null && body.getMessage() != null) ? body.getMessage() : getString(R.string.phoneemailwrong);
+                        Log.w(TAG, "Login rejected by server: message=" + showMsg);
+                        notif(showMsg);
                     }
+                } else {
+                    String errMsg = "Login failed";
+                    try {
+                        if (response.errorBody() != null) {
+                            String errBody = response.errorBody().string();
+                            Log.e(TAG, "Login error body: code=" + code + " body=" + (errBody != null ? errBody : "null"));
+                            if (errBody != null && !errBody.isEmpty()) errMsg = errBody;
+                        } else {
+                            Log.e(TAG, "Login error: code=" + code + " no error body");
+                        }
+                    } catch (Exception e) {
+                        Log.e(TAG, "Login error reading body", e);
+                    }
+                    if (code == 401) errMsg = getString(R.string.phoneemailwrong);
+                    notif(errMsg);
                 }
             }
 
             @Override
             public void onFailure(@NonNull Call<LoginResponseJson> call, @NonNull Throwable t) {
                 progresshide();
+                Log.e(TAG, "Login onFailure: " + t.getMessage(), t);
                 t.printStackTrace();
-                notif("error");
+                notif(t.getMessage() != null ? t.getMessage() : "error");
             }
         });
     }
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/LupapassActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/LupapassActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/MainActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/MainActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/MapsMerchantActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/MapsMerchantActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/OngkirActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/OngkirActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/OperatorProviderListActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/OperatorProviderListActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/PicklocationActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/PicklocationActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/PpobActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/PpobActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/PrivacyActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/PrivacyActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ProgressActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ProgressActivity.java
old mode 100644
new mode 100755
index d02df20..2a9a77d
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ProgressActivity.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/ProgressActivity.java
@@ -234,7 +234,15 @@ public class ProgressActivity extends AppCompatActivity
         @Override
         public void onReceive(Context context, Intent intent) {
             orderBundle = intent.getExtras();
-            orderHandler(Objects.requireNonNull(orderBundle).getInt("code"));
+            if (orderBundle == null || idtrans == null) return;
+            // Only update if this broadcast is for the current order
+            String broadcastIdTrans = orderBundle.getString("id_transaksi");
+            if (broadcastIdTrans != null && !broadcastIdTrans.equals(idtrans)) return;
+            int code = orderBundle.getInt("code", -1);
+            if (code >= 0) {
+                response = String.valueOf(code);
+                orderHandler(code);
+            }
         }
     };
 
@@ -729,6 +737,9 @@ public class ProgressActivity extends AppCompatActivity
     }
 
     private void fcmcancel() {
+        if (regdriver == null || regdriver.trim().isEmpty()) {
+            return;
+        }
         DriverResponse response = new DriverResponse();
         response.type = ORDER;
         response.setIdTransaksi(idtrans);
@@ -738,7 +749,6 @@ public class ProgressActivity extends AppCompatActivity
         message.setTo(regdriver);
         message.setData(response);
 
-
         FCMHelper.sendMessage(message).enqueue(new okhttp3.Callback() {
             @Override
             public void onResponse(@NonNull okhttp3.Call call, @NonNull okhttp3.Response response) {
@@ -752,6 +762,9 @@ public class ProgressActivity extends AppCompatActivity
     }
 
     private void fcmcancelmerchant() {
+        if (tokenmerchant == null || tokenmerchant.trim().isEmpty()) {
+            return;
+        }
         DriverResponse response = new DriverResponse();
         response.type = ORDER;
         response.setIdTransaksi(idtrans);
@@ -761,7 +774,6 @@ public class ProgressActivity extends AppCompatActivity
         message.setTo(tokenmerchant);
         message.setData(response);
 
-
         FCMHelper.sendMessage(message).enqueue(new okhttp3.Callback() {
             @Override
             public void onResponse(@NonNull okhttp3.Call call, @NonNull okhttp3.Response response) {
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/PromoActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/PromoActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RateActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RateActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RegisterActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RegisterActivity.java
old mode 100644
new mode 100755
index 5dd528a..3ba76c5
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RegisterActivity.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RegisterActivity.java
@@ -67,7 +67,7 @@ import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.PhoneAuthCredential;
 import com.google.firebase.auth.PhoneAuthProvider;
-import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.messaging.FirebaseMessaging;
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
 import com.ybs.countrypicker.CountryPicker;
 import com.ybs.countrypicker.CountryPickerListener;
@@ -161,10 +161,17 @@ public class RegisterActivity extends AppCompatActivity {
         rlnotif2 = findViewById(R.id.rlnotif2);
         textnotif2 = findViewById(R.id.textnotif2);
         confirmButton = findViewById(R.id.buttonconfirm);
+        // FCM v1: async token via FirebaseMessaging.getToken()
         try {
-            token = FirebaseInstanceId.getInstance().getToken();
-        } catch (Exception e) {
-            Log.e("RegisterActivity", "Failed to get FirebaseInstanceId token; continuing without token", e);
+            FirebaseMessaging.getInstance().getToken().addOnCompleteListener(task -> {
+                if (task.isSuccessful() && task.getResult() != null && !task.getResult().isEmpty()) {
+                    token = task.getResult();
+                } else {
+                    token = null;
+                }
+            });
+        } catch (IllegalStateException e) {
+            Log.e("RegisterActivity", "FirebaseMessaging not available; token will be requested again on submit", e);
             token = null;
         }
         numOne = findViewById(R.id.numone);
@@ -830,48 +837,57 @@ public class RegisterActivity extends AppCompatActivity {
         request.setCountrycode(countryCode.getText().toString());
         request.setChecked(check);
 
+        // FCM v1: get token async then register (token is mandatory)
         try {
-            FirebaseInstanceId token = FirebaseInstanceId.getInstance();
-            request.setToken(token.getToken());
-        } catch (Exception e) {
-            Log.e("RegisterActivity", "Failed to get FirebaseInstanceId token; continuing without token", e);
-            request.setToken(null);
-        }
-
-        UserService service = ServiceGenerator.createService(UserService.class, request.getEmail(), request.getPassword());
-        service.register(request).enqueue(new Callback<RegisterResponseJson>() {
-            @Override
-            public void onResponse(@NonNull Call<RegisterResponseJson> call, @NonNull Response<RegisterResponseJson> response) {
-                progresshide();
-                if (response.isSuccessful()) {
-                    if (Objects.requireNonNull(response.body()).getMessage().equalsIgnoreCase("next")) {
-                        Nextbtn(viewFlipper);
-
-                    } else if (response.body().getMessage().equalsIgnoreCase("success")) {
-
-                        User user = response.body().getData().get(0);
-                        saveUser(user);
-                        registerPanic();
-                        Intent intent = new Intent(RegisterActivity.this, MainActivity.class);
-                        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
-                        startActivity(intent);
-                        finish();
-
-                    } else {
-                        notif(response.body().getMessage());
-                    }
+            FirebaseMessaging.getInstance().getToken().addOnCompleteListener(task -> {
+                if (task.isSuccessful() && task.getResult() != null && !task.getResult().isEmpty()) {
+                    request.setToken(task.getResult());
                 } else {
-                    notif("error");
+                    progresshide();
+                    Log.e("RegisterActivity", "FCM getToken failed for register: " + (task.getException() != null ? task.getException().getMessage() : "empty token"));
+                    notif(getString(R.string.fcm_token_required));
+                    return;
                 }
-            }
+                UserService service = ServiceGenerator.createService(UserService.class, request.getEmail(), request.getPassword());
+                service.register(request).enqueue(new Callback<RegisterResponseJson>() {
+                    @Override
+                    public void onResponse(@NonNull Call<RegisterResponseJson> call, @NonNull Response<RegisterResponseJson> response) {
+                        progresshide();
+                        if (response.isSuccessful()) {
+                            if (Objects.requireNonNull(response.body()).getMessage().equalsIgnoreCase("next")) {
+                                Nextbtn(viewFlipper);
 
-            @Override
-            public void onFailure(@NonNull Call<RegisterResponseJson> call, @NonNull Throwable t) {
-                progresshide();
-                t.printStackTrace();
-                notif("error!");
-            }
-        });
+                            } else if (response.body().getMessage().equalsIgnoreCase("success")) {
+
+                                User user = response.body().getData().get(0);
+                                saveUser(user);
+                                registerPanic();
+                                Intent intent = new Intent(RegisterActivity.this, MainActivity.class);
+                                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+                                startActivity(intent);
+                                finish();
+
+                            } else {
+                                notif(response.body().getMessage());
+                            }
+                        } else {
+                            notif("error");
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(@NonNull Call<RegisterResponseJson> call, @NonNull Throwable t) {
+                        progresshide();
+                        t.printStackTrace();
+                        notif("error!");
+                    }
+                });
+            });
+        } catch (IllegalStateException e) {
+            progresshide();
+            Log.e("RegisterActivity", "FirebaseMessaging not available; FCM token is required for register", e);
+            notif(getString(R.string.fcm_token_required));
+        }
     }
 
 
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RentCarActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RentCarActivity.java
old mode 100644
new mode 100755
index 2cd0992..3f65a62
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RentCarActivity.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RentCarActivity.java
@@ -844,6 +844,8 @@ public class RentCarActivity extends AppCompatActivity
             param.setLatitude(latitude);
             param.setLongitude(longitude);
             param.setFitur(fitur);
+            int radiusKm = new id.ontime.customer.utils.SettingPreference(this).getDriverSearchRadiusKm();
+            if (radiusKm > 0) param.setRadiusKm((double) radiusKm);
 
             service.getNearRide(param).enqueue(new Callback<GetNearRideCarResponseJson>() {
                 @Override
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RideCarActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RideCarActivity.java
old mode 100644
new mode 100755
index 0f20cca..f25dc93
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RideCarActivity.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/RideCarActivity.java
@@ -937,6 +937,8 @@ public class RideCarActivity extends AppCompatActivity
             param.setLatitude(latitude);
             param.setLongitude(longitude);
             param.setFitur(fitur);
+            int radiusKm = new id.ontime.customer.utils.SettingPreference(this).getDriverSearchRadiusKm();
+            if (radiusKm > 0) param.setRadiusKm((double) radiusKm);
 
             service.getNearRide(param).enqueue(new Callback<GetNearRideCarResponseJson>() {
                 @Override
@@ -990,49 +992,103 @@ public class RideCarActivity extends AppCompatActivity
     }
 
 
+    /**
+     * When driver list is empty, refetch nearby drivers once then proceed with order or show error.
+     * Uses pickup or last known location so drivers are found even if first fetch was slow or skipped.
+     */
+    private void refetchDriversThenOrder(final boolean useWallet) {
+        double lat = pickUpLatLang != null ? pickUpLatLang.latitude : (lastKnownLocation != null ? lastKnownLocation.getLatitude() : 0);
+        double lng = pickUpLatLang != null ? pickUpLatLang.longitude : (lastKnownLocation != null ? lastKnownLocation.getLongitude() : 0);
+        if (lat == 0 && lng == 0) {
+            notif("Aktifkan lokasi dan coba lagi.");
+            return;
+        }
+        rlprogress.setVisibility(View.VISIBLE);
+        textprogress.setText(getString(R.string.waiting_desc));
+        User loginUser = BaseApp.getInstance(this).getLoginUser();
+        final BookService service = ServiceGenerator.createService(BookService.class, loginUser.getEmail(), loginUser.getPassword());
+        GetNearRideCarRequestJson param = new GetNearRideCarRequestJson();
+        param.setLatitude(lat);
+        param.setLongitude(lng);
+        param.setFitur(fitur);
+        int radiusKm = new id.ontime.customer.utils.SettingPreference(this).getDriverSearchRadiusKm();
+        if (radiusKm > 0) param.setRadiusKm((double) radiusKm);
+        service.getNearRide(param).enqueue(new Callback<GetNearRideCarResponseJson>() {
+            @Override
+            public void onResponse(@NonNull Call<GetNearRideCarResponseJson> call, @NonNull Response<GetNearRideCarResponseJson> response) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        rlprogress.setVisibility(View.GONE);
+                        if (response.isSuccessful() && response.body() != null) {
+                            List<DriverModel> list = response.body().getData();
+                            if (list != null && !list.isEmpty()) {
+                                driverAvailable = list;
+                                createMarker();
+                                RideCarRequestJson req = buildOrderParam(useWallet);
+                                if (req != null) sendRequestTransaksi(req, driverAvailable);
+                            } else {
+                                notif("Maaf, tidak ada pengemudi di sekitar Anda.");
+                            }
+                        } else {
+                            notif("Maaf, tidak ada pengemudi di sekitar Anda.");
+                        }
+                    }
+                });
+            }
+
+            @Override
+            public void onFailure(@NonNull Call<GetNearRideCarResponseJson> call, @NonNull Throwable t) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        rlprogress.setVisibility(View.GONE);
+                        notif("Gagal mencari pengemudi. Periksa koneksi dan coba lagi.");
+                    }
+                });
+            }
+        });
+    }
+
+    private RideCarRequestJson buildOrderParam(boolean useWallet) {
+        if (pickUpLatLang == null || destinationLatLang == null) return null;
+        User userLogin = BaseApp.getInstance(this).getLoginUser();
+        RideCarRequestJson param = new RideCarRequestJson();
+        param.setIdPelanggan(userLogin.getId());
+        param.setOrderFitur(fitur);
+        param.setStartLatitude(pickUpLatLang.latitude);
+        param.setStartLongitude(pickUpLatLang.longitude);
+        param.setEndLatitude(destinationLatLang.latitude);
+        param.setEndLongitude(destinationLatLang.longitude);
+        param.setJarak(this.jarak);
+        param.setHarga(this.harga);
+        param.setEstimasi(fiturtext.getText().toString());
+        param.setAlamatAsal(pickUpText.getText().toString());
+        param.setAlamatTujuan(destinationText.getText().toString());
+        if (useWallet) {
+            param.setKreditpromo(String.valueOf((Double.parseDouble(biayaakhir) * this.harga) + promocode));
+            param.setPakaiWallet(1);
+        } else {
+            param.setKreditpromo(String.valueOf(promocode));
+            param.setPakaiWallet(0);
+        }
+        return param;
+    }
+
     private void onOrderButton() {
         if (checkedpaywallet.equals("1")) {
             if (driverAvailable.isEmpty()) {
-                notif("Maaf, tidak ada pengemudi di sekitar Anda.");
+                refetchDriversThenOrder(true);
             } else {
-                RideCarRequestJson param = new RideCarRequestJson();
-                User userLogin = BaseApp.getInstance(this).getLoginUser();
-                param.setIdPelanggan(userLogin.getId());
-                param.setOrderFitur(fitur);
-                param.setStartLatitude(pickUpLatLang.latitude);
-                param.setStartLongitude(pickUpLatLang.longitude);
-                param.setEndLatitude(destinationLatLang.latitude);
-                param.setEndLongitude(destinationLatLang.longitude);
-                param.setJarak(this.jarak);
-                param.setHarga(this.harga);
-                param.setEstimasi(fiturtext.getText().toString());
-                param.setKreditpromo(String.valueOf((Double.parseDouble(biayaakhir) * this.harga) + promocode));
-                param.setAlamatAsal(pickUpText.getText().toString());
-                param.setAlamatTujuan(destinationText.getText().toString());
-                param.setPakaiWallet(1);
-                sendRequestTransaksi(param, driverAvailable);
+                RideCarRequestJson param = buildOrderParam(true);
+                if (param != null) sendRequestTransaksi(param, driverAvailable);
             }
         } else {
             if (driverAvailable.isEmpty()) {
-                notif("Maaf, tidak ada pengemudi di sekitar Anda");
+                refetchDriversThenOrder(false);
             } else {
-                RideCarRequestJson param = new RideCarRequestJson();
-                User userLogin = BaseApp.getInstance(this).getLoginUser();
-                param.setIdPelanggan(userLogin.getId());
-                param.setOrderFitur(fitur);
-                param.setStartLatitude(pickUpLatLang.latitude);
-                param.setStartLongitude(pickUpLatLang.longitude);
-                param.setEndLatitude(destinationLatLang.latitude);
-                param.setEndLongitude(destinationLatLang.longitude);
-                param.setJarak(this.jarak);
-                param.setHarga(this.harga);
-                param.setEstimasi(fiturtext.getText().toString());
-                param.setKreditpromo(String.valueOf(promocode));
-                param.setAlamatAsal(pickUpText.getText().toString());
-                param.setAlamatTujuan(destinationText.getText().toString());
-                param.setPakaiWallet(0);
-
-                sendRequestTransaksi(param, driverAvailable);
+                RideCarRequestJson param = buildOrderParam(false);
+                if (param != null) sendRequestTransaksi(param, driverAvailable);
             }
         }
     }
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/SendActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/SendActivity.java
old mode 100644
new mode 100755
index a7b1dda..60f1b8f
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/SendActivity.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/SendActivity.java
@@ -701,6 +701,8 @@ public class SendActivity extends AppCompatActivity
             param.setLatitude(latitude);
             param.setLongitude(longitude);
             param.setFitur(fitur);
+            int radiusKm = new id.ontime.customer.utils.SettingPreference(this).getDriverSearchRadiusKm();
+            if (radiusKm > 0) param.setRadiusKm((double) radiusKm);
 
             service.getNearRide(param).enqueue(new Callback<GetNearRideCarResponseJson>() {
                 @Override
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/SendDetailActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/SendDetailActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/SplashActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/SplashActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/TopUpBpjsActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/TopUpBpjsActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/TopUpPlnActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/TopUpPlnActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/TopUpPulsaActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/TopUpPulsaActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/TopupSaldoActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/TopupSaldoActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/TopupviewActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/TopupviewActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/WalletActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/WalletActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/WithdrawActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/activity/WithdrawActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/adapter/CityAdapter.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/adapter/CityAdapter.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/adapter/ExpedisiAdapter.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/adapter/ExpedisiAdapter.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/adapter/ProvinceAdapter.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/adapter/ProvinceAdapter.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/api/ApiService.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/api/ApiService.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/api/ApiUrl.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/api/ApiUrl.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/BaseApp.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/BaseApp.java
old mode 100644
new mode 100755
index 6f30a75..ad3d1ad
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/BaseApp.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/BaseApp.java
@@ -8,7 +8,6 @@ import androidx.multidex.MultiDex;
 import id.ontime.customer.models.FirebaseToken;
 import id.ontime.customer.models.User;
 import com.google.firebase.FirebaseApp;
-import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.messaging.FirebaseMessaging;
 
 import io.realm.Realm;
@@ -42,24 +41,29 @@ public class BaseApp extends Application {
 //        realmInstance = Realm.getInstance(config);
         realmInstance = Realm.getDefaultInstance();
 
-        // Best-effort Firebase initialization and token registration.
-        // If Firebase is not configured for this build, ignore failures so the app can still run.
+        // FCM v1: async token fetch and topic subscribe (reference: test app LoginActivity).
         try {
             FirebaseApp app = FirebaseApp.initializeApp(this);
             if (app != null) {
-                String fcmToken = FirebaseInstanceId.getInstance().getToken();
-                if (fcmToken != null) {
-                    FirebaseToken token = new FirebaseToken(fcmToken);
-                    FirebaseMessaging.getInstance().subscribeToTopic("pelanggan");
-
-                    realmInstance.beginTransaction();
-                    realmInstance.delete(FirebaseToken.class);
-                    realmInstance.copyToRealm(token);
-                    realmInstance.commitTransaction();
-                }
+                FirebaseMessaging.getInstance().getToken()
+                        .addOnCompleteListener(task -> {
+                            if (task.isSuccessful() && task.getResult() != null && !task.getResult().isEmpty()) {
+                                String fcmToken = task.getResult();
+                                FirebaseToken token = new FirebaseToken(fcmToken);
+                                FirebaseMessaging.getInstance().subscribeToTopic("pelanggan");
+                                try {
+                                    realmInstance.beginTransaction();
+                                    realmInstance.delete(FirebaseToken.class);
+                                    realmInstance.copyToRealm(token);
+                                    realmInstance.commitTransaction();
+                                } catch (Exception e) {
+                                    if (realmInstance.isInTransaction()) realmInstance.cancelTransaction();
+                                    e.printStackTrace();
+                                }
+                            }
+                        });
             }
         } catch (IllegalStateException e) {
-            // Firebase not initialized / misconfigured for this build; skip FCM registration in debug.
             e.printStackTrace();
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/Constants.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/Constants.java
old mode 100644
new mode 100755
index 583dee2..7290f8d
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/Constants.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/Constants.java
@@ -7,6 +7,7 @@ import java.util.Locale;
 
 public class Constants {
 
+    /** Test backend API base URL (api/, notification/send_generic, etc.). */
     private static final String BASE_URL = "https://apitest.semestaterpadu.my.id/";
     public static final String URL = "https://panic.on-time.id/"; //panicButton
     public static final String CONNECTION = BASE_URL + "api/";
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/Functions.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/Functions.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/TopUpType.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/TopUpType.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/VersionChecker.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/constants/VersionChecker.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/EnableLlocationFragment.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/EnableLlocationFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/FavouriteFragment.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/FavouriteFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/FullImageFragment.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/FullImageFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/HistoryFragment.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/HistoryFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/HomeFragment.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/HomeFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/MessageFragment.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/MessageFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/PlayAudioFragment.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/PlayAudioFragment.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/ProfileFragment.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/ProfileFragment.java
old mode 100644
new mode 100755
index a030c4f..2f396fd
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/ProfileFragment.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/fragment/ProfileFragment.java
@@ -61,7 +61,7 @@ import static android.content.Context.NOTIFICATION_SERVICE;
 public class ProfileFragment extends Fragment {
     private Context context;
     private ImageView foto;
-    private TextView nama, email,countryCode, phone, saldo;
+    private TextView nama, email, countryCode, phone, saldo, driverRadiusSummary;
     private SettingPreference sp;
     private String saldoWallet;
  //   public static final String URL = "http://peci.semestaterpadu.my.id/";
@@ -84,8 +84,13 @@ public class ProfileFragment extends Fragment {
         LinearLayout logout = getView.findViewById(R.id.lllogout);
         LinearLayout llpassword = getView.findViewById(R.id.llpassword);
         LinearLayout topUp = getView.findViewById(R.id.topUp);
+        LinearLayout llDriverRadius = getView.findViewById(R.id.lldriverradius);
+        driverRadiusSummary = getView.findViewById(R.id.driver_radius_summary);
         sp = new SettingPreference(context);
 
+        updateDriverRadiusSummary();
+        llDriverRadius.setOnClickListener(v -> showDriverRadiusDialog());
+
 
         privacy.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -171,10 +176,45 @@ public class ProfileFragment extends Fragment {
             }
         });
 
-
         return getView;
     }
 
+    private void updateDriverRadiusSummary() {
+        int km = sp.getDriverSearchRadiusKm();
+        driverRadiusSummary.setText(km <= 0 ? getString(R.string.default_label) : km + " km");
+    }
+
+    private void showDriverRadiusDialog() {
+        final String[] options = new String[]{
+                getString(R.string.default_label),
+                "5 km",
+                "10 km",
+                "15 km",
+                "20 km",
+                "30 km",
+                "50 km"
+        };
+        final int[] values = new int[]{0, 5, 10, 15, 20, 30, 50};
+        int current = sp.getDriverSearchRadiusKm();
+        int selected = 0;
+        for (int i = 0; i < values.length; i++) {
+            if (values[i] == current) {
+                selected = i;
+                break;
+            }
+        }
+        new AlertDialog.Builder(context)
+                .setTitle(R.string.driver_radius_title)
+                .setSingleChoiceItems(options, selected, (dialog, which) -> {
+                    sp.setDriverSearchRadiusKm(values[which]);
+                    updateDriverRadiusSummary();
+                    Toast.makeText(context, getString(R.string.driver_radius_saved), Toast.LENGTH_SHORT).show();
+                    dialog.dismiss();
+                })
+                .setNegativeButton(android.R.string.cancel, null)
+                .show();
+    }
+
     private void clickDone() {
         new AlertDialog.Builder(context)
                 .setIcon(R.mipmap.ic_launcher)
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/Direction.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/Direction.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/GMapDirection.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/GMapDirection.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Bound.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Bound.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Directions.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Directions.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Distance.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Distance.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Duration.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Duration.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Leg.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Leg.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Route.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Route.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Step.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/gmap/directions/Step.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/AllFiturItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/AllFiturItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/AllMerchantNearItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/AllMerchantNearItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/BankItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/BankItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/BeritaItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/BeritaItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/CatItemItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/CatItemItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/CatMerchantItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/CatMerchantItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/CatMerchantNearItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/CatMerchantNearItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/FavouriteItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/FavouriteItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/FiturItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/FiturItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/HistoryItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/HistoryItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/ItemChat.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/ItemChat.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/ItemItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/ItemItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/ItemPesananItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/ItemPesananItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/MerchantItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/MerchantItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/MerchantNearItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/MerchantNearItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/MessageItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/MessageItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/PromoItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/PromoItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/RatingItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/RatingItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/SliderItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/SliderItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/TopUpBPJSHistoryItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/TopUpBPJSHistoryItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/TopUpItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/TopUpItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/TopUpPlnHistoryItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/TopUpPlnHistoryItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/item/WalletItem.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/item/WalletItem.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/AllItemByCatResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/AllItemByCatResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/AllMerchantByNearResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/AllMerchantByNearResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/AllMerchantbyCatRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/AllMerchantbyCatRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/AllTransResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/AllTransResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/BankResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/BankResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/BeritaDetailRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/BeritaDetailRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/BeritaDetailResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/BeritaDetailResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/ChangePassRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/ChangePassRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/CheckStatusTransaksiRequest.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/CheckStatusTransaksiRequest.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/CheckStatusTransaksiResponse.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/CheckStatusTransaksiResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/DetailRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/DetailRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/DetailTransResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/DetailTransResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/EditprofileRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/EditprofileRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetAllMerchantbyCatRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetAllMerchantbyCatRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetFiturResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetFiturResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetHomeRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetHomeRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetHomeResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetHomeResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetMerchantbyCatRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetMerchantbyCatRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetNearRideCarRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetNearRideCarRequestJson.java
old mode 100644
new mode 100755
index 4798f77..904d1f8
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetNearRideCarRequestJson.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetNearRideCarRequestJson.java
@@ -21,6 +21,11 @@ public class GetNearRideCarRequestJson {
     @SerializedName("fitur")
     private String fitur;
 
+    /** Optional: search radius in km (1–100). If null/0, server uses default. */
+    @Expose
+    @SerializedName("radius_km")
+    private Double radiusKm;
+
     public double getLatitude() {
         return latitude;
     }
@@ -44,4 +49,12 @@ public class GetNearRideCarRequestJson {
     public void setFitur(String fitur) {
         this.fitur = fitur;
     }
+
+    public Double getRadiusKm() {
+        return radiusKm;
+    }
+
+    public void setRadiusKm(Double radiusKm) {
+        this.radiusKm = radiusKm;
+    }
 }
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetNearRideCarResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/GetNearRideCarResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/ItemRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/ItemRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/LoginRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/LoginRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/LoginResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/LoginResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/LokasiDriverRequest.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/LokasiDriverRequest.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/LokasiDriverResponse.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/LokasiDriverResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MerchantByCatResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MerchantByCatResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MerchantByIdResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MerchantByIdResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MerchantByNearResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MerchantByNearResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MerchantbyIdRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MerchantbyIdRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobilePulsaHealthBPJSBaseResponse.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobilePulsaHealthBPJSBaseResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobilePulsaHealthBPJSDesc.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobilePulsaHealthBPJSDesc.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobilePulsaHealthBPJSResponseModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobilePulsaHealthBPJSResponseModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobilePulsaPLNCheckResponse.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobilePulsaPLNCheckResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobilePulsaPlnDetailResponse.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobilePulsaPlnDetailResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobileTopUpDetailResponseModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobileTopUpDetailResponseModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobileTopUpPostPaidStatusJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobileTopUpPostPaidStatusJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobileTopUpRequestModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobileTopUpRequestModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobileTopUpResponseModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/MobileTopUpResponseModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/PrivacyRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/PrivacyRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/PrivacyResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/PrivacyResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/PromoRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/PromoRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/PromoResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/PromoResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RateRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RateRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RateResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RateResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RegisterRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RegisterRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RegisterResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RegisterResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/ResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/ResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RideCarRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RideCarRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RideCarResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/RideCarResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/SearchBeritaRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/SearchBeritaRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/SearchMerchantbyCatRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/SearchMerchantbyCatRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/SendRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/SendRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/SendResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/SendResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/TopUpBaseResponse.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/TopUpBaseResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/TopUpRequestResponse.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/TopUpRequestResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/TopupRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/TopupRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/TopupResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/TopupResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/WalletRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/WalletRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/WalletResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/WalletResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/WithdrawRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/WithdrawRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/XenditItemDetailRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/XenditItemDetailRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/XenditPaymentRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/XenditPaymentRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/CancelBookRequestJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/CancelBookRequestJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/CancelBookResponseJson.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/CancelBookResponseJson.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/DriverMSendRequest.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/DriverMSendRequest.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/DriverRequest.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/DriverRequest.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/DriverResponse.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/DriverResponse.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/FCMMessage.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/FCMMessage.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/FCMType.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/json/fcm/FCMType.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/AllFiturModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/AllFiturModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/AllTransaksiModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/AllTransaksiModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/BankModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/BankModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/BeritaModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/BeritaModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/CatItemModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/CatItemModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/CatMerchantModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/CatMerchantModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/CatModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/CatModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/Chat.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/Chat.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/ChatModels.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/ChatModels.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/DiskonWalletModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/DiskonWalletModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/DriverModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/DriverModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/FavouriteModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/FavouriteModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/FirebaseToken.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/FirebaseToken.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/FiturDataModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/FiturDataModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/FiturModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/FiturModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/ItemHistoryModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/ItemHistoryModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/ItemModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/ItemModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/ItemPesananModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/ItemPesananModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/KodePromoModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/KodePromoModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/LokasiDriverModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/LokasiDriverModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/MerchantModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/MerchantModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/MerchantNearModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/MerchantNearModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/MessageModels.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/MessageModels.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/Notif.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/Notif.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/PesananMerchant.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/PesananMerchant.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/PromoModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/PromoModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/RatingModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/RatingModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/SettingsModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/SettingsModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/StatusTransaksiModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/StatusTransaksiModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/TransaksiModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/TransaksiModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/TransaksiSendModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/TransaksiSendModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/User.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/User.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/WalletModel.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/WalletModel.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/city/ItemCity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/city/ItemCity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/city/Query.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/city/Query.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/city/Rajaongkir.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/city/Rajaongkir.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/city/Result.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/city/Result.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/city/Status.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/city/Status.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Cost.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Cost.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Cost_.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Cost_.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/DestinationDetails.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/DestinationDetails.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/ItemCost.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/ItemCost.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/OriginDetails.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/OriginDetails.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Query.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Query.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Rajaongkir.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Rajaongkir.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Result.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Result.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Status.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/cost/Status.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/expedisi/ItemExpedisi.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/expedisi/ItemExpedisi.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/province/ItemProvince.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/province/ItemProvince.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/province/Rajaongkir.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/province/Rajaongkir.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/province/Result.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/province/Result.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/models/province/Status.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/models/province/Status.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/ActiveButtonActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/ActiveButtonActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/ChangePasswordPanicActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/ChangePasswordPanicActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/InfoPanicActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/InfoPanicActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/LoginPanicActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/LoginPanicActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/PanicButtonActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/PanicButtonActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/ProfileMenuActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/ProfileMenuActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/RegisterPanicActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/RegisterPanicActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/SettingsMenuActivity.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/SettingsMenuActivity.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/ChangePasswordAPI.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/ChangePasswordAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/GetNotifAPI.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/GetNotifAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/LoginAPI.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/LoginAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/LogoutAPI.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/LogoutAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/RegisterAPI.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/RegisterAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/SaveProfileInfoAPI.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/SaveProfileInfoAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/SendHelpRequestAPI.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/SendHelpRequestAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/SendMessageAPI.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/SendMessageAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/ShowProfileInfoAPI.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/ShowProfileInfoAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/StopAlarmAPI.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/api/StopAlarmAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/model/Value.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/panicbutton/model/Value.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/AppIntroPagerAdapter.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/AppIntroPagerAdapter.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/BooleanSerializerDeserializer.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/BooleanSerializerDeserializer.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/DatabaseHelper.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/DatabaseHelper.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/Log.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/Log.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/MapsUtils.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/MapsUtils.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/NetworkManager.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/NetworkManager.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/NetworkUtils.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/NetworkUtils.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/PhoneProviderHelper.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/PhoneProviderHelper.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/PicassoTrustAll.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/PicassoTrustAll.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/ProjectUtils.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/ProjectUtils.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/SendAudio.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/SendAudio.java
old mode 100644
new mode 100755
index 1bf553a..5632899
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/SendAudio.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/SendAudio.java
@@ -259,7 +259,7 @@ public class SendAudio {
                                         chat.tokenuser = tokenku;
                                         chat.isdriver = "0";
                                         chat.message = "Send Audio...\uD83C\uDFA4";
-                                        sendMessageToDriver(tokenku, chat);
+                                        sendMessageToDriver(tokendriver, chat);
 
                                     }
                                 });
@@ -332,7 +332,9 @@ public class SendAudio {
     }
 
     private void sendMessageToDriver(final String regIDTujuan, final Chat chat) {
-
+        if (regIDTujuan == null || regIDTujuan.trim().isEmpty()) {
+            return;
+        }
         final FCMMessage message = new FCMMessage();
         message.setTo(regIDTujuan);
         message.setData(chat);
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/SettingPreference.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/SettingPreference.java
old mode 100644
new mode 100755
index 6de22ea..3bb816e
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/SettingPreference.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/SettingPreference.java
@@ -30,6 +30,8 @@ public class SettingPreference {
     private static String CURRENCYTEXT = "CURRENCYTEXT";
     private static String PLN_LIST_PAID_SUCCESS ="SUCCESSPAIDLIST";
     private static String BPJS_LIST_PAID_SUCCESS = "SUCCESSBPJS";
+    /** Driver search radius in km (0 = use server default). 1–100. */
+    private static String DRIVER_SEARCH_RADIUS_KM = "DRIVER_SEARCH_RADIUS_KM";
 
     private SharedPreferences pref;
 
@@ -155,4 +157,16 @@ public class SettingPreference {
         settingan[13] = pref.getString(KOINTEXT, "");
         return settingan;
     }
+
+    /** Get driver search radius in km. 0 = use server default. */
+    public int getDriverSearchRadiusKm() {
+        return pref.getInt(DRIVER_SEARCH_RADIUS_KM, 0);
+    }
+
+    /** Set driver search radius in km. 0 = default, 1–100 = user choice. */
+    public void setDriverSearchRadiusKm(int km) {
+        editor = pref.edit();
+        editor.putInt(DRIVER_SEARCH_RADIUS_KM, Math.max(0, Math.min(100, km)));
+        editor.apply();
+    }
 }
\ No newline at end of file
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/SharedPrefrence.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/SharedPrefrence.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/Utility.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/Utility.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/FCMHelper.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/FCMHelper.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/MapDirectionAPI.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/MapDirectionAPI.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/MobilePulsaApiHelper.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/MobilePulsaApiHelper.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/ServiceGenerator.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/ServiceGenerator.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/service/ApiListener.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/service/ApiListener.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/service/BookService.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/service/BookService.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/service/MessagingService.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/service/MessagingService.java
old mode 100644
new mode 100755
index 2d80fae..54c6368
--- a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/service/MessagingService.java
+++ b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/service/MessagingService.java
@@ -23,12 +23,15 @@ import id.ontime.customer.activity.ProgressActivity;
 import id.ontime.customer.activity.SplashActivity;
 import id.ontime.customer.constants.BaseApp;
 import id.ontime.customer.json.fcm.DriverResponse;
+import id.ontime.customer.models.FirebaseToken;
 import id.ontime.customer.models.User;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
 import org.greenrobot.eventbus.EventBus;
 
+import io.realm.Realm;
+
 import java.util.Map;
 import java.util.Objects;
 
@@ -36,7 +39,6 @@ import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 
 
-@SuppressLint("MissingFirebaseInstanceTokenRefresh")
 public class MessagingService extends FirebaseMessagingService {
     public static final String BROADCAST_ACTION = "id.ontime.customer";
     public static final String BROADCAST_ORDER = "order";
@@ -50,45 +52,73 @@ public class MessagingService extends FirebaseMessagingService {
         intentOrder = new Intent(BROADCAST_ORDER);
     }
 
+    /** FCM v1: when token is refreshed, persist and notify (reference: test app). */
+    @Override
+    public void onNewToken(@NonNull String token) {
+        super.onNewToken(token);
+        try {
+            FirebaseToken t = new FirebaseToken(token);
+            Realm realm = BaseApp.getInstance(this).getRealmInstance();
+            realm.executeTransaction(r -> {
+                r.delete(FirebaseToken.class);
+                r.copyToRealm(t);
+            });
+            EventBus.getDefault().postSticky(t);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 
     @RequiresApi(api = Build.VERSION_CODES.M)
     @Override
     public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
         super.onMessageReceived(remoteMessage);
+        if (remoteMessage.getData() == null || remoteMessage.getData().isEmpty()) {
+            return;
+        }
         User user = BaseApp.getInstance(this).getLoginUser();
-        if (!remoteMessage.getData().isEmpty() && user != null) {
+        if (user != null) {
             parseAndSendMessage(remoteMessage.getData());
-
         }
         messageHandler(remoteMessage);
     }
 
     private void parseAndSendMessage(Map<String, String> mapResponse) {
-        if (Objects.requireNonNull(mapResponse.get("type")).equals("1")) {
-            DriverResponse response = new DriverResponse();
-            response.setId(mapResponse.get("id_driver"));
-            response.setIdTransaksi(mapResponse.get("id_transaksi"));
-            response.setResponse(mapResponse.get("response"));
-            EventBus.getDefault().postSticky(response);
+        String type = mapResponse.get("type");
+        if (type == null || !type.equals("1")) {
+            return;
         }
-
+        DriverResponse response = new DriverResponse();
+        response.setId(mapResponse.get("id_driver"));
+        response.setIdTransaksi(mapResponse.get("id_transaksi"));
+        response.setResponse(mapResponse.get("response"));
+        EventBus.getDefault().postSticky(response);
     }
 
 
     @RequiresApi(api = Build.VERSION_CODES.M)
     private void messageHandler(RemoteMessage remoteMessage) {
+        Map<String, String> data = remoteMessage.getData();
+        if (data == null) {
+            return;
+        }
+        String type = data.get("type");
+        if (type == null) {
+            return;
+        }
         User user = BaseApp.getInstance(this).getLoginUser();
-        if (Objects.requireNonNull(remoteMessage.getData().get("type")).equals("1")) {
+        if (type.equals("1")) {
             if (user != null) {
                 orderHandler(remoteMessage);
             }
-        } else if (Objects.requireNonNull(remoteMessage.getData().get("type")).equals("3")) {
+        } else if (type.equals("3")) {
             if (user != null) {
                 otherHandler(remoteMessage);
             }
-        } else if (Objects.requireNonNull(remoteMessage.getData().get("type")).equals("4")) {
+        } else if (type.equals("4")) {
             otherHandler2(remoteMessage);
-        } else if (Objects.requireNonNull(remoteMessage.getData().get("type")).equals("2")) {
+        } else if (type.equals("2")) {
             if (user != null) {
                 chat(remoteMessage);
             }
@@ -163,18 +193,29 @@ public class MessagingService extends FirebaseMessagingService {
 
     @RequiresApi(api = Build.VERSION_CODES.M)
     private void orderHandler(RemoteMessage remoteMessage) {
+        Map<String, String> fcmData = remoteMessage.getData();
         Bundle data = new Bundle();
+        String responseStr = fcmData != null ? fcmData.get("response") : null;
+        if (responseStr != null) {
+            try {
+                data.putInt("code", Integer.parseInt(responseStr));
+            } catch (NumberFormatException ignored) {
+            }
+            data.putString("response", responseStr);
+            data.putString("id_transaksi", fcmData.get("id_transaksi"));
+            data.putString("id_driver", fcmData.get("id_driver"));
+        }
         intentToOrder(data);
 
-        if (Objects.equals(remoteMessage.getData().get("response"), "5")) {
+        if (Objects.equals(responseStr, "5")) {
             notificationOrderBuilderCancel(remoteMessage);
-        } else if (Objects.equals(remoteMessage.getData().get("response"), "2")) {
+        } else if (Objects.equals(responseStr, "2")) {
             playSound1();
             notificationOrderBuilderAccept(remoteMessage);
-        } else if (Objects.equals(remoteMessage.getData().get("response"), "3")) {
+        } else if (Objects.equals(responseStr, "3")) {
             playSound1();
             notificationOrderBuilderStart(remoteMessage);
-        } else if (Objects.equals(remoteMessage.getData().get("response"), "4")) {
+        } else if (Objects.equals(responseStr, "4")) {
             playSound1();
             notificationOrderBuilderFinish(remoteMessage);
         }
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/service/UserService.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/api/service/UserService.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/local_interface/OnBpjsItemClick.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/local_interface/OnBpjsItemClick.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/local_interface/OnItemClicked.java b/OnTime_User_live/app/src/main/java/id/ontime/customer/utils/local_interface/OnItemClicked.java
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/anim/from_left.xml b/OnTime_User_live/app/src/main/res/anim/from_left.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/anim/from_right.xml b/OnTime_User_live/app/src/main/res/anim/from_right.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/anim/indicator_animator.xml b/OnTime_User_live/app/src/main/res/anim/indicator_animator.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/anim/slide_in_bottom.xml b/OnTime_User_live/app/src/main/res/anim/slide_in_bottom.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/anim/slide_out_bottom.xml b/OnTime_User_live/app/src/main/res/anim/slide_out_bottom.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/anim/to_left.xml b/OnTime_User_live/app/src/main/res/anim/to_left.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/anim/to_right.xml b/OnTime_User_live/app/src/main/res/anim/to_right.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/color/selector.xml b/OnTime_User_live/app/src/main/res/color/selector.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/bg.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/bg.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/bpjs.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/bpjs.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_action_name.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_action_name.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_back.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_camera.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_cancel.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_cart.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_cart.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_chat.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_checklist.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_checklist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_coin.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_coin.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_destination.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_detailwallet.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_edit.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_editlist.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_email.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_favourite.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_favourite.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_favourites.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_favourites.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_gallery.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_home.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_home_s.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_kalender.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_lock.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_logoutlist.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_love.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_love.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_mic.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_more.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_more.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_pesan.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_pesan_s.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_phone.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_pickup.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_privacylist.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_profil.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_profil_s.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_profile.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_profile.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_promo.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_promo.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_ratelist.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_send.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_sharelist.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_topup.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_transaksi.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_transaksi_s.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_user.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_wa.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_wa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_wallet.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_wallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_web.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_withdraw.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/indihome.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/indihome.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/logo.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/pdam.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/pdam.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/pln.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/pln.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-hdpi/pulsa.png b/OnTime_User_live/app/src/main/res/drawable-hdpi/pulsa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/bg.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/bg.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/bpjs.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/bpjs.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_action_name.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_action_name.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_back.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_camera.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_cancel.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_cart.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_cart.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_chat.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_checklist.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_checklist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_coin.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_coin.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_destination.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_detailwallet.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_edit.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_editlist.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_email.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_favourite.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_favourite.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_favourites.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_favourites.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_gallery.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_home.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_home_s.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_kalender.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_lock.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_logoutlist.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_love.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_love.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_mic.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_more.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_more.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_pesan.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_pesan_s.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_phone.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_pickup.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_privacylist.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_profil.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_profil_s.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_profile.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_profile.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_promo.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_promo.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_ratelist.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_send.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_sharelist.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_topup.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_transaksi.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_transaksi_s.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_user.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_wa.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_wa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_wallet.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_wallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_web.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_withdraw.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/indihome.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/indihome.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/logo.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/pdam.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/pdam.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/pln.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/pln.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-mdpi/pulsa.png b/OnTime_User_live/app/src/main/res/drawable-mdpi/pulsa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/bg.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/bg.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/bpjs.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/bpjs.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_action_name.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_action_name.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_back.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_camera.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_cancel.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_cart.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_cart.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_chat.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_checklist.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_checklist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_coin.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_coin.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_destination.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_detailwallet.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_edit.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_editlist.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_email.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_favourite.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_favourite.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_favourites.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_favourites.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_gallery.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_home.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_home_s.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_kalender.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_lock.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_logoutlist.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_love.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_love.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_mic.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_more.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_more.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_pesan.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_pesan_s.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_phone.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_pickup.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_privacylist.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_profil.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_profil_s.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_profile.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_profile.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_promo.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_promo.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_ratelist.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_send.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_sharelist.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_topup.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_transaksi.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_transaksi_s.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_user.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_wa.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_wa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_wallet.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_wallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_web.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_withdraw.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/indihome.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/indihome.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/logo.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/pdam.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/pdam.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/pln.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/pln.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xhdpi/pulsa.png b/OnTime_User_live/app/src/main/res/drawable-xhdpi/pulsa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/bg.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/bg.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/bpjs.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/bpjs.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_action_name.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_action_name.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_back.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_camera.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_cancel.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_cart.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_cart.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_chat.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_checklist.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_checklist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_coin.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_coin.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_destination.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_detailwallet.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_edit.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_editlist.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_email.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_favourite.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_favourite.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_favourites.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_favourites.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_gallery.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_home.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_home_s.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_kalender.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_lock.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_logoutlist.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_love.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_love.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_mic.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_more.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_more.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_pesan.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_pesan_s.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_phone.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_pickup.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_privacylist.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_profil.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_profil_s.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_profile.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_profile.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_promo.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_promo.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_ratelist.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_send.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_sharelist.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_topup.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_transaksi.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_transaksi_s.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_user.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_wa.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_wa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_wallet.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_wallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_web.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_withdraw.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/indihome.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/indihome.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/logo.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/pdam.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/pdam.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/pln.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/pln.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxhdpi/pulsa.png b/OnTime_User_live/app/src/main/res/drawable-xxhdpi/pulsa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/bg.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/bg.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/bpjs.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/bpjs.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_back.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_back.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_camera.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_camera.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_cancel.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_cancel.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_cart.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_cart.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_chat.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_checklist.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_checklist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_coin.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_coin.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_destination.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_detailwallet.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_detailwallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_edit.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_edit.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_editlist.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_editlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_email.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_email.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_favourite.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_favourite.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_favourites.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_favourites.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_gallery.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_gallery.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_home.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_home.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_home_s.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_home_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_kalender.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_kalender.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_lock.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_lock.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_logoutlist.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_logoutlist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_love.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_love.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_mic.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_mic.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_more.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_more.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_pesan.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_pesan.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_pesan_s.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_pesan_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_phone.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_phone.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_pickup.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_privacylist.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_privacylist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_profil.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_profil.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_profil_s.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_profil_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_profile.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_profile.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_promo.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_promo.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_ratelist.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_ratelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_send.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_send.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_sharelist.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_sharelist.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_topup.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_topup.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi_s.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_transaksi_s.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_user.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_user.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_wa.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_wa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_wallet.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_wallet.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_web.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_web.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_withdraw.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/ic_withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/indihome.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/indihome.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/logo.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/pdam.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/pdam.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/pln.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/pln.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/pulsa.png b/OnTime_User_live/app/src/main/res/drawable-xxxhdpi/pulsa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/atm.png b/OnTime_User_live/app/src/main/res/drawable/atm.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/background_chat.png b/OnTime_User_live/app/src/main/res/drawable/background_chat.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/background_chat_other.xml b/OnTime_User_live/app/src/main/res/drawable/background_chat_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/background_my_chat.xml b/OnTime_User_live/app/src/main/res/drawable/background_my_chat.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/backgroundabout.jpg b/OnTime_User_live/app/src/main/res/drawable/backgroundabout.jpg
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/backgroundabout2.png b/OnTime_User_live/app/src/main/res/drawable/backgroundabout2.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/backrouddrawable.xml b/OnTime_User_live/app/src/main/res/drawable/backrouddrawable.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/bajaj.png b/OnTime_User_live/app/src/main/res/drawable/bajaj.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/banktransfer.png b/OnTime_User_live/app/src/main/res/drawable/banktransfer.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/bg_border.xml b/OnTime_User_live/app/src/main/res/drawable/bg_border.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/bg_border_circle.xml b/OnTime_User_live/app/src/main/res/drawable/bg_border_circle.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/bg_card_2.xml b/OnTime_User_live/app/src/main/res/drawable/bg_card_2.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/bg_gradient_top.xml b/OnTime_User_live/app/src/main/res/drawable/bg_gradient_top.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/bg_home.xml b/OnTime_User_live/app/src/main/res/drawable/bg_home.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/bg_home_curve.xml b/OnTime_User_live/app/src/main/res/drawable/bg_home_curve.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/bg_home_wave.xml b/OnTime_User_live/app/src/main/res/drawable/bg_home_wave.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/bicycle.png b/OnTime_User_live/app/src/main/res/drawable/bicycle.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/bpjs.png b/OnTime_User_live/app/src/main/res/drawable/bpjs.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/btn_bordered.xml b/OnTime_User_live/app/src/main/res/drawable/btn_bordered.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/btn_min.xml b/OnTime_User_live/app/src/main/res/drawable/btn_min.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/btn_plus.xml b/OnTime_User_live/app/src/main/res/drawable/btn_plus.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/btn_rect.xml b/OnTime_User_live/app/src/main/res/drawable/btn_rect.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/btn_rect_red.xml b/OnTime_User_live/app/src/main/res/drawable/btn_rect_red.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/btn_stroke.xml b/OnTime_User_live/app/src/main/res/drawable/btn_stroke.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/burst.png b/OnTime_User_live/app/src/main/res/drawable/burst.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/button_del.xml b/OnTime_User_live/app/src/main/res/drawable/button_del.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/button_round_1.xml b/OnTime_User_live/app/src/main/res/drawable/button_round_1.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/button_round_2.xml b/OnTime_User_live/app/src/main/res/drawable/button_round_2.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/carmap.png b/OnTime_User_live/app/src/main/res/drawable/carmap.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/changepass.png b/OnTime_User_live/app/src/main/res/drawable/changepass.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/chip.png b/OnTime_User_live/app/src/main/res/drawable/chip.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/custom_left_arrow.xml b/OnTime_User_live/app/src/main/res/drawable/custom_left_arrow.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/delip_gradient.xml b/OnTime_User_live/app/src/main/res/drawable/delip_gradient.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/delivery.png b/OnTime_User_live/app/src/main/res/drawable/delivery.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/destination.png b/OnTime_User_live/app/src/main/res/drawable/destination.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/diners_club.png b/OnTime_User_live/app/src/main/res/drawable/diners_club.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/drivermap.png b/OnTime_User_live/app/src/main/res/drawable/drivermap.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/edit_text_rounded.xml b/OnTime_User_live/app/src/main/res/drawable/edit_text_rounded.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/fitur.png b/OnTime_User_live/app/src/main/res/drawable/fitur.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/gray_rect.xml b/OnTime_User_live/app/src/main/res/drawable/gray_rect.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/hatchback.png b/OnTime_User_live/app/src/main/res/drawable/hatchback.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_add_circle_outline.xml b/OnTime_User_live/app/src/main/res/drawable/ic_add_circle_outline.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_alarm1.png b/OnTime_User_live/app/src/main/res/drawable/ic_alarm1.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_arrow_back.xml b/OnTime_User_live/app/src/main/res/drawable/ic_arrow_back.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_arrow_right_24.xml b/OnTime_User_live/app/src/main/res/drawable/ic_arrow_right_24.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_bank.xml b/OnTime_User_live/app/src/main/res/drawable/ic_bank.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_beranda.xml b/OnTime_User_live/app/src/main/res/drawable/ic_beranda.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_bg_topheader.xml b/OnTime_User_live/app/src/main/res/drawable/ic_bg_topheader.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_bookmark_24.xml b/OnTime_User_live/app/src/main/res/drawable/ic_bookmark_24.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_center_focus_weak.xml b/OnTime_User_live/app/src/main/res/drawable/ic_center_focus_weak.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_coin.xml b/OnTime_User_live/app/src/main/res/drawable/ic_coin.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_content_copy_24.xml b/OnTime_User_live/app/src/main/res/drawable/ic_content_copy_24.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_cross.xml b/OnTime_User_live/app/src/main/res/drawable/ic_cross.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_games.xml b/OnTime_User_live/app/src/main/res/drawable/ic_games.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_icon_history.xml b/OnTime_User_live/app/src/main/res/drawable/ic_icon_history.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_info_24.xml b/OnTime_User_live/app/src/main/res/drawable/ic_info_24.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_koin.xml b/OnTime_User_live/app/src/main/res/drawable/ic_koin.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_lightbulb.xml b/OnTime_User_live/app/src/main/res/drawable/ic_lightbulb.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_lock_v.xml b/OnTime_User_live/app/src/main/res/drawable/ic_lock_v.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_mail_outline.xml b/OnTime_User_live/app/src/main/res/drawable/ic_mail_outline.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_menu.xml b/OnTime_User_live/app/src/main/res/drawable/ic_menu.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_monetization_on.xml b/OnTime_User_live/app/src/main/res/drawable/ic_monetization_on.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_money.xml b/OnTime_User_live/app/src/main/res/drawable/ic_money.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_more_horiz.xml b/OnTime_User_live/app/src/main/res/drawable/ic_more_horiz.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_more_vert_24.xml b/OnTime_User_live/app/src/main/res/drawable/ic_more_vert_24.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_not_send_message.png b/OnTime_User_live/app/src/main/res/drawable/ic_not_send_message.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_open_in_new.xml b/OnTime_User_live/app/src/main/res/drawable/ic_open_in_new.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_pad_lock.xml b/OnTime_User_live/app/src/main/res/drawable/ic_pad_lock.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_pause.png b/OnTime_User_live/app/src/main/res/drawable/ic_pause.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_phone_android.xml b/OnTime_User_live/app/src/main/res/drawable/ic_phone_android.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_play.png b/OnTime_User_live/app/src/main/res/drawable/ic_play.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_playsound.png b/OnTime_User_live/app/src/main/res/drawable/ic_playsound.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_privacy.xml b/OnTime_User_live/app/src/main/res/drawable/ic_privacy.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_privacy_v.xml b/OnTime_User_live/app/src/main/res/drawable/ic_privacy_v.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_rotate.xml b/OnTime_User_live/app/src/main/res/drawable/ic_rotate.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_search_primary_24dp.xml b/OnTime_User_live/app/src/main/res/drawable/ic_search_primary_24dp.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_share.xml b/OnTime_User_live/app/src/main/res/drawable/ic_share.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_share_v.xml b/OnTime_User_live/app/src/main/res/drawable/ic_share_v.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_star.xml b/OnTime_User_live/app/src/main/res/drawable/ic_star.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_star_filled.png b/OnTime_User_live/app/src/main/res/drawable/ic_star_filled.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_star_half.png b/OnTime_User_live/app/src/main/res/drawable/ic_star_half.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_starempty.png b/OnTime_User_live/app/src/main/res/drawable/ic_starempty.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_swap_vert.xml b/OnTime_User_live/app/src/main/res/drawable/ic_swap_vert.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_update.xml b/OnTime_User_live/app/src/main/res/drawable/ic_update.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_user_v.xml b/OnTime_User_live/app/src/main/res/drawable/ic_user_v.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_useredit.xml b/OnTime_User_live/app/src/main/res/drawable/ic_useredit.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_visibility_eye.xml b/OnTime_User_live/app/src/main/res/drawable/ic_visibility_eye.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_visibility_offeye.xml b/OnTime_User_live/app/src/main/res/drawable/ic_visibility_offeye.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_wa.png b/OnTime_User_live/app/src/main/res/drawable/ic_wa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/ic_whatsapp.xml b/OnTime_User_live/app/src/main/res/drawable/ic_whatsapp.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/image_placeholder.png b/OnTime_User_live/app/src/main/res/drawable/image_placeholder.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/indihome.png b/OnTime_User_live/app/src/main/res/drawable/indihome.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/logo.png b/OnTime_User_live/app/src/main/res/drawable/logo.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/logo_panjang.png b/OnTime_User_live/app/src/main/res/drawable/logo_panjang.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/logoflash.png b/OnTime_User_live/app/src/main/res/drawable/logoflash.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/logowhite.png b/OnTime_User_live/app/src/main/res/drawable/logowhite.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/lupapass.png b/OnTime_User_live/app/src/main/res/drawable/lupapass.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/map.png b/OnTime_User_live/app/src/main/res/drawable/map.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/mapfloat.png b/OnTime_User_live/app/src/main/res/drawable/mapfloat.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/midtrans.png b/OnTime_User_live/app/src/main/res/drawable/midtrans.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/no_data.png b/OnTime_User_live/app/src/main/res/drawable/no_data.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/nonselecteditem_dot.xml b/OnTime_User_live/app/src/main/res/drawable/nonselecteditem_dot.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/panicbutton.png b/OnTime_User_live/app/src/main/res/drawable/panicbutton.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/partner.png b/OnTime_User_live/app/src/main/res/drawable/partner.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/pdam.png b/OnTime_User_live/app/src/main/res/drawable/pdam.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/pickup.png b/OnTime_User_live/app/src/main/res/drawable/pickup.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/pln.png b/OnTime_User_live/app/src/main/res/drawable/pln.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/promobadge.png b/OnTime_User_live/app/src/main/res/drawable/promobadge.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/promodetail.png b/OnTime_User_live/app/src/main/res/drawable/promodetail.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/pulsa.png b/OnTime_User_live/app/src/main/res/drawable/pulsa.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/round_edittext_background.xml b/OnTime_User_live/app/src/main/res/drawable/round_edittext_background.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/rounded.xml b/OnTime_User_live/app/src/main/res/drawable/rounded.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/rounded_border.xml b/OnTime_User_live/app/src/main/res/drawable/rounded_border.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/rounded_corners_button.xml b/OnTime_User_live/app/src/main/res/drawable/rounded_corners_button.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/rounded_corners_button_2.xml b/OnTime_User_live/app/src/main/res/drawable/rounded_corners_button_2.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/rounded_corners_button_red.xml b/OnTime_User_live/app/src/main/res/drawable/rounded_corners_button_red.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/rounded_corners_edittext_dark.xml b/OnTime_User_live/app/src/main/res/drawable/rounded_corners_edittext_dark.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/rounded_delip.xml b/OnTime_User_live/app/src/main/res/drawable/rounded_delip.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/selecteditem_dot.xml b/OnTime_User_live/app/src/main/res/drawable/selecteditem_dot.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/selector.xml b/OnTime_User_live/app/src/main/res/drawable/selector.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/shape_rectangle_line_primary.xml b/OnTime_User_live/app/src/main/res/drawable/shape_rectangle_line_primary.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/shape_rectangle_primary.xml b/OnTime_User_live/app/src/main/res/drawable/shape_rectangle_primary.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/slide_one.png b/OnTime_User_live/app/src/main/res/drawable/slide_one.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/slide_one1.png b/OnTime_User_live/app/src/main/res/drawable/slide_one1.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/slide_three.png b/OnTime_User_live/app/src/main/res/drawable/slide_three.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/slide_two.png b/OnTime_User_live/app/src/main/res/drawable/slide_two.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/suv.png b/OnTime_User_live/app/src/main/res/drawable/suv.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/truck.png b/OnTime_User_live/app/src/main/res/drawable/truck.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/truckmap.png b/OnTime_User_live/app/src/main/res/drawable/truckmap.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/underdevelopment.png b/OnTime_User_live/app/src/main/res/drawable/underdevelopment.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/van.png b/OnTime_User_live/app/src/main/res/drawable/van.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/verify.png b/OnTime_User_live/app/src/main/res/drawable/verify.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/withdraw.png b/OnTime_User_live/app/src/main/res/drawable/withdraw.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/word_map.png b/OnTime_User_live/app/src/main/res/drawable/word_map.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/drawable/xendit_icon.png b/OnTime_User_live/app/src/main/res/drawable/xendit_icon.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/font/montserrat_bold.ttf b/OnTime_User_live/app/src/main/res/font/montserrat_bold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/font/montserrat_medium.ttf b/OnTime_User_live/app/src/main/res/font/montserrat_medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/font/montserrat_regular.ttf b/OnTime_User_live/app/src/main/res/font/montserrat_regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/font/montserrat_semibold.ttf b/OnTime_User_live/app/src/main/res/font/montserrat_semibold.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/font/neosans_pro_regular.ttf b/OnTime_User_live/app/src/main/res/font/neosans_pro_regular.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/font/neosanspro_medium.ttf b/OnTime_User_live/app/src/main/res/font/neosanspro_medium.ttf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/font/questv_bold.otf b/OnTime_User_live/app/src/main/res/font/questv_bold.otf
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_active_button.xml b/OnTime_User_live/app/src/main/res/layout/activity_active_button.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_all_berita.xml b/OnTime_User_live/app/src/main/res/layout/activity_all_berita.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_all_merchant.xml b/OnTime_User_live/app/src/main/res/layout/activity_all_merchant.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_beritadetail.xml b/OnTime_User_live/app/src/main/res/layout/activity_beritadetail.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_change_password_panic.xml b/OnTime_User_live/app/src/main/res/layout/activity_change_password_panic.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_changepassword.xml b/OnTime_User_live/app/src/main/res/layout/activity_changepassword.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_chat.xml b/OnTime_User_live/app/src/main/res/layout/activity_chat.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_confirm_wa.xml b/OnTime_User_live/app/src/main/res/layout/activity_confirm_wa.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_creditcard.xml b/OnTime_User_live/app/src/main/res/layout/activity_creditcard.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_detail_merchant.xml b/OnTime_User_live/app/src/main/res/layout/activity_detail_merchant.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_detail_order.xml b/OnTime_User_live/app/src/main/res/layout/activity_detail_order.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_editprofile.xml b/OnTime_User_live/app/src/main/res/layout/activity_editprofile.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_favorite_news.xml b/OnTime_User_live/app/src/main/res/layout/activity_favorite_news.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_iklan.xml b/OnTime_User_live/app/src/main/res/layout/activity_iklan.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_info_panic.xml b/OnTime_User_live/app/src/main/res/layout/activity_info_panic.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_intro.xml b/OnTime_User_live/app/src/main/res/layout/activity_intro.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_karin.xml b/OnTime_User_live/app/src/main/res/layout/activity_karin.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_login.xml b/OnTime_User_live/app/src/main/res/layout/activity_login.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_login_panic.xml b/OnTime_User_live/app/src/main/res/layout/activity_login_panic.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_lupapassword.xml b/OnTime_User_live/app/src/main/res/layout/activity_lupapassword.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_main.xml b/OnTime_User_live/app/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_maps_merchant.xml b/OnTime_User_live/app/src/main/res/layout/activity_maps_merchant.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_midtrans.xml b/OnTime_User_live/app/src/main/res/layout/activity_midtrans.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_ongkir.xml b/OnTime_User_live/app/src/main/res/layout/activity_ongkir.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_panic_button.xml b/OnTime_User_live/app/src/main/res/layout/activity_panic_button.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_picklocation.xml b/OnTime_User_live/app/src/main/res/layout/activity_picklocation.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_ppob.xml b/OnTime_User_live/app/src/main/res/layout/activity_ppob.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_privacy.xml b/OnTime_User_live/app/src/main/res/layout/activity_privacy.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_profile_menu.xml b/OnTime_User_live/app/src/main/res/layout/activity_profile_menu.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_promo.xml b/OnTime_User_live/app/src/main/res/layout/activity_promo.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_provider_list.xml b/OnTime_User_live/app/src/main/res/layout/activity_provider_list.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_rate.xml b/OnTime_User_live/app/src/main/res/layout/activity_rate.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_register.xml b/OnTime_User_live/app/src/main/res/layout/activity_register.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_register_panic.xml b/OnTime_User_live/app/src/main/res/layout/activity_register_panic.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_rent.xml b/OnTime_User_live/app/src/main/res/layout/activity_rent.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_ride.xml b/OnTime_User_live/app/src/main/res/layout/activity_ride.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_send.xml b/OnTime_User_live/app/src/main/res/layout/activity_send.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_send_detail.xml b/OnTime_User_live/app/src/main/res/layout/activity_send_detail.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_settings_menu.xml b/OnTime_User_live/app/src/main/res/layout/activity_settings_menu.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_splash.xml b/OnTime_User_live/app/src/main/res/layout/activity_splash.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_top_up_bpjs.xml b/OnTime_User_live/app/src/main/res/layout/activity_top_up_bpjs.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_top_up_pulsa.xml b/OnTime_User_live/app/src/main/res/layout/activity_top_up_pulsa.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_topup.xml b/OnTime_User_live/app/src/main/res/layout/activity_topup.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_topupview.xml b/OnTime_User_live/app/src/main/res/layout/activity_topupview.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_wallet.xml b/OnTime_User_live/app/src/main/res/layout/activity_wallet.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/activity_withdraw.xml b/OnTime_User_live/app/src/main/res/layout/activity_withdraw.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/custom_dialog_result.xml b/OnTime_User_live/app/src/main/res/layout/custom_dialog_result.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/custom_dialog_search.xml b/OnTime_User_live/app/src/main/res/layout/custom_dialog_search.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/dialog_aboutus.xml b/OnTime_User_live/app/src/main/res/layout/dialog_aboutus.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/dialog_payment_details.xml b/OnTime_User_live/app/src/main/res/layout/dialog_payment_details.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/dialog_spinner_dropdown_item.xml b/OnTime_User_live/app/src/main/res/layout/dialog_spinner_dropdown_item.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/dialog_spinner_item.xml b/OnTime_User_live/app/src/main/res/layout/dialog_spinner_item.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/fragment_enablelocation.xml b/OnTime_User_live/app/src/main/res/layout/fragment_enablelocation.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/fragment_fullimage.xml b/OnTime_User_live/app/src/main/res/layout/fragment_fullimage.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/fragment_home.xml b/OnTime_User_live/app/src/main/res/layout/fragment_home.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/fragment_playaudio.xml b/OnTime_User_live/app/src/main/res/layout/fragment_playaudio.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/fragment_profile.xml b/OnTime_User_live/app/src/main/res/layout/fragment_profile.xml
old mode 100644
new mode 100755
index a01e797..d0b22c2
--- a/OnTime_User_live/app/src/main/res/layout/fragment_profile.xml
+++ b/OnTime_User_live/app/src/main/res/layout/fragment_profile.xml
@@ -220,6 +220,56 @@
                 </LinearLayout>
 
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0.5dp"
+                    android:layout_marginLeft="40dp"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:background="@color/gray" />
+
+                <LinearLayout
+                    android:id="@+id/lldriverradius"
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_gravity="center"
+                        android:src="@drawable/ic_phone_android" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <customfonts.TextViewSFProDisplayMedium
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginRight="10dp"
+                            android:drawableEnd="@drawable/ic_arrow_right_24"
+                            android:gravity="center_vertical"
+                            android:text="Jarak cari pengemudi"
+                            android:textColor="@color/black"
+                            android:textSize="14sp" />
+
+                    </LinearLayout>
+
+                    <customfonts.TextViewSFProDisplayRegular
+                        android:id="@+id/driver_radius_summary"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:gravity="center_vertical"
+                        android:text="Default"
+                        android:textSize="12sp"
+                        android:textColor="@color/gray" />
+
+                </LinearLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="0.5dp"
diff --git a/OnTime_User_live/app/src/main/res/layout/fragment_recycle.xml b/OnTime_User_live/app/src/main/res/layout/fragment_recycle.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/fragment_slider.xml b/OnTime_User_live/app/src/main/res/layout/fragment_slider.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_bank.xml b/OnTime_User_live/app/src/main/res/layout/item_bank.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_banner.xml b/OnTime_User_live/app/src/main/res/layout/item_banner.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_cat_merchant.xml b/OnTime_User_live/app/src/main/res/layout/item_cat_merchant.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_category.xml b/OnTime_User_live/app/src/main/res/layout/item_category.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_chat_alert.xml b/OnTime_User_live/app/src/main/res/layout/item_chat_alert.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_chat_audio_other.xml b/OnTime_User_live/app/src/main/res/layout/item_chat_audio_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_chat_image_my.xml b/OnTime_User_live/app/src/main/res/layout/item_chat_image_my.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_chat_image_other.xml b/OnTime_User_live/app/src/main/res/layout/item_chat_image_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_chat_my.xml b/OnTime_User_live/app/src/main/res/layout/item_chat_my.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_chat_other.xml b/OnTime_User_live/app/src/main/res/layout/item_chat_other.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_chataudio.xml b/OnTime_User_live/app/src/main/res/layout/item_chataudio.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_fitur.xml b/OnTime_User_live/app/src/main/res/layout/item_fitur.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_grid.xml b/OnTime_User_live/app/src/main/res/layout/item_grid.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_grid_full.xml b/OnTime_User_live/app/src/main/res/layout/item_grid_full.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_merchant.xml b/OnTime_User_live/app/src/main/res/layout/item_merchant.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_merchant_list.xml b/OnTime_User_live/app/src/main/res/layout/item_merchant_list.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_message.xml b/OnTime_User_live/app/src/main/res/layout/item_message.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_order.xml b/OnTime_User_live/app/src/main/res/layout/item_order.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_pesanan.xml b/OnTime_User_live/app/src/main/res/layout/item_pesanan.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_promo.xml b/OnTime_User_live/app/src/main/res/layout/item_promo.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_review.xml b/OnTime_User_live/app/src/main/res/layout/item_review.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_slider.xml b/OnTime_User_live/app/src/main/res/layout/item_slider.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_slider_layout.xml b/OnTime_User_live/app/src/main/res/layout/item_slider_layout.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_top_up.xml b/OnTime_User_live/app/src/main/res/layout/item_top_up.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_topup_request.xml b/OnTime_User_live/app/src/main/res/layout/item_topup_request.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_transaksi.xml b/OnTime_User_live/app/src/main/res/layout/item_transaksi.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/item_wallet.xml b/OnTime_User_live/app/src/main/res/layout/item_wallet.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/maps_marker.xml b/OnTime_User_live/app/src/main/res/layout/maps_marker.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/sheet_category.xml b/OnTime_User_live/app/src/main/res/layout/sheet_category.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/sheet_detail_item.xml b/OnTime_User_live/app/src/main/res/layout/sheet_detail_item.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/sheet_list.xml b/OnTime_User_live/app/src/main/res/layout/sheet_list.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/sheet_upload.xml b/OnTime_User_live/app/src/main/res/layout/sheet_upload.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/shimercategory.xml b/OnTime_User_live/app/src/main/res/layout/shimercategory.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/shimercategoryfood.xml b/OnTime_User_live/app/src/main/res/layout/shimercategoryfood.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/shimerlist.xml b/OnTime_User_live/app/src/main/res/layout/shimerlist.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/shimerlistdetail.xml b/OnTime_User_live/app/src/main/res/layout/shimerlistdetail.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/shimerpromo.xml b/OnTime_User_live/app/src/main/res/layout/shimerpromo.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/shimerrate.xml b/OnTime_User_live/app/src/main/res/layout/shimerrate.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/shimerrating.xml b/OnTime_User_live/app/src/main/res/layout/shimerrating.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/shimerwallet.xml b/OnTime_User_live/app/src/main/res/layout/shimerwallet.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/top_up_pln_activity.xml b/OnTime_User_live/app/src/main/res/layout/top_up_pln_activity.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/layout/verifycode.xml b/OnTime_User_live/app/src/main/res/layout/verifycode.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/menu/navigation.xml b/OnTime_User_live/app/src/main/res/menu/navigation.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_User_live/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_User_live/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_User_live/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_User_live/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_User_live/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/raw/finishsound.mp3 b/OnTime_User_live/app/src/main/res/raw/finishsound.mp3
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/raw/notification.mp3 b/OnTime_User_live/app/src/main/res/raw/notification.mp3
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/raw/startengine.mp3 b/OnTime_User_live/app/src/main/res/raw/startengine.mp3
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/raw/style_json.json b/OnTime_User_live/app/src/main/res/raw/style_json.json
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/values/colors.xml b/OnTime_User_live/app/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/values/dimens.xml b/OnTime_User_live/app/src/main/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/values/ic_launcher_background.xml b/OnTime_User_live/app/src/main/res/values/ic_launcher_background.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/values/strings.xml b/OnTime_User_live/app/src/main/res/values/strings.xml
old mode 100644
new mode 100755
index 33b026a..dc9b73a
--- a/OnTime_User_live/app/src/main/res/values/strings.xml
+++ b/OnTime_User_live/app/src/main/res/values/strings.xml
@@ -58,6 +58,8 @@
     <string name="waiting_desc">Kami sedang mencari driver terdekat</string>
     <string name="waiting_pleaseWait">Mohon tunggu....</string>
     <string name="text_noInternet">Tidak ada akses internet</string>
+    <string name="phone_verification_unavailable">Verifikasi nomor HP tidak tersedia. Silakan gunakan email untuk login.</string>
+    <string name="fcm_token_required">Token notifikasi wajib. Pastikan Firebase terkonfigurasi dan coba lagi.</string>
 
     <string name="notification_cancel">Order berhasil dibatalkan</string>
     <string name="notification_start">ke lokasi tujuan</string>
@@ -70,6 +72,9 @@
     <string name="privacy_petunjuk">Dengan login anda telah menyetujui syarat dan ketentuan yang berlaku</string>
     <string name="app_version">Versi 1.1.0</string>
     <string name="topup_koin_header">TopUp Koin Ontime</string>
+    <string name="default_label">Bawaan</string>
+    <string name="driver_radius_title">Jarak cari pengemudi (km)</string>
+    <string name="driver_radius_saved">Pengaturan jarak disimpan</string>
 
     <string-array name="keluhan">
         <item>Perampokan</item>
diff --git a/OnTime_User_live/app/src/main/res/values/styles.xml b/OnTime_User_live/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/xml/backup_descriptor.xml b/OnTime_User_live/app/src/main/res/xml/backup_descriptor.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/xml/data_extraction_rules.xml b/OnTime_User_live/app/src/main/res/xml/data_extraction_rules.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/xml/file_paths.xml b/OnTime_User_live/app/src/main/res/xml/file_paths.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/app/src/main/res/xml/network_security_config.xml b/OnTime_User_live/app/src/main/res/xml/network_security_config.xml
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/build.gradle b/OnTime_User_live/build.gradle
old mode 100644
new mode 100755
index 4c2ef02..cb62aa4
--- a/OnTime_User_live/build.gradle
+++ b/OnTime_User_live/build.gradle
@@ -4,7 +4,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
     dependencies {
         // Android Gradle Plugin compatible with Gradle 8.x and JDK 21
@@ -23,7 +22,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
         maven { url "https://jitpack.io" }
     }
 }
diff --git a/OnTime_User_live/gradle.properties b/OnTime_User_live/gradle.properties
old mode 100644
new mode 100755
index da0d780..cbd8da9
--- a/OnTime_User_live/gradle.properties
+++ b/OnTime_User_live/gradle.properties
@@ -8,6 +8,7 @@
 # The setting is particularly useful for tweaking memory settings.
 android.useAndroidX=true
 android.enableJetifier=true
+android.suppressUnsupportedCompileSdk=35
 org.gradle.jvmargs=-Xmx1024m --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/OnTime_User_live/gradle/wrapper/gradle-wrapper.properties b/OnTime_User_live/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/gradlew.bat b/OnTime_User_live/gradlew.bat
old mode 100644
new mode 100755
diff --git a/OnTime_User_live/lib/FragmentAnimations/LICENSE b/OnTime_User_live/lib/FragmentAnimations/LICENSE
new file mode 100755
index 0000000..e06d208
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/OnTime_User_live/lib/FragmentAnimations/README.md b/OnTime_User_live/lib/FragmentAnimations/README.md
new file mode 100755
index 0000000..3af3459
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/README.md
@@ -0,0 +1,112 @@
+# FragmentAnimations
+
+[![Platform](https://img.shields.io/badge/platform-android-green.svg)](http://developer.android.com/index.html)
+<img src="https://img.shields.io/badge/license-Apache 2.0-green.svg?style=flat">
+[![API](https://img.shields.io/badge/API-4%2B-yellow.svg?style=flat)](https://android-arsenal.com/api?level=4)
+[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FragmentAnimations-green.svg?style=true)](https://android-arsenal.com/details/1/3526)
+
+Animation examples for `support.v4.Fragment` transition.
+
+These animations do not depends on any external libraries.
+
+[<img src="https://dply.me/h7azvd/button/large" alt="Try it on your device via DeployGate">](https://dply.me/h7azvd)
+
+## Usage Example
+
+In your `Fragment`, just code like this.
+
+```java
+@Override
+public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
+    return CubeAnimation.create(CubeAnimation.UP, enter, DURATION);
+}
+```
+
+See more example in [ExampleFragment.java](https://github.com/kakajika/FragmentAnimations/blob/master/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java)
+
+## Contents
+
+### Cube Animation
+
+[CubeAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java)
+
+![Cube](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/cube.gif)
+
+### Flip Animation
+
+[FlipAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java)
+
+![Flip](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/flip.gif)
+
+### Push/Pull Animation
+
+[PushPullAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java)
+
+![Push/Pull](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/pushpull.gif)
+
+### Sides Animation
+
+[SidesAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java)
+
+### Move Animation
+
+[MoveAnimation.java](https://github.com/kakajika/FragmentAnimations/blob/master/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java)
+
+![Move](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/move.gif)
+
+## Combination
+
+You can use above Animations with another one.
+
+```java
+@Override
+public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
+    if (enter) {
+        return MoveAnimation.create(MoveAnimation.UP, enter, DURATION);
+    } else {
+        return CubeAnimation.create(CubeAnimation.UP, enter, DURATION);
+    }
+}
+```
+
+### Cube/Move Animation
+
+![Cube/Move](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/cubemove.gif)
+
+### Move/Cube Animation
+
+![Move/Cube](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/movecube.gif)
+
+### Push/Move Animation
+
+![Push/Move](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/pushmove.gif)
+
+### Move/Pull Animation
+
+![Move/Pull](https://raw.githubusercontent.com/wiki/kakajika/FragmentAnimations/images/movepull.gif)
+
+## Install
+
+This library is available in jcenter.
+
+```groovy
+dependencies {
+    compile 'com.labo.kaji:fragmentanimations:0.1.1'
+}
+```
+
+## License
+
+    Copyright 2015 kakajika
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/.gitignore b/OnTime_User_live/lib/FragmentAnimations/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/build.gradle b/OnTime_User_live/lib/FragmentAnimations/app/build.gradle
new file mode 100755
index 0000000..cbcb969
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'com.android.application'
+apply plugin: 'deploygate'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.1"
+
+    defaultConfig {
+        applicationId "com.labo.kaji.fragmentanimations"
+        minSdkVersion 7
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(':fragmentanimations')
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:24.1.1'
+    compile 'com.android.support:design:24.1.1'
+    compile 'com.android.support:support-v4:24.1.1'
+    compile 'com.jakewharton:butterknife:7.0.1'
+    compile 'com.deploygate:sdk:3.1'
+}
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/proguard-rules.pro b/OnTime_User_live/lib/FragmentAnimations/app/proguard-rules.pro
new file mode 100755
index 0000000..664a4d6
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/kakajika/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java b/OnTime_User_live/lib/FragmentAnimations/app/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
new file mode 100755
index 0000000..bf9686e
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.labo.kaji.fragmentanimations;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/AndroidManifest.xml b/OnTime_User_live/lib/FragmentAnimations/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..9f74823
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.labo.kaji.fragmentanimations.example"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:name=".App"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/App.java b/OnTime_User_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/App.java
new file mode 100755
index 0000000..9b0b992
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/App.java
@@ -0,0 +1,18 @@
+package com.labo.kaji.fragmentanimations.example;
+
+import android.app.Application;
+
+import com.deploygate.sdk.DeployGate;
+
+/**
+ * @author kakajika
+ * @since 2016/04/20
+ */
+public class App extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        DeployGate.install(this);
+    }
+}
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java b/OnTime_User_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java
new file mode 100755
index 0000000..e49b473
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/ExampleFragment.java
@@ -0,0 +1,389 @@
+package com.labo.kaji.fragmentanimations.example;
+
+import android.annotation.SuppressLint;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.widget.TextView;
+
+import com.labo.kaji.fragmentanimations.CubeAnimation;
+import com.labo.kaji.fragmentanimations.FlipAnimation;
+import com.labo.kaji.fragmentanimations.MoveAnimation;
+import com.labo.kaji.fragmentanimations.PushPullAnimation;
+import com.labo.kaji.fragmentanimations.SidesAnimation;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * @author kakajika
+ * @since 2015/11/27
+ */
+public class ExampleFragment extends Fragment {
+
+    @IntDef({NONE, MOVE, CUBE, FLIP, PUSHPULL, SIDES, CUBEMOVE, MOVECUBE, PUSHMOVE, MOVEPULL, FLIPMOVE, MOVEFLIP, FLIPCUBE, CUBEFLIP})
+    public @interface AnimationStyle {}
+    public static final int NONE     = 0;
+    public static final int MOVE     = 1;
+    public static final int CUBE     = 2;
+    public static final int FLIP     = 3;
+    public static final int PUSHPULL = 4;
+    public static final int SIDES    = 5;
+    public static final int CUBEMOVE = 6;
+    public static final int MOVECUBE = 7;
+    public static final int PUSHMOVE = 8;
+    public static final int MOVEPULL = 9;
+    public static final int FLIPMOVE = 10;
+    public static final int MOVEFLIP = 11;
+    public static final int FLIPCUBE = 12;
+    public static final int CUBEFLIP = 13;
+
+    @IntDef({NODIR, UP, DOWN, LEFT, RIGHT})
+    public @interface AnimationDirection {}
+    public static final int NODIR = 0;
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    private static final long DURATION = 500;
+
+    @AnimationStyle
+    private static int sAnimationStyle = CUBE;
+
+    @Bind(R.id.textAnimationStyle)
+    TextView mTextAnimationStyle;
+
+    public static ExampleFragment newInstance(@AnimationDirection int direction) {
+        ExampleFragment f = new ExampleFragment();
+        f.setArguments(new Bundle());
+        f.getArguments().putInt("direction", direction);
+        return f;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.content_anim, container, false);
+        int color = Color.rgb((int) Math.floor(Math.random() * 128) + 64,
+                              (int) Math.floor(Math.random() * 128) + 64,
+                              (int) Math.floor(Math.random() * 128) + 64);
+        view.setBackgroundColor(color);
+        ButterKnife.bind(this, view);
+        setAnimationStyleText();
+        return view;
+    }
+
+    @Override
+    public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
+        switch (sAnimationStyle) {
+            case MOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return MoveAnimation.create(MoveAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case CUBE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return CubeAnimation.create(CubeAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case FLIP:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return FlipAnimation.create(FlipAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case PUSHPULL:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return PushPullAnimation.create(PushPullAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return PushPullAnimation.create(PushPullAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return PushPullAnimation.create(PushPullAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return PushPullAnimation.create(PushPullAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case SIDES:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return SidesAnimation.create(SidesAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return SidesAnimation.create(SidesAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return SidesAnimation.create(SidesAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return SidesAnimation.create(SidesAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case CUBEMOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(0.3f, 1.0f) :
+                                CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case MOVECUBE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? CubeAnimation.create(CubeAnimation.UP, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION).fading(0.3f, 1.0f) :
+                                MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case PUSHMOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? MoveAnimation.create(MoveAnimation.UP, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return enter ? MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return enter ? MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return enter ? MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION) :
+                                PushPullAnimation.create(PushPullAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case MOVEPULL:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.UP, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.DOWN, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.LEFT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? PushPullAnimation.create(PushPullAnimation.RIGHT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case FLIPMOVE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? MoveAnimation.create(MoveAnimation.UP, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return enter ? MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return enter ? MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return enter ? MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case MOVEFLIP:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? FlipAnimation.create(FlipAnimation.UP, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION) :
+                                MoveAnimation.create(MoveAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case FLIPCUBE:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? CubeAnimation.create(CubeAnimation.UP, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.UP, enter, DURATION);
+                    case DOWN:
+                        return enter ? CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION);
+                    case LEFT:
+                        return enter ? CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION);
+                    case RIGHT:
+                        return enter ? CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION) :
+                                FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION);
+                }
+                break;
+            case CUBEFLIP:
+                switch (getArguments().getInt("direction")) {
+                    case UP:
+                        return enter ? FlipAnimation.create(FlipAnimation.UP, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.UP, enter, DURATION).fading(1.0f, 0.3f);
+                    case DOWN:
+                        return enter ? FlipAnimation.create(FlipAnimation.DOWN, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.DOWN, enter, DURATION).fading(1.0f, 0.3f);
+                    case LEFT:
+                        return enter ? FlipAnimation.create(FlipAnimation.LEFT, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.LEFT, enter, DURATION).fading(1.0f, 0.3f);
+                    case RIGHT:
+                        return enter ? FlipAnimation.create(FlipAnimation.RIGHT, enter, DURATION) :
+                                CubeAnimation.create(CubeAnimation.RIGHT, enter, DURATION).fading(1.0f, 0.3f);
+                }
+                break;
+            case NONE:
+                break;
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonUp)
+    void onButtonUp() {
+        getArguments().putInt("direction", UP);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(UP));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonDown)
+    void onButtonDown() {
+        getArguments().putInt("direction", DOWN);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(DOWN));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonLeft)
+    void onButtonLeft() {
+        getArguments().putInt("direction", LEFT);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(LEFT));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.buttonRight)
+    void onButtonRight() {
+        getArguments().putInt("direction", RIGHT);
+        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(RIGHT));
+        ft.commit();
+    }
+
+    @SuppressWarnings("unused")
+    @OnClick(R.id.textAnimationStyle)
+    public void switchAnimationStyle(View view) {
+        @AnimationStyle int[] styles;
+        styles = new int[]{MOVE, CUBE, FLIP, PUSHPULL, SIDES, CUBEMOVE, MOVECUBE, PUSHMOVE, MOVEPULL, FLIPMOVE, MOVEFLIP, FLIPCUBE, CUBEFLIP};
+        for (int i = 0; i<styles.length-1; ++i) {
+            if (styles[i] == sAnimationStyle) {
+                setAnimationStyle(styles[i+1]);
+                return;
+            }
+        }
+        setAnimationStyle(MOVE);
+    }
+
+    public void setAnimationStyle(@AnimationStyle int style) {
+        if (sAnimationStyle != style) {
+            sAnimationStyle = style;
+            setAnimationStyleText();
+            Snackbar.make(getView(), "Animation Style is Changed", Snackbar.LENGTH_SHORT).show();
+        }
+    }
+
+    @SuppressLint("SetTextI18n")
+    private void setAnimationStyleText() {
+        switch (sAnimationStyle) {
+            case NONE:
+                mTextAnimationStyle.setText("None");
+                break;
+            case MOVE:
+                mTextAnimationStyle.setText("Move");
+                break;
+            case CUBE:
+                mTextAnimationStyle.setText("Cube");
+                break;
+            case FLIP:
+                mTextAnimationStyle.setText("Flip");
+                break;
+            case PUSHPULL:
+                mTextAnimationStyle.setText("Push/Pull");
+                break;
+            case SIDES:
+                mTextAnimationStyle.setText("Sides");
+                break;
+            case CUBEMOVE:
+                mTextAnimationStyle.setText("Cube/Move");
+                break;
+            case MOVECUBE:
+                mTextAnimationStyle.setText("Move/Cube");
+                break;
+            case PUSHMOVE:
+                mTextAnimationStyle.setText("Push/Move");
+                break;
+            case MOVEPULL:
+                mTextAnimationStyle.setText("Move/Pull");
+                break;
+            case FLIPMOVE:
+                mTextAnimationStyle.setText("Flip/Move");
+                break;
+            case MOVEFLIP:
+                mTextAnimationStyle.setText("Move/Flip");
+                break;
+            case FLIPCUBE:
+                mTextAnimationStyle.setText("Flip/Cube");
+                break;
+            case CUBEFLIP:
+                mTextAnimationStyle.setText("Cube/Flip");
+                break;
+        }
+    }
+
+}
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/MainActivity.java b/OnTime_User_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/MainActivity.java
new file mode 100755
index 0000000..a2e5ee8
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/java/com/labo/kaji/fragmentanimations/example/MainActivity.java
@@ -0,0 +1,68 @@
+package com.labo.kaji.fragmentanimations.example;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import butterknife.ButterKnife;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ButterKnife.bind(this);
+
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        ft.replace(R.id.layout_main, ExampleFragment.newInstance(ExampleFragment.NODIR));
+        ft.commit();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_main, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        ExampleFragment f = (ExampleFragment)getSupportFragmentManager().findFragmentById(R.id.layout_main);
+        switch (id) {
+            case R.id.style_move:
+                f.setAnimationStyle(ExampleFragment.MOVE);
+                return true;
+            case R.id.style_cube:
+                f.setAnimationStyle(ExampleFragment.CUBE);
+                return true;
+            case R.id.style_flip:
+                f.setAnimationStyle(ExampleFragment.FLIP);
+                return true;
+            case R.id.style_pushpull:
+                f.setAnimationStyle(ExampleFragment.PUSHPULL);
+                return true;
+            case R.id.style_sides:
+                f.setAnimationStyle(ExampleFragment.SIDES);
+                return true;
+            case R.id.style_cubemove:
+                f.setAnimationStyle(ExampleFragment.CUBEMOVE);
+                return true;
+            case R.id.style_movecube:
+                f.setAnimationStyle(ExampleFragment.MOVECUBE);
+                return true;
+            case R.id.style_pushmove:
+                f.setAnimationStyle(ExampleFragment.PUSHMOVE);
+                return true;
+            case R.id.style_movepull:
+                f.setAnimationStyle(ExampleFragment.MOVEPULL);
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_changestyle.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_changestyle.png
new file mode 100755
index 0000000..6807e6a
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_changestyle.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_down.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_down.png
new file mode 100755
index 0000000..0f2b97e
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_down.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_left.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_left.png
new file mode 100755
index 0000000..bf06ba6
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_left.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_right.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_right.png
new file mode 100755
index 0000000..ea1ecda
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_right.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_up.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_up.png
new file mode 100755
index 0000000..6474aa9
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-hdpi/ic_up.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_changestyle.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_changestyle.png
new file mode 100755
index 0000000..55c7711
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_changestyle.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_down.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_down.png
new file mode 100755
index 0000000..902eda7
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_down.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_left.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_left.png
new file mode 100755
index 0000000..bd2d183
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_left.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_right.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_right.png
new file mode 100755
index 0000000..2a962cf
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_right.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_up.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_up.png
new file mode 100755
index 0000000..dd1635c
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xhdpi/ic_up.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_changestyle.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_changestyle.png
new file mode 100755
index 0000000..90e017a
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_changestyle.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_down.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_down.png
new file mode 100755
index 0000000..49930b8
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_down.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_left.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_left.png
new file mode 100755
index 0000000..ee04399
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_left.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_right.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_right.png
new file mode 100755
index 0000000..b2d8d65
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_right.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_up.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_up.png
new file mode 100755
index 0000000..6c49170
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/drawable-xxhdpi/ic_up.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/layout/activity_main.xml b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..8132246
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".MainActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_main"/>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/layout/content_anim.xml b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/layout/content_anim.xml
new file mode 100755
index 0000000..53e29ec
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/layout/content_anim.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/textAnimationStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="8dp"
+        android:textColor="@android:color/white"
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonLeft"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left|center"
+        android:src="@drawable/ic_left"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonRight"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right|center"
+        android:src="@drawable/ic_right"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonUp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|center"
+        android:src="@drawable/ic_up"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+    <ImageView
+        android:id="@+id/buttonDown"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center"
+        android:src="@drawable/ic_down"
+        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
+        />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/layout/content_main.xml b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/layout/content_main.xml
new file mode 100755
index 0000000..e8f12a1
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/layout/content_main.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:background="#444"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context=".MainActivity"
+    tools:showIn="@layout/activity_main">
+
+    <FrameLayout
+        android:id="@+id/layout_main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="32dp"
+        android:layout_centerInParent="true"/>
+
+</RelativeLayout>
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/menu/menu_main.xml b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/menu/menu_main.xml
new file mode 100755
index 0000000..3df93f1
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/menu/menu_main.xml
@@ -0,0 +1,41 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".example.MainActivity">
+    <item
+        android:id="@+id/style_move"
+        android:title="Move"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_cube"
+        android:title="Cube"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_flip"
+        android:title="Flip"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_pushpull"
+        android:title="Push/Pull"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_sides"
+        android:title="Sides"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_cubemove"
+        android:title="Cube/Move"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_movecube"
+        android:title="Move/Cube"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_pushmove"
+        android:title="Push/Move"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/style_movepull"
+        android:title="Move/Pull"
+        app:showAsAction="never"/>
+</menu>
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..cde69bc
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..c133a0c
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..bfa42f0
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..324e72c
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..aee44e1
Binary files /dev/null and b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values-v21/styles.xml b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..251fb9f
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,9 @@
+<resources>>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values-w820dp/dimens.xml b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/colors.xml b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..3ab3e9c
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/dimens.xml b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..812cb7b
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/strings.xml b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..d1647aa
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">FragmentAnimations</string>
+    <string name="action_settings">Settings</string>
+</resources>
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/styles.xml b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..177cefc
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/main/res/values/styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
+
+</resources>
diff --git a/OnTime_User_live/lib/FragmentAnimations/app/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java b/OnTime_User_live/lib/FragmentAnimations/app/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
new file mode 100755
index 0000000..a3f4fb7
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/app/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package com.labo.kaji.fragmentanimations;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/FragmentAnimations/build.gradle b/OnTime_User_live/lib/FragmentAnimations/build.gradle
new file mode 100755
index 0000000..bef8f5c
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.novoda:bintray-release:0.3.4'
+        classpath 'com.deploygate:gradle:1.0.4'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/.gitignore b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/build.gradle b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/build.gradle
new file mode 100755
index 0000000..9a337d8
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'com.labo.kaji.fragmentanimations'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName "0.1.1"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.annotation:annotation:1.7.1'
+    testImplementation 'junit:junit:4.13.2'
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/proguard-rules.pro b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/proguard-rules.pro
new file mode 100755
index 0000000..664a4d6
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/kakajika/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
new file mode 100755
index 0000000..bf9686e
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/androidTest/java/com/labo/kaji/fragmentanimations/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.labo.kaji.fragmentanimations;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/AndroidManifest.xml b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..0a0938a
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java
new file mode 100755
index 0000000..95a0f12
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/CubeAnimation.java
@@ -0,0 +1,107 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Cube Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class CubeAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull CubeAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalCubeAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalCubeAnimation(direction, enter, duration);
+        }
+    }
+
+    private CubeAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalCubeAnimation extends CubeAnimation {
+
+        private VerticalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == UP)) ? 0.0f : height;
+            mCameraZ = -height * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == DOWN) value *= -1.0f;
+            mRotationX = value * 90.0f;
+            mTranslationY = -value * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalCubeAnimation extends CubeAnimation {
+
+        private HorizontalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == LEFT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+            mCameraZ = -width * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == RIGHT) value *= -1.0f;
+            mRotationY = -value * 90.0f;
+            mTranslationX = -value * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java
new file mode 100755
index 0000000..0145dbe
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/FlipAnimation.java
@@ -0,0 +1,123 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Flip Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class FlipAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull FlipAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalFlipAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalFlipAnimation(direction, enter, duration);
+        }
+    }
+
+    private FlipAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalFlipAnimation extends FlipAnimation {
+
+        public VerticalFlipAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == UP)) ? 0.0f : height;
+            mCameraZ = -height * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == DOWN) value *= -1.0f;
+            mRotationX = value * 180.0f;
+            mTranslationY = -value * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+
+            // Hide entering/exiting view before/after half point.
+            if (mEnter) {
+                mAlpha = interpolatedTime <= 0.5f ? 0.0f : 1.0f;
+            } else {
+                mAlpha = interpolatedTime <= 0.5f ? 1.0f : 0.0f;
+            }
+
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalFlipAnimation extends FlipAnimation {
+
+        public HorizontalFlipAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == LEFT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+            mCameraZ = -width * 0.015f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == RIGHT) value *= -1.0f;
+            mRotationY = -value * 180.0f;
+            mTranslationX = -value * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+
+            // Hide entering/exiting view before/after half point.
+            if (mEnter) {
+                mAlpha = interpolatedTime <= 0.5f ? 0.0f : 1.0f;
+            } else {
+                mAlpha = interpolatedTime <= 0.5f ? 1.0f : 0.0f;
+            }
+
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java
new file mode 100755
index 0000000..311c67f
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/MoveAnimation.java
@@ -0,0 +1,89 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Move Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class MoveAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull MoveAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalMoveAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalMoveAnimation(direction, enter, duration);
+        }
+    }
+
+    private MoveAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalMoveAnimation extends MoveAnimation {
+
+        private VerticalMoveAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == DOWN) value *= -1.0f;
+            mTranslationY = -value * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalMoveAnimation extends MoveAnimation {
+
+        private HorizontalMoveAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == RIGHT) value *= -1.0f;
+            mTranslationX = -value * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java
new file mode 100755
index 0000000..5110920
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/PushPullAnimation.java
@@ -0,0 +1,105 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Push/Pull Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class PushPullAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull PushPullAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalPushPullAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalPushPullAnimation(direction, enter, duration);
+        }
+    }
+
+    private PushPullAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+    }
+
+    private static class VerticalPushPullAnimation extends PushPullAnimation {
+
+        private VerticalPushPullAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == DOWN)) ? 0.0f : height;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == UP) value *= -1.0f;
+            mRotationX = value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalPushPullAnimation extends PushPullAnimation {
+
+        private HorizontalPushPullAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == RIGHT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == LEFT) value *= -1.0f;
+            mRotationY = -value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java
new file mode 100755
index 0000000..bacd95f
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/SidesAnimation.java
@@ -0,0 +1,109 @@
+package com.labo.kaji.fragmentanimations;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.Transformation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * 3D Cube Animation
+ * @author kakajika
+ * @since 2015/11/28
+ */
+public class SidesAnimation extends ViewPropertyAnimation {
+
+    @IntDef({UP, DOWN, LEFT, RIGHT})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Direction {}
+    public static final int UP    = 1;
+    public static final int DOWN  = 2;
+    public static final int LEFT  = 3;
+    public static final int RIGHT = 4;
+
+    protected final @Direction int mDirection;
+    protected final boolean mEnter;
+
+    /**
+     * Create new Animation.
+     * @param direction Direction of animation
+     * @param enter true for Enter / false for Exit
+     * @param duration Duration of Animation
+     * @return
+     */
+    public static @NonNull SidesAnimation create(@Direction int direction, boolean enter, long duration) {
+        switch (direction) {
+            case UP:
+            case DOWN:
+                return new VerticalCubeAnimation(direction, enter, duration);
+            case LEFT:
+            case RIGHT:
+            default:
+                return new HorizontalCubeAnimation(direction, enter, duration);
+        }
+    }
+
+    private SidesAnimation(@Direction int direction, boolean enter, long duration) {
+        mDirection = direction;
+        mEnter = enter;
+        setDuration(duration);
+        setInterpolator(new AccelerateDecelerateInterpolator());
+    }
+
+    private static class VerticalCubeAnimation extends SidesAnimation {
+
+        private VerticalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = width * 0.5f;
+            mPivotY = (mEnter == (mDirection == DOWN)) ? 0.0f : height;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == UP) value *= -1.0f;
+            mRotationX = value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+            mTranslationZ = (1.0f - mAlpha) * mWidth;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+    private static class HorizontalCubeAnimation extends SidesAnimation {
+
+        private HorizontalCubeAnimation(@Direction int direction, boolean enter, long duration) {
+            super(direction, enter, duration);
+        }
+
+        @Override
+        public void initialize(int width, int height, int parentWidth, int parentHeight) {
+            super.initialize(width, height, parentWidth, parentHeight);
+            mPivotX = (mEnter == (mDirection == RIGHT)) ? 0.0f : width;
+            mPivotY = height * 0.5f;
+        }
+
+        @Override
+        protected void applyTransformation(float interpolatedTime, Transformation t) {
+            float value = mEnter ? (interpolatedTime - 1.0f) : interpolatedTime;
+            if (mDirection == LEFT) value *= -1.0f;
+            mRotationY = -value * 90.0f;
+            mAlpha = mEnter ? interpolatedTime : (1.0f - interpolatedTime);
+            mTranslationZ = (1.0f - mAlpha) * mHeight;
+
+            super.applyTransformation(interpolatedTime, t);
+            applyTransformation(t);
+        }
+
+    }
+
+}
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/ViewPropertyAnimation.java b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/ViewPropertyAnimation.java
new file mode 100755
index 0000000..b999ced
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/main/java/com/labo/kaji/fragmentanimations/ViewPropertyAnimation.java
@@ -0,0 +1,100 @@
+package com.labo.kaji.fragmentanimations;
+
+import android.graphics.Camera;
+import android.graphics.Matrix;
+import android.os.Build;
+import androidx.annotation.FloatRange;
+import android.view.animation.Animation;
+import android.view.animation.Transformation;
+
+/**
+ * @author kakajika
+ * @since 2015/11/27
+ */
+public class ViewPropertyAnimation extends Animation {
+
+    private final Camera mCamera = new Camera();
+    protected int mWidth  = 0;
+    protected int mHeight = 0;
+    protected float mAlpha = 1.0f;
+    protected float mPivotX = 0.0f;
+    protected float mPivotY = 0.0f;
+    protected float mScaleX = 1.0f;
+    protected float mScaleY = 1.0f;
+    protected float mRotationX = 0.0f;
+    protected float mRotationY = 0.0f;
+    protected float mRotationZ = 0.0f;
+    protected float mTranslationX = 0.0f;
+    protected float mTranslationY = 0.0f;
+    protected float mTranslationZ = 0.0f;
+    protected float mCameraX = 0.0f;
+    protected float mCameraY = 0.0f;
+    protected float mCameraZ = -8.0f;
+
+    private float mFromAlpha = -1.0f;
+    private float mToAlpha   = -1.0f;
+
+    public ViewPropertyAnimation fading(@FloatRange(from=0.0f,to=1.0f) float fromAlpha, @FloatRange(from=0.0f,to=1.0f) float toAlpha) {
+        mFromAlpha = fromAlpha;
+        mToAlpha = toAlpha;
+        return this;
+    }
+
+    @Override
+    public void initialize(int width, int height, int parentWidth, int parentHeight) {
+        super.initialize(width, height, parentWidth, parentHeight);
+        mWidth = width;
+        mHeight = height;
+    }
+
+    @Override
+    protected void applyTransformation(float interpolatedTime, Transformation t) {
+        super.applyTransformation(interpolatedTime, t);
+        if (mFromAlpha >= 0 && mToAlpha >= 0) {
+            mAlpha = mFromAlpha + (mToAlpha - mFromAlpha) * interpolatedTime;
+        }
+    }
+
+    protected void applyTransformation(Transformation t) {
+        final Matrix m = t.getMatrix();
+        final float w = mWidth;
+        final float h = mHeight;
+        final float pX = mPivotX;
+        final float pY = mPivotY;
+
+        final float rX = mRotationX;
+        final float rY = mRotationY;
+        final float rZ = mRotationZ;
+        if ((rX != 0) || (rY != 0) || (rZ != 0)) {
+            final Camera camera = mCamera;
+            camera.save();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1) {
+                camera.setLocation(mCameraX, mCameraY, mCameraZ);
+            }
+            if (mTranslationZ != 0) {
+                camera.translate(0, 0, mTranslationZ);
+            }
+            camera.rotateX(rX);
+            camera.rotateY(rY);
+            camera.rotateZ(-rZ);
+            camera.getMatrix(m);
+            camera.restore();
+            m.preTranslate(-pX, -pY);
+            m.postTranslate(pX, pY);
+        }
+
+        final float sX = mScaleX;
+        final float sY = mScaleY;
+        if ((sX != 1.0f) || (sY != 1.0f)) {
+            m.postScale(sX, sY);
+            final float sPX = -(pX / w) * ((sX * w) - w);
+            final float sPY = -(pY / h) * ((sY * h) - h);
+            m.postTranslate(sPX, sPY);
+        }
+
+        m.postTranslate(mTranslationX, mTranslationY);
+
+        t.setAlpha(mAlpha);
+    }
+
+}
diff --git a/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
new file mode 100755
index 0000000..a3f4fb7
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/fragmentanimations/src/test/java/com/labo/kaji/fragmentanimations/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package com.labo.kaji.fragmentanimations;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/FragmentAnimations/gradle.properties b/OnTime_User_live/lib/FragmentAnimations/gradle.properties
new file mode 100755
index 0000000..1d3591c
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/OnTime_User_live/lib/FragmentAnimations/gradle/wrapper/gradle-wrapper.properties b/OnTime_User_live/lib/FragmentAnimations/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..60eab91
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Apr 22 14:42:45 JST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/OnTime_User_live/lib/FragmentAnimations/gradlew b/OnTime_User_live/lib/FragmentAnimations/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_User_live/lib/FragmentAnimations/gradlew.bat b/OnTime_User_live/lib/FragmentAnimations/gradlew.bat
new file mode 100755
index 0000000..aec9973
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_User_live/lib/FragmentAnimations/settings.gradle b/OnTime_User_live/lib/FragmentAnimations/settings.gradle
new file mode 100755
index 0000000..4288300
--- /dev/null
+++ b/OnTime_User_live/lib/FragmentAnimations/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':fragmentanimations'
diff --git a/OnTime_User_live/lib/PRDownloader/.gitignore b/OnTime_User_live/lib/PRDownloader/.gitignore
new file mode 100755
index 0000000..5bf645d
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/.gitignore
@@ -0,0 +1,10 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+/.idea
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/CONTRIBUTING.md b/OnTime_User_live/lib/PRDownloader/CONTRIBUTING.md
new file mode 100755
index 0000000..39e2777
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/CONTRIBUTING.md
@@ -0,0 +1,9 @@
+# Contributing
+
+1. Fork it!
+2. Checkout the development branch: `git checkout development`
+3. Create your feature branch: `git checkout -b my-new-feature`
+4. Add your changes to the index: `git add .`
+5. Commit your changes: `git commit -m 'Add some feature'`
+6. Push to the branch: `git push origin my-new-feature`
+7. Submit a pull request against the `development` branch
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/LICENSE b/OnTime_User_live/lib/PRDownloader/LICENSE
new file mode 100755
index 0000000..7a4a3ea
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/README.md b/OnTime_User_live/lib/PRDownloader/README.md
new file mode 100755
index 0000000..94c08d0
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/README.md
@@ -0,0 +1,190 @@
+<p align="center">
+<img alt="PRDownloader" src=https://raw.githubusercontent.com/amitshekhariitbhu/PRDownloader/master/assets/prdownloader.png />
+</p>
+
+# PRDownloader - A file downloader library for Android with pause and resume support
+
+## Sample Download
+<img src=https://raw.githubusercontent.com/amitshekhariitbhu/PRDownloader/master/assets/sample_download.png width=360 height=640 />
+
+### Overview of PRDownloader library
+* PRDownloader can be used to download any type of files like image, video, pdf, apk and etc.
+* This file downloader library supports pause and resume while downloading a file.
+* Supports large file download.
+* This downloader library has a simple interface to make download request.
+* We can check if the status of downloading with the given download Id.
+* PRDownloader gives callbacks for everything like onProgress, onCancel, onStart, onError and etc while downloading a file.
+* Supports proper request canceling.
+* Many requests can be made in parallel.
+* All types of customization are possible.
+
+## About me
+
+Hi, I am Amit Shekhar, Founder @ [Outcome School](https://outcomeschool.com) • IIT 2010-14 • I have taught and mentored many developers, and their efforts landed them high-paying tech jobs, helped many tech companies in solving their unique problems, and created many open-source libraries being used by top companies. I am passionate about sharing knowledge through open-source, blogs, and videos.
+
+### Follow Amit Shekhar
+
+- [X/Twitter](https://twitter.com/amitiitbhu)
+- [LinkedIn](https://www.linkedin.com/in/amit-shekhar-iitbhu)
+- [GitHub](https://github.com/amitshekhariitbhu)
+
+### Follow Outcome School
+
+- [YouTube](https://youtube.com/@OutcomeSchool)
+- [X/Twitter](https://x.com/outcome_school)
+- [LinkedIn](https://www.linkedin.com/company/outcomeschool)
+- [GitHub](http://github.com/OutcomeSchool)
+
+## I teach at Outcome School
+
+- AI and Machine Learning
+- Android
+
+Join Outcome School and get a high-paying tech job: [Outcome School](https://outcomeschool.com)
+
+## Using PRDownloader Library in your Android application
+
+Add this in your `settings.gradle`:
+```groovy
+maven { url 'https://jitpack.io' }
+```
+
+If you are using `settings.gradle.kts`, add the following:
+```kotlin
+maven { setUrl("https://jitpack.io") }
+```
+
+Add this in your `build.gradle`
+```groovy
+implementation 'com.github.amitshekhariitbhu:PRDownloader:1.0.2'
+```
+
+If you are using `build.gradle.kts`, add the following:
+```kotlin
+implementation("com.github.amitshekhariitbhu:PRDownloader:1.0.2")
+```
+
+Do not forget to add internet permission in manifest if already not present
+```xml
+<uses-permission android:name="android.permission.INTERNET" />
+```
+Then initialize it in onCreate() Method of application class :
+```java
+PRDownloader.initialize(getApplicationContext());
+```
+Initializing it with some customization
+```java
+// Enabling database for resume support even after the application is killed:
+PRDownloaderConfig config = PRDownloaderConfig.newBuilder()
+                .setDatabaseEnabled(true)
+                .build();
+PRDownloader.initialize(getApplicationContext(), config);
+
+// Setting timeout globally for the download network requests:
+PRDownloaderConfig config = PRDownloaderConfig.newBuilder()
+                .setReadTimeout(30_000)
+                .setConnectTimeout(30_000)
+                .build();
+PRDownloader.initialize(getApplicationContext(), config); 
+```
+
+### Make a download request
+```java
+int downloadId = PRDownloader.download(url, dirPath, fileName)
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                               
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                               
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                               
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                               
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                               
+                            }
+                        });            
+```
+
+### Pause a download request
+```java
+PRDownloader.pause(downloadId);
+```
+
+### Resume a download request
+```java
+PRDownloader.resume(downloadId);
+```
+
+### Cancel a download request
+```java
+// Cancel with the download id
+PRDownloader.cancel(downloadId);
+// The tag can be set to any request and then can be used to cancel the request
+PRDownloader.cancel(TAG);
+// Cancel all the requests
+PRDownloader.cancelAll();
+```
+
+### Status of a download request
+```java
+Status status = PRDownloader.getStatus(downloadId);
+```
+
+### Clean up resumed files if database enabled
+```java
+// Method to clean up temporary resumed files which is older than the given day
+PRDownloader.cleanUp(days);
+```
+### TODO
+* Integration with other libraries like OkHttp, RxJava
+* Test Cases
+* And of course many many features and bug fixes
+
+## [Outcome School Blog](https://outcomeschool.com/blog) - High-quality content to learn Android concepts.
+
+## If this library helps you in anyway, show your love :heart: by putting a :star: on this project :v:
+
+### License
+```
+   Copyright (C) 2024 Amit Shekhar
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+```
+
+### Contributing to PRDownloader
+All pull requests are welcome, make sure to follow the [contribution guidelines](CONTRIBUTING.md)
+when you submit pull request.
diff --git a/OnTime_User_live/lib/PRDownloader/app/.gitignore b/OnTime_User_live/lib/PRDownloader/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_User_live/lib/PRDownloader/app/build.gradle b/OnTime_User_live/lib/PRDownloader/app/build.gradle
new file mode 100755
index 0000000..c33b492
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'com.android.application'
+
+android {
+    namespace 'com.sample'
+    defaultConfig {
+        applicationId "com.sample"
+        minSdkVersion 14
+        targetSdkVersion 35
+        compileSdk 35
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    debugImplementation 'com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:1.0.7'
+    implementation project(':prdownloader')
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/app/proguard-rules.pro b/OnTime_User_live/lib/PRDownloader/app/proguard-rules.pro
new file mode 100755
index 0000000..f1b4245
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/androidTest/java/com/sample/ExampleInstrumentedTest.java b/OnTime_User_live/lib/PRDownloader/app/src/androidTest/java/com/sample/ExampleInstrumentedTest.java
new file mode 100755
index 0000000..0391c99
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/androidTest/java/com/sample/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.sample;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.sample", appContext.getPackageName());
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/AndroidManifest.xml b/OnTime_User_live/lib/PRDownloader/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..4863e94
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:name=".SampleApp"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/java/com/sample/MainActivity.java b/OnTime_User_live/lib/PRDownloader/app/src/main/java/com/sample/MainActivity.java
new file mode 100755
index 0000000..6320264
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/java/com/sample/MainActivity.java
@@ -0,0 +1,1461 @@
+package com.sample;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.downloader.Error;
+import com.downloader.OnCancelListener;
+import com.downloader.OnDownloadListener;
+import com.downloader.OnPauseListener;
+import com.downloader.OnProgressListener;
+import com.downloader.OnStartOrResumeListener;
+import com.downloader.PRDownloader;
+import com.downloader.Progress;
+import com.downloader.Status;
+import com.sample.utils.Utils;
+
+public class MainActivity extends AppCompatActivity {
+
+    private static String dirPath;
+
+    final String URL1 = "http://www.appsapk.com/downloading/latest/Facebook-119.0.0.23.70.apk";
+    final String URL2 = "http://www.appsapk.com/downloading/latest/WeChat-6.5.7.apk";
+    final String URL3 = "http://www.appsapk.com/downloading/latest/Instagram.apk";
+    final String URL4 = "http://www.appsapk.com/downloading/latest/Emoji%20Flashlight%20-%20Brightest%20Flashlight%202018-2.0.1.apk";
+    final String URL5 = "http://www.appsapk.com/downloading/latest/Screen%20Recorder-7.7.apk";
+    final String URL6 = "http://www.appsapk.com/downloading/latest/Call%20Recorder%20-%20Automatic%20Call%20Recorder-1.6.0.apk";
+    final String URL7 = "http://www.appsapk.com/downloading/latest/Sound%20Profile%20(+%20volume%20scheduler)-5.25.apk";
+    final String URL8 = "http://www.appsapk.com/downloading/latest/Evernote%20-%20stay%20organized.-7.9.7.apk";
+    final String URL9 = "http://www.appsapk.com/downloading/latest/UC-Browser.apk";
+    final String URL10 = "http://www.appsapk.com/downloading/latest/Barcode%20Scanner-1.2.apk";
+    final String URL11 = "http://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_640x360.m4v";
+    final String URL12 = "http://www2.sdfi.edu.cn/netclass/jiaoan/englit/download/Harry%20Potter%20and%20the%20Sorcerer's%20Stone.pdf";
+    final String URL13 = "https://media.giphy.com/media/Bk0CW5frw4qfS/giphy.gif";
+    final String URL14 = "http://techslides.com/demos/sample-videos/small.mp4";
+    final String URL15 = "http://www.sample-videos.com/video/mp4/720/big_buck_bunny_720p_10mb.mp4";
+
+    Button buttonOne, buttonTwo, buttonThree, buttonFour,
+            buttonFive, buttonSix, buttonSeven, buttonEight,
+            buttonNine, buttonTen, buttonEleven, buttonTwelve,
+            buttonThirteen, buttonFourteen, buttonFifteen,
+            buttonCancelOne, buttonCancelTwo, buttonCancelThree,
+            buttonCancelFour, buttonCancelFive, buttonCancelSix,
+            buttonCancelSeven, buttonCancelEight, buttonCancelNine,
+            buttonCancelTen, buttonCancelEleven, buttonCancelTwelve,
+            buttonCancelThirteen, buttonCancelFourteen, buttonCancelFifteen;
+
+    TextView textViewProgressOne, textViewProgressTwo, textViewProgressThree,
+            textViewProgressFour, textViewProgressFive, textViewProgressSix,
+            textViewProgressSeven, textViewProgressEight, textViewProgressNine,
+            textViewProgressTen, textViewProgressEleven, textViewProgressTwelve,
+            textViewProgressThirteen, textViewProgressFourteen, textViewProgressFifteen;
+
+    ProgressBar progressBarOne, progressBarTwo, progressBarThree,
+            progressBarFour, progressBarFive, progressBarSix,
+            progressBarSeven, progressBarEight, progressBarNine,
+            progressBarTen, progressBarEleven, progressBarTwelve,
+            progressBarThirteen, progressBarFourteen, progressBarFifteen;
+
+    int downloadIdOne, downloadIdTwo, downloadIdThree, downloadIdFour,
+            downloadIdFive, downloadIdSix, downloadIdSeven,
+            downloadIdEight, downloadIdNine, downloadIdTen,
+            downloadIdEleven, downloadIdTwelve, downloadIdThirteen,
+            downloadIdFourteen, downloadIdFifteen;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        dirPath = Utils.getRootDirPath(getApplicationContext());
+
+        init();
+
+        onClickListenerOne();
+        onClickListenerTwo();
+        onClickListenerThree();
+        onClickListenerFour();
+        onClickListenerFive();
+        onClickListenerSix();
+        onClickListenerSeven();
+        onClickListenerEight();
+        onClickListenerNine();
+        onClickListenerTen();
+        onClickListenerEleven();
+        onClickListenerTwelve();
+        onClickListenerThirteen();
+        onClickListenerFourteen();
+        onClickListenerFifteen();
+    }
+
+    private void init() {
+        buttonOne = findViewById(R.id.buttonOne);
+        buttonTwo = findViewById(R.id.buttonTwo);
+        buttonThree = findViewById(R.id.buttonThree);
+        buttonFour = findViewById(R.id.buttonFour);
+        buttonFive = findViewById(R.id.buttonFive);
+        buttonSix = findViewById(R.id.buttonSix);
+        buttonSeven = findViewById(R.id.buttonSeven);
+        buttonEight = findViewById(R.id.buttonEight);
+        buttonNine = findViewById(R.id.buttonNine);
+        buttonTen = findViewById(R.id.buttonTen);
+        buttonEleven = findViewById(R.id.buttonEleven);
+        buttonTwelve = findViewById(R.id.buttonTwelve);
+        buttonThirteen = findViewById(R.id.buttonThirteen);
+        buttonFourteen = findViewById(R.id.buttonFourteen);
+        buttonFifteen = findViewById(R.id.buttonFifteen);
+
+        buttonCancelOne = findViewById(R.id.buttonCancelOne);
+        buttonCancelTwo = findViewById(R.id.buttonCancelTwo);
+        buttonCancelThree = findViewById(R.id.buttonCancelThree);
+        buttonCancelFour = findViewById(R.id.buttonCancelFour);
+        buttonCancelFive = findViewById(R.id.buttonCancelFive);
+        buttonCancelSix = findViewById(R.id.buttonCancelSix);
+        buttonCancelSeven = findViewById(R.id.buttonCancelSeven);
+        buttonCancelEight = findViewById(R.id.buttonCancelEight);
+        buttonCancelNine = findViewById(R.id.buttonCancelNine);
+        buttonCancelTen = findViewById(R.id.buttonCancelTen);
+        buttonCancelEleven = findViewById(R.id.buttonCancelEleven);
+        buttonCancelTwelve = findViewById(R.id.buttonCancelTwelve);
+        buttonCancelThirteen = findViewById(R.id.buttonCancelThirteen);
+        buttonCancelFourteen = findViewById(R.id.buttonCancelFourteen);
+        buttonCancelFifteen = findViewById(R.id.buttonCancelFifteen);
+
+        textViewProgressOne = findViewById(R.id.textViewProgressOne);
+        textViewProgressTwo = findViewById(R.id.textViewProgressTwo);
+        textViewProgressThree = findViewById(R.id.textViewProgressThree);
+        textViewProgressFour = findViewById(R.id.textViewProgressFour);
+        textViewProgressFive = findViewById(R.id.textViewProgressFive);
+        textViewProgressSix = findViewById(R.id.textViewProgressSix);
+        textViewProgressSeven = findViewById(R.id.textViewProgressSeven);
+        textViewProgressEight = findViewById(R.id.textViewProgressEight);
+        textViewProgressNine = findViewById(R.id.textViewProgressNine);
+        textViewProgressTen = findViewById(R.id.textViewProgressTen);
+        textViewProgressEleven = findViewById(R.id.textViewProgressEleven);
+        textViewProgressTwelve = findViewById(R.id.textViewProgressTwelve);
+        textViewProgressThirteen = findViewById(R.id.textViewProgressThirteen);
+        textViewProgressFourteen = findViewById(R.id.textViewProgressFourteen);
+        textViewProgressFifteen = findViewById(R.id.textViewProgressFifteen);
+
+        progressBarOne = findViewById(R.id.progressBarOne);
+        progressBarTwo = findViewById(R.id.progressBarTwo);
+        progressBarThree = findViewById(R.id.progressBarThree);
+        progressBarFour = findViewById(R.id.progressBarFour);
+        progressBarFive = findViewById(R.id.progressBarFive);
+        progressBarSix = findViewById(R.id.progressBarSix);
+        progressBarSeven = findViewById(R.id.progressBarSeven);
+        progressBarEight = findViewById(R.id.progressBarEight);
+        progressBarNine = findViewById(R.id.progressBarNine);
+        progressBarTen = findViewById(R.id.progressBarTen);
+        progressBarEleven = findViewById(R.id.progressBarEleven);
+        progressBarTwelve = findViewById(R.id.progressBarTwelve);
+        progressBarThirteen = findViewById(R.id.progressBarThirteen);
+        progressBarFourteen = findViewById(R.id.progressBarFourteen);
+        progressBarFifteen = findViewById(R.id.progressBarFifteen);
+    }
+
+    public void onClickListenerOne() {
+        buttonOne.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdOne)) {
+                    PRDownloader.pause(downloadIdOne);
+                    return;
+                }
+
+                buttonOne.setEnabled(false);
+                progressBarOne.setIndeterminate(true);
+                progressBarOne.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdOne)) {
+                    PRDownloader.resume(downloadIdOne);
+                    return;
+                }
+
+                downloadIdOne = PRDownloader.download(URL1, dirPath, "facebook.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarOne.setIndeterminate(false);
+                                buttonOne.setEnabled(true);
+                                buttonOne.setText(R.string.pause);
+                                buttonCancelOne.setEnabled(true);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonOne.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                buttonOne.setText(R.string.start);
+                                buttonCancelOne.setEnabled(false);
+                                progressBarOne.setProgress(0);
+                                textViewProgressOne.setText("");
+                                downloadIdOne = 0;
+                                progressBarOne.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarOne.setProgress((int) progressPercent);
+                                textViewProgressOne.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                                progressBarOne.setIndeterminate(false);
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonOne.setEnabled(false);
+                                buttonCancelOne.setEnabled(false);
+                                buttonOne.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonOne.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "1", Toast.LENGTH_SHORT).show();
+                                textViewProgressOne.setText("");
+                                progressBarOne.setProgress(0);
+                                downloadIdOne = 0;
+                                buttonCancelOne.setEnabled(false);
+                                progressBarOne.setIndeterminate(false);
+                                buttonOne.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelOne.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdOne);
+            }
+        });
+    }
+
+    public void onClickListenerTwo() {
+        buttonTwo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdTwo)) {
+                    PRDownloader.pause(downloadIdTwo);
+                    return;
+                }
+
+                buttonTwo.setEnabled(false);
+                progressBarTwo.setIndeterminate(true);
+                progressBarTwo.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdTwo)) {
+                    PRDownloader.resume(downloadIdTwo);
+                    return;
+                }
+                downloadIdTwo = PRDownloader.download(URL2, dirPath, "wechat.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarTwo.setIndeterminate(false);
+                                buttonTwo.setEnabled(true);
+                                buttonTwo.setText(R.string.pause);
+                                buttonCancelTwo.setEnabled(true);
+                                buttonCancelTwo.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonTwo.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdTwo = 0;
+                                buttonTwo.setText(R.string.start);
+                                buttonCancelTwo.setEnabled(false);
+                                progressBarTwo.setProgress(0);
+                                textViewProgressTwo.setText("");
+                                progressBarTwo.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarTwo.setProgress((int) progressPercent);
+                                textViewProgressTwo.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonTwo.setEnabled(false);
+                                buttonCancelTwo.setEnabled(false);
+                                buttonTwo.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonTwo.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "2", Toast.LENGTH_SHORT).show();
+                                textViewProgressTwo.setText("");
+                                progressBarTwo.setProgress(0);
+                                downloadIdTwo = 0;
+                                buttonCancelTwo.setEnabled(false);
+                                progressBarTwo.setIndeterminate(false);
+                                buttonTwo.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelTwo.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdTwo);
+            }
+        });
+    }
+
+    public void onClickListenerThree() {
+        buttonThree.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdThree)) {
+                    PRDownloader.pause(downloadIdThree);
+                    return;
+                }
+
+                buttonThree.setEnabled(false);
+                progressBarThree.setIndeterminate(true);
+                progressBarThree.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdThree)) {
+                    PRDownloader.resume(downloadIdThree);
+                    return;
+                }
+                downloadIdThree = PRDownloader.download(URL3, dirPath, "instagram.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarThree.setIndeterminate(false);
+                                buttonThree.setEnabled(true);
+                                buttonThree.setText(R.string.pause);
+                                buttonCancelThree.setEnabled(true);
+                                buttonCancelThree.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonThree.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdThree = 0;
+                                buttonThree.setText(R.string.start);
+                                buttonCancelThree.setEnabled(false);
+                                progressBarThree.setProgress(0);
+                                textViewProgressThree.setText("");
+                                progressBarThree.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarThree.setProgress((int) progressPercent);
+                                textViewProgressThree.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonThree.setEnabled(false);
+                                buttonCancelThree.setEnabled(false);
+                                buttonThree.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonThree.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "3", Toast.LENGTH_SHORT).show();
+                                textViewProgressThree.setText("");
+                                progressBarThree.setProgress(0);
+                                downloadIdThree = 0;
+                                buttonCancelThree.setEnabled(false);
+                                progressBarThree.setIndeterminate(false);
+                                buttonThree.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelThree.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdThree);
+            }
+        });
+    }
+
+    public void onClickListenerFour() {
+        buttonFour.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFour)) {
+                    PRDownloader.pause(downloadIdFour);
+                    return;
+                }
+
+                buttonFour.setEnabled(false);
+                progressBarFour.setIndeterminate(true);
+                progressBarFour.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFour)) {
+                    PRDownloader.resume(downloadIdFour);
+                    return;
+                }
+                downloadIdFour = PRDownloader.download(URL4, dirPath, "flashlight.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFour.setIndeterminate(false);
+                                buttonFour.setEnabled(true);
+                                buttonFour.setText(R.string.pause);
+                                buttonCancelFour.setEnabled(true);
+                                buttonCancelFour.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFour.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFour = 0;
+                                buttonFour.setText(R.string.start);
+                                buttonCancelFour.setEnabled(false);
+                                progressBarFour.setProgress(0);
+                                textViewProgressFour.setText("");
+                                progressBarFour.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFour.setProgress((int) progressPercent);
+                                textViewProgressFour.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFour.setEnabled(false);
+                                buttonCancelFour.setEnabled(false);
+                                buttonFour.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFour.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "4", Toast.LENGTH_SHORT).show();
+                                textViewProgressFour.setText("");
+                                progressBarFour.setProgress(0);
+                                downloadIdFour = 0;
+                                buttonCancelFour.setEnabled(false);
+                                progressBarFour.setIndeterminate(false);
+                                buttonFour.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFour.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFour);
+            }
+        });
+    }
+
+    public void onClickListenerFive() {
+        buttonFive.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFive)) {
+                    PRDownloader.pause(downloadIdFive);
+                    return;
+                }
+
+                buttonFive.setEnabled(false);
+                progressBarFive.setIndeterminate(true);
+                progressBarFive.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFive)) {
+                    PRDownloader.resume(downloadIdFive);
+                    return;
+                }
+                downloadIdFive = PRDownloader.download(URL5, dirPath, "screenrecorder.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFive.setIndeterminate(false);
+                                buttonFive.setEnabled(true);
+                                buttonFive.setText(R.string.pause);
+                                buttonCancelFive.setEnabled(true);
+                                buttonCancelFive.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFive.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFive = 0;
+                                buttonFive.setText(R.string.start);
+                                buttonCancelFive.setEnabled(false);
+                                progressBarFive.setProgress(0);
+                                textViewProgressFive.setText("");
+                                progressBarFive.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFive.setProgress((int) progressPercent);
+                                textViewProgressFive.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFive.setEnabled(false);
+                                buttonCancelFive.setEnabled(false);
+                                buttonFive.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFive.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "5", Toast.LENGTH_SHORT).show();
+                                textViewProgressFive.setText("");
+                                progressBarFive.setProgress(0);
+                                downloadIdFive = 0;
+                                buttonCancelFive.setEnabled(false);
+                                progressBarFive.setIndeterminate(false);
+                                buttonFive.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFive.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFive);
+            }
+        });
+
+    }
+
+    public void onClickListenerSix() {
+        buttonSix.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdSix)) {
+                    PRDownloader.pause(downloadIdSix);
+                    return;
+                }
+
+                buttonSix.setEnabled(false);
+                progressBarSix.setIndeterminate(true);
+                progressBarSix.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdSix)) {
+                    PRDownloader.resume(downloadIdSix);
+                    return;
+                }
+                downloadIdSix = PRDownloader.download(URL6, dirPath, "callrecorder.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarSix.setIndeterminate(false);
+                                buttonSix.setEnabled(true);
+                                buttonSix.setText(R.string.pause);
+                                buttonCancelSix.setEnabled(true);
+                                buttonCancelSix.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonSix.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdSix = 0;
+                                buttonSix.setText(R.string.start);
+                                buttonCancelSix.setEnabled(false);
+                                progressBarSix.setProgress(0);
+                                textViewProgressSix.setText("");
+                                progressBarSix.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarSix.setProgress((int) progressPercent);
+                                textViewProgressSix.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonSix.setEnabled(false);
+                                buttonCancelSix.setEnabled(false);
+                                buttonSix.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonSix.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "6", Toast.LENGTH_SHORT).show();
+                                textViewProgressSix.setText("");
+                                progressBarSix.setProgress(0);
+                                downloadIdSix = 0;
+                                buttonCancelSix.setEnabled(false);
+                                progressBarSix.setIndeterminate(false);
+                                buttonSix.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelSix.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdSix);
+            }
+        });
+
+    }
+
+    public void onClickListenerSeven() {
+        buttonSeven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdSeven)) {
+                    PRDownloader.pause(downloadIdSeven);
+                    return;
+                }
+
+                buttonSeven.setEnabled(false);
+                progressBarSeven.setIndeterminate(true);
+                progressBarSeven.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdSeven)) {
+                    PRDownloader.resume(downloadIdSeven);
+                    return;
+                }
+                downloadIdSeven = PRDownloader.download(URL7, dirPath, "soundprofile.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarSeven.setIndeterminate(false);
+                                buttonSeven.setEnabled(true);
+                                buttonSeven.setText(R.string.pause);
+                                buttonCancelSeven.setEnabled(true);
+                                buttonCancelSeven.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonSeven.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdSeven = 0;
+                                buttonSeven.setText(R.string.start);
+                                buttonCancelSeven.setEnabled(false);
+                                progressBarSeven.setProgress(0);
+                                textViewProgressSeven.setText("");
+                                progressBarSeven.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarSeven.setProgress((int) progressPercent);
+                                textViewProgressSeven.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonSeven.setEnabled(false);
+                                buttonCancelSeven.setEnabled(false);
+                                buttonSeven.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonSeven.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "7", Toast.LENGTH_SHORT).show();
+                                textViewProgressSeven.setText("");
+                                progressBarSeven.setProgress(0);
+                                downloadIdSeven = 0;
+                                buttonCancelSeven.setEnabled(false);
+                                progressBarSeven.setIndeterminate(false);
+                                buttonSeven.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelSeven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdSeven);
+            }
+        });
+
+    }
+
+    public void onClickListenerEight() {
+        buttonEight.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdEight)) {
+                    PRDownloader.pause(downloadIdEight);
+                    return;
+                }
+
+                buttonEight.setEnabled(false);
+                progressBarEight.setIndeterminate(true);
+                progressBarEight.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdEight)) {
+                    PRDownloader.resume(downloadIdEight);
+                    return;
+                }
+                downloadIdEight = PRDownloader.download(URL8, dirPath, "evernote.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarEight.setIndeterminate(false);
+                                buttonEight.setEnabled(true);
+                                buttonEight.setText(R.string.pause);
+                                buttonCancelEight.setEnabled(true);
+                                buttonCancelEight.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonEight.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdEight = 0;
+                                buttonEight.setText(R.string.start);
+                                buttonCancelEight.setEnabled(false);
+                                progressBarEight.setProgress(0);
+                                textViewProgressEight.setText("");
+                                progressBarEight.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarEight.setProgress((int) progressPercent);
+                                textViewProgressEight.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonEight.setEnabled(false);
+                                buttonCancelEight.setEnabled(false);
+                                buttonEight.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonEight.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "8", Toast.LENGTH_SHORT).show();
+                                textViewProgressEight.setText("");
+                                progressBarEight.setProgress(0);
+                                downloadIdEight = 0;
+                                buttonCancelEight.setEnabled(false);
+                                progressBarEight.setIndeterminate(false);
+                                buttonEight.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelEight.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdEight);
+            }
+        });
+    }
+
+    public void onClickListenerNine() {
+        buttonNine.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdNine)) {
+                    PRDownloader.pause(downloadIdNine);
+                    return;
+                }
+
+                buttonNine.setEnabled(false);
+                progressBarNine.setIndeterminate(true);
+                progressBarNine.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdNine)) {
+                    PRDownloader.resume(downloadIdNine);
+                    return;
+                }
+                downloadIdNine = PRDownloader.download(URL9, dirPath, "ucbrowser.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarNine.setIndeterminate(false);
+                                buttonNine.setEnabled(true);
+                                buttonNine.setText(R.string.pause);
+                                buttonCancelNine.setEnabled(true);
+                                buttonCancelNine.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonNine.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdNine = 0;
+                                buttonNine.setText(R.string.start);
+                                buttonCancelNine.setEnabled(false);
+                                progressBarNine.setProgress(0);
+                                textViewProgressNine.setText("");
+                                progressBarNine.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarNine.setProgress((int) progressPercent);
+                                textViewProgressNine.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonNine.setEnabled(false);
+                                buttonCancelNine.setEnabled(false);
+                                buttonNine.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonNine.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "9", Toast.LENGTH_SHORT).show();
+                                textViewProgressNine.setText("");
+                                progressBarNine.setProgress(0);
+                                downloadIdNine = 0;
+                                buttonCancelNine.setEnabled(false);
+                                progressBarNine.setIndeterminate(false);
+                                buttonNine.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelNine.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdNine);
+            }
+        });
+    }
+
+    public void onClickListenerTen() {
+        buttonTen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdTen)) {
+                    PRDownloader.pause(downloadIdTen);
+                    return;
+                }
+
+                buttonTen.setEnabled(false);
+                progressBarTen.setIndeterminate(true);
+                progressBarTen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdTen)) {
+                    PRDownloader.resume(downloadIdTen);
+                    return;
+                }
+                downloadIdTen = PRDownloader.download(URL10, dirPath, "barcodescanner.apk")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarTen.setIndeterminate(false);
+                                buttonTen.setEnabled(true);
+                                buttonTen.setText(R.string.pause);
+                                buttonCancelTen.setEnabled(true);
+                                buttonCancelTen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonTen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdTen = 0;
+                                buttonTen.setText(R.string.start);
+                                buttonCancelTen.setEnabled(false);
+                                progressBarTen.setProgress(0);
+                                textViewProgressTen.setText("");
+                                progressBarTen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarTen.setProgress((int) progressPercent);
+                                textViewProgressTen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonTen.setEnabled(false);
+                                buttonCancelTen.setEnabled(false);
+                                buttonTen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonTen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "10", Toast.LENGTH_SHORT).show();
+                                textViewProgressTen.setText("");
+                                progressBarTen.setProgress(0);
+                                downloadIdTen = 0;
+                                buttonCancelTen.setEnabled(false);
+                                progressBarTen.setIndeterminate(false);
+                                buttonTen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelTen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdTen);
+            }
+        });
+    }
+
+    public void onClickListenerEleven() {
+        buttonEleven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdEleven)) {
+                    PRDownloader.pause(downloadIdEleven);
+                    return;
+                }
+
+                buttonEleven.setEnabled(false);
+                progressBarEleven.setIndeterminate(true);
+                progressBarEleven.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdEleven)) {
+                    PRDownloader.resume(downloadIdEleven);
+                    return;
+                }
+                downloadIdEleven = PRDownloader.download(URL11, dirPath, "BigBuckBunny.m4v")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarEleven.setIndeterminate(false);
+                                buttonEleven.setEnabled(true);
+                                buttonEleven.setText(R.string.pause);
+                                buttonCancelEleven.setEnabled(true);
+                                buttonCancelEleven.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonEleven.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdEleven = 0;
+                                buttonEleven.setText(R.string.start);
+                                buttonCancelEleven.setEnabled(false);
+                                progressBarEleven.setProgress(0);
+                                textViewProgressEleven.setText("");
+                                progressBarEleven.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarEleven.setProgress((int) progressPercent);
+                                textViewProgressEleven.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonEleven.setEnabled(false);
+                                buttonCancelEleven.setEnabled(false);
+                                buttonEleven.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonEleven.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "11", Toast.LENGTH_SHORT).show();
+                                textViewProgressEleven.setText("");
+                                progressBarEleven.setProgress(0);
+                                downloadIdEleven = 0;
+                                buttonCancelEleven.setEnabled(false);
+                                progressBarEleven.setIndeterminate(false);
+                                buttonEleven.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelEleven.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdEleven);
+            }
+        });
+    }
+
+    public void onClickListenerTwelve() {
+        buttonTwelve.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdTwelve)) {
+                    PRDownloader.pause(downloadIdTwelve);
+                    return;
+                }
+
+                buttonTwelve.setEnabled(false);
+                progressBarTwelve.setIndeterminate(true);
+                progressBarTwelve.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdTwelve)) {
+                    PRDownloader.resume(downloadIdTwelve);
+                    return;
+                }
+                downloadIdTwelve = PRDownloader.download(URL12, dirPath, "harry-porter.pdf")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarTwelve.setIndeterminate(false);
+                                buttonTwelve.setEnabled(true);
+                                buttonTwelve.setText(R.string.pause);
+                                buttonCancelTwelve.setEnabled(true);
+                                buttonCancelTwelve.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonTwelve.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdTwelve = 0;
+                                buttonTwelve.setText(R.string.start);
+                                buttonCancelTwelve.setEnabled(false);
+                                progressBarTwelve.setProgress(0);
+                                textViewProgressTwelve.setText("");
+                                progressBarTwelve.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarTwelve.setProgress((int) progressPercent);
+                                textViewProgressTwelve.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonTwelve.setEnabled(false);
+                                buttonCancelTwelve.setEnabled(false);
+                                buttonTwelve.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonTwelve.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "12", Toast.LENGTH_SHORT).show();
+                                textViewProgressTwelve.setText("");
+                                progressBarTwelve.setProgress(0);
+                                downloadIdTwelve = 0;
+                                buttonCancelTwelve.setEnabled(false);
+                                progressBarTwelve.setIndeterminate(false);
+                                buttonTwelve.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelTwelve.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdTwelve);
+            }
+        });
+    }
+
+    public void onClickListenerThirteen() {
+        buttonThirteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdThirteen)) {
+                    PRDownloader.pause(downloadIdThirteen);
+                    return;
+                }
+
+                buttonThirteen.setEnabled(false);
+                progressBarThirteen.setIndeterminate(true);
+                progressBarThirteen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdThirteen)) {
+                    PRDownloader.resume(downloadIdThirteen);
+                    return;
+                }
+                downloadIdThirteen = PRDownloader.download(URL13, dirPath, "giphy.gif")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarThirteen.setIndeterminate(false);
+                                buttonThirteen.setEnabled(true);
+                                buttonThirteen.setText(R.string.pause);
+                                buttonCancelThirteen.setEnabled(true);
+                                buttonCancelThirteen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonThirteen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdThirteen = 0;
+                                buttonThirteen.setText(R.string.start);
+                                buttonCancelThirteen.setEnabled(false);
+                                progressBarThirteen.setProgress(0);
+                                textViewProgressThirteen.setText("");
+                                progressBarThirteen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarThirteen.setProgress((int) progressPercent);
+                                textViewProgressThirteen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonThirteen.setEnabled(false);
+                                buttonCancelThirteen.setEnabled(false);
+                                buttonThirteen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonThirteen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "13", Toast.LENGTH_SHORT).show();
+                                textViewProgressThirteen.setText("");
+                                progressBarThirteen.setProgress(0);
+                                downloadIdThirteen = 0;
+                                buttonCancelThirteen.setEnabled(false);
+                                progressBarThirteen.setIndeterminate(false);
+                                buttonThirteen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelThirteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdThirteen);
+            }
+        });
+
+    }
+
+    public void onClickListenerFourteen() {
+        buttonFourteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFourteen)) {
+                    PRDownloader.pause(downloadIdFourteen);
+                    return;
+                }
+
+                buttonFourteen.setEnabled(false);
+                progressBarFourteen.setIndeterminate(true);
+                progressBarFourteen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFourteen)) {
+                    PRDownloader.resume(downloadIdFourteen);
+                    return;
+                }
+                downloadIdFourteen = PRDownloader.download(URL14, dirPath, "small.mp4")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFourteen.setIndeterminate(false);
+                                buttonFourteen.setEnabled(true);
+                                buttonFourteen.setText(R.string.pause);
+                                buttonCancelFourteen.setEnabled(true);
+                                buttonCancelFourteen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFourteen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFourteen = 0;
+                                buttonFourteen.setText(R.string.start);
+                                buttonCancelFourteen.setEnabled(false);
+                                progressBarFourteen.setProgress(0);
+                                textViewProgressFourteen.setText("");
+                                progressBarFourteen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFourteen.setProgress((int) progressPercent);
+                                textViewProgressFourteen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFourteen.setEnabled(false);
+                                buttonCancelFourteen.setEnabled(false);
+                                buttonFourteen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFourteen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "14", Toast.LENGTH_SHORT).show();
+                                textViewProgressFourteen.setText("");
+                                progressBarFourteen.setProgress(0);
+                                downloadIdFourteen = 0;
+                                buttonCancelFourteen.setEnabled(false);
+                                progressBarFourteen.setIndeterminate(false);
+                                buttonFourteen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFourteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFourteen);
+            }
+        });
+
+    }
+
+    public void onClickListenerFifteen() {
+        buttonFifteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (Status.RUNNING == PRDownloader.getStatus(downloadIdFifteen)) {
+                    PRDownloader.pause(downloadIdFifteen);
+                    return;
+                }
+
+                buttonFifteen.setEnabled(false);
+                progressBarFifteen.setIndeterminate(true);
+                progressBarFifteen.getIndeterminateDrawable().setColorFilter(
+                        Color.BLUE, android.graphics.PorterDuff.Mode.SRC_IN);
+
+                if (Status.PAUSED == PRDownloader.getStatus(downloadIdFifteen)) {
+                    PRDownloader.resume(downloadIdFifteen);
+                    return;
+                }
+                downloadIdFifteen = PRDownloader.download(URL15, dirPath, "big_buck_bunny_720p_10mb.mp4")
+                        .build()
+                        .setOnStartOrResumeListener(new OnStartOrResumeListener() {
+                            @Override
+                            public void onStartOrResume() {
+                                progressBarFifteen.setIndeterminate(false);
+                                buttonFifteen.setEnabled(true);
+                                buttonFifteen.setText(R.string.pause);
+                                buttonCancelFifteen.setEnabled(true);
+                                buttonCancelFifteen.setText(R.string.cancel);
+                            }
+                        })
+                        .setOnPauseListener(new OnPauseListener() {
+                            @Override
+                            public void onPause() {
+                                buttonFifteen.setText(R.string.resume);
+                            }
+                        })
+                        .setOnCancelListener(new OnCancelListener() {
+                            @Override
+                            public void onCancel() {
+                                downloadIdFifteen = 0;
+                                buttonFifteen.setText(R.string.start);
+                                buttonCancelFifteen.setEnabled(false);
+                                progressBarFifteen.setProgress(0);
+                                textViewProgressFifteen.setText("");
+                                progressBarFifteen.setIndeterminate(false);
+                            }
+                        })
+                        .setOnProgressListener(new OnProgressListener() {
+                            @Override
+                            public void onProgress(Progress progress) {
+                                long progressPercent = progress.currentBytes * 100 / progress.totalBytes;
+                                progressBarFifteen.setProgress((int) progressPercent);
+                                textViewProgressFifteen.setText(Utils.getProgressDisplayLine(progress.currentBytes, progress.totalBytes));
+                            }
+                        })
+                        .start(new OnDownloadListener() {
+                            @Override
+                            public void onDownloadComplete() {
+                                buttonFifteen.setEnabled(false);
+                                buttonCancelFifteen.setEnabled(false);
+                                buttonFifteen.setText(R.string.completed);
+                            }
+
+                            @Override
+                            public void onError(Error error) {
+                                buttonFifteen.setText(R.string.start);
+                                Toast.makeText(getApplicationContext(), getString(R.string.some_error_occurred) + " " + "15", Toast.LENGTH_SHORT).show();
+                                textViewProgressFifteen.setText("");
+                                progressBarFifteen.setProgress(0);
+                                downloadIdFifteen = 0;
+                                buttonCancelFifteen.setEnabled(false);
+                                progressBarFifteen.setIndeterminate(false);
+                                buttonFifteen.setEnabled(true);
+                            }
+                        });
+            }
+        });
+
+        buttonCancelFifteen.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                PRDownloader.cancel(downloadIdFifteen);
+            }
+        });
+    }
+
+}
+
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/java/com/sample/SampleApp.java b/OnTime_User_live/lib/PRDownloader/app/src/main/java/com/sample/SampleApp.java
new file mode 100755
index 0000000..986e34a
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/java/com/sample/SampleApp.java
@@ -0,0 +1,23 @@
+package com.sample;
+
+import android.app.Application;
+
+import com.downloader.PRDownloader;
+import com.downloader.PRDownloaderConfig;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class SampleApp extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        PRDownloaderConfig config = PRDownloaderConfig.newBuilder()
+                .setDatabaseEnabled(true)
+                .build();
+        PRDownloader.initialize(this, config);
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/java/com/sample/utils/Utils.java b/OnTime_User_live/lib/PRDownloader/app/src/main/java/com/sample/utils/Utils.java
new file mode 100755
index 0000000..0df9e2d
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/java/com/sample/utils/Utils.java
@@ -0,0 +1,38 @@
+package com.sample.utils;
+
+import android.content.Context;
+import android.os.Environment;
+import android.support.v4.content.ContextCompat;
+
+import java.io.File;
+import java.util.Locale;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public final class Utils {
+
+    private Utils() {
+        // no instance
+    }
+
+    public static String getRootDirPath(Context context) {
+        if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+            File file = ContextCompat.getExternalFilesDirs(context.getApplicationContext(),
+                    null)[0];
+            return file.getAbsolutePath();
+        } else {
+            return context.getApplicationContext().getFilesDir().getAbsolutePath();
+        }
+    }
+
+    public static String getProgressDisplayLine(long currentBytes, long totalBytes) {
+        return getBytesToMBString(currentBytes) + "/" + getBytesToMBString(totalBytes);
+    }
+
+    private static String getBytesToMBString(long bytes) {
+        return String.format(Locale.ENGLISH, "%.2fMb", bytes / (1024.00 * 1024.00));
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/OnTime_User_live/lib/PRDownloader/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100755
index 0000000..c7bd21d
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/drawable/border_black.xml b/OnTime_User_live/lib/PRDownloader/app/src/main/res/drawable/border_black.xml
new file mode 100755
index 0000000..45c1dec
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/res/drawable/border_black.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp" />
+    <stroke android:width="1dp"
+        android:color="@android:color/background_dark"/>
+    <solid android:color="@android:color/transparent" />
+</shape>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/drawable/ic_launcher_background.xml b/OnTime_User_live/lib/PRDownloader/app/src/main/res/drawable/ic_launcher_background.xml
new file mode 100755
index 0000000..5c6729c
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/layout/activity_main.xml b/OnTime_User_live/lib/PRDownloader/app/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..ee8d470
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,765 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.sample.MainActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarOne"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarOne"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressOne"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelOne"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonOne"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarTwo"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarTwo"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressTwo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelTwo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonTwo"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarThree"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarThree"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressThree"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelThree"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonThree"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFour"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFour"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFour"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFour"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFour"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFive"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFive"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFive"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFive"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFive"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarSix"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarSix"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressSix"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelSix"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonSix"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarSeven"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarSeven"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressSeven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelSeven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonSeven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarEight"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarEight"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressEight"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelEight"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonEight"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarNine"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarNine"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressNine"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelNine"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonNine"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarTen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarTen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressTen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelTen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonTen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarEleven"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarEleven"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressEleven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelEleven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonEleven"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarTwelve"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarTwelve"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressTwelve"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelTwelve"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonTwelve"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarThirteen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarThirteen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressThirteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelThirteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonThirteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFourteen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFourteen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFourteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFourteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFourteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:background="@drawable/border_black">
+
+            <ProgressBar
+                android:id="@+id/progressBarFifteen"
+                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:progressTint="@color/colorPrimaryDark" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/progressBarFifteen"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/textViewProgressFifteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="2dp"
+                    android:layout_weight="1"
+
+                    android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/buttonCancelFifteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:text="@string/cancel" />
+
+                <Button
+                    android:id="@+id/buttonFifteen"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="4dp"
+                    android:layout_weight="1"
+                    android:text="@string/start" />
+            </LinearLayout>
+        </RelativeLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100755
index 0000000..eca70cf
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100755
index 0000000..eca70cf
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..a2f5908
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100755
index 0000000..1b52399
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..ff10afd
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100755
index 0000000..115a4c7
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..dcd3cd8
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100755
index 0000000..459ca60
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..8ca12fe
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100755
index 0000000..8e19b41
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..b824ebd
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100755
index 0000000..4c19a13
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/values/colors.xml b/OnTime_User_live/lib/PRDownloader/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..3ab3e9c
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/values/strings.xml b/OnTime_User_live/lib/PRDownloader/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..3e23c7c
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/res/values/strings.xml
@@ -0,0 +1,10 @@
+<resources>
+    <string name="app_name">PRDownloader</string>
+    <string name="some_error_occurred">Some error occurred</string>
+    <string name="start">start</string>
+    <string name="completed">completed</string>
+    <string name="pause">pause</string>
+    <string name="cancel">cancel</string>
+    <string name="resume">resume</string>
+    <string name="restart">restart</string>
+</resources>
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/main/res/values/styles.xml b/OnTime_User_live/lib/PRDownloader/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..5885930
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/OnTime_User_live/lib/PRDownloader/app/src/test/java/com/sample/ExampleUnitTest.java b/OnTime_User_live/lib/PRDownloader/app/src/test/java/com/sample/ExampleUnitTest.java
new file mode 100755
index 0000000..424a1ed
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/app/src/test/java/com/sample/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.sample;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/assets/prdownloader.png b/OnTime_User_live/lib/PRDownloader/assets/prdownloader.png
new file mode 100755
index 0000000..758a0e3
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/assets/prdownloader.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/assets/sample_download.png b/OnTime_User_live/lib/PRDownloader/assets/sample_download.png
new file mode 100755
index 0000000..23e23e2
Binary files /dev/null and b/OnTime_User_live/lib/PRDownloader/assets/sample_download.png differ
diff --git a/OnTime_User_live/lib/PRDownloader/build.gradle b/OnTime_User_live/lib/PRDownloader/build.gradle
new file mode 100755
index 0000000..0ad3aaf
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/build.gradle
@@ -0,0 +1,28 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+
+    repositories {
+        google()
+        jcenter()
+        maven { url 'https://jitpack.io' }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.7.3'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        maven { url 'https://jitpack.io' }
+    }
+}
+
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
+}
diff --git a/OnTime_User_live/lib/PRDownloader/gradle.properties b/OnTime_User_live/lib/PRDownloader/gradle.properties
new file mode 100755
index 0000000..e78e65c
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+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
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+android.useAndroidX=true
diff --git a/OnTime_User_live/lib/PRDownloader/gradle/wrapper/gradle-wrapper.properties b/OnTime_User_live/lib/PRDownloader/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..09523c0
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_User_live/lib/PRDownloader/gradlew b/OnTime_User_live/lib/PRDownloader/gradlew
new file mode 100755
index 0000000..f5feea6
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/gradlew
@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/OnTime_User_live/lib/PRDownloader/gradlew.bat b/OnTime_User_live/lib/PRDownloader/gradlew.bat
new file mode 100755
index 0000000..9b42019
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_User_live/lib/PRDownloader/jitpack.yml b/OnTime_User_live/lib/PRDownloader/jitpack.yml
new file mode 100755
index 0000000..1e41e00
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/jitpack.yml
@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/.gitignore b/OnTime_User_live/lib/PRDownloader/prdownloader/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/build.gradle b/OnTime_User_live/lib/PRDownloader/prdownloader/build.gradle
new file mode 100755
index 0000000..7e30b99
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/build.gradle
@@ -0,0 +1,28 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'com.downloader'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName "1.0.1"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/proguard-rules.pro b/OnTime_User_live/lib/PRDownloader/prdownloader/proguard-rules.pro
new file mode 100755
index 0000000..f1b4245
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/androidTest/java/com/downloader/ExampleInstrumentedTest.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/androidTest/java/com/downloader/ExampleInstrumentedTest.java
new file mode 100755
index 0000000..8afb62c
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/androidTest/java/com/downloader/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.downloader;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.downloader.test", appContext.getPackageName());
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Constants.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Constants.java
new file mode 100755
index 0000000..df5a59b
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Constants.java
@@ -0,0 +1,26 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public final class Constants {
+
+    private Constants() {
+        // no instance
+    }
+
+    public static final int UPDATE = 0x01;
+    public static final String RANGE = "Range";
+    public static final String ETAG = "ETag";
+    public static final String USER_AGENT = "User-Agent";
+    public static final String DEFAULT_USER_AGENT = "PRDownloader";
+
+    public static final int DEFAULT_READ_TIMEOUT_IN_MILLS = 20_000;
+    public static final int DEFAULT_CONNECT_TIMEOUT_IN_MILLS = 20_000;
+
+    public static final int HTTP_RANGE_NOT_SATISFIABLE = 416;
+    public static final int HTTP_TEMPORARY_REDIRECT = 307;
+    public static final int HTTP_PERMANENT_REDIRECT = 308;
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Error.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Error.java
new file mode 100755
index 0000000..15e20a6
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Error.java
@@ -0,0 +1,66 @@
+package com.downloader;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Error {
+
+    private boolean isServerError;
+    private boolean isConnectionError;
+    private String serverErrorMessage;
+    private Map<String, List<String>> headerFields;
+    private Throwable connectionException;
+    private int responseCode;
+
+    public boolean isServerError() {
+        return isServerError;
+    }
+
+    public void setServerError(boolean serverError) {
+        isServerError = serverError;
+    }
+
+    public boolean isConnectionError() {
+        return isConnectionError;
+    }
+
+    public void setConnectionError(boolean connectionError) {
+        isConnectionError = connectionError;
+    }
+
+    public void setServerErrorMessage(String serverErrorMessage) {
+        this.serverErrorMessage = serverErrorMessage;
+    }
+
+    public String getServerErrorMessage() {
+        return serverErrorMessage;
+    }
+
+    public void setHeaderFields(Map<String, List<String>> headerFields) {
+        this.headerFields = headerFields;
+    }
+
+    public Map<String, List<String>> getHeaderFields() {
+        return headerFields;
+    }
+
+    public void setConnectionException(Throwable connectionException) {
+        this.connectionException = connectionException;
+    }
+
+    public Throwable getConnectionException() {
+        return connectionException;
+    }
+
+    public void setResponseCode(int responseCode) {
+        this.responseCode = responseCode;
+    }
+
+    public int getResponseCode() {
+        return responseCode;
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnCancelListener.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnCancelListener.java
new file mode 100755
index 0000000..e9dd8c4
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnCancelListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 15/11/17.
+ */
+
+public interface OnCancelListener {
+
+    void onCancel();
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnDownloadListener.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnDownloadListener.java
new file mode 100755
index 0000000..c9e61de
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnDownloadListener.java
@@ -0,0 +1,13 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface OnDownloadListener {
+
+    void onDownloadComplete();
+
+    void onError(Error error);
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnPauseListener.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnPauseListener.java
new file mode 100755
index 0000000..72654fa
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnPauseListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface OnPauseListener {
+
+    void onPause();
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnProgressListener.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnProgressListener.java
new file mode 100755
index 0000000..751ceaf
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnProgressListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface OnProgressListener {
+
+    void onProgress(Progress progress);
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnStartOrResumeListener.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnStartOrResumeListener.java
new file mode 100755
index 0000000..6e07a84
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnStartOrResumeListener.java
@@ -0,0 +1,11 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 15/11/17.
+ */
+
+public interface OnStartOrResumeListener {
+
+    void onStartOrResume();
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloader.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloader.java
new file mode 100755
index 0000000..8c972ad
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloader.java
@@ -0,0 +1,129 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 12/11/17.
+ */
+
+import android.content.Context;
+
+import com.downloader.core.Core;
+import com.downloader.internal.ComponentHolder;
+import com.downloader.internal.DownloadRequestQueue;
+import com.downloader.request.DownloadRequestBuilder;
+import com.downloader.utils.Utils;
+
+/**
+ * PRDownloader entry point.
+ * You must initialize this class before use. The simplest way is to just do
+ * {#code PRDownloader.initialize(context)}.
+ */
+public class PRDownloader {
+
+    /**
+     * private constructor to prevent instantiation of this class
+     */
+    private PRDownloader() {
+    }
+
+    /**
+     * Initializes PRDownloader with the default config.
+     *
+     * @param context The context
+     */
+    public static void initialize(Context context) {
+        initialize(context, PRDownloaderConfig.newBuilder().build());
+    }
+
+    /**
+     * Initializes PRDownloader with the custom config.
+     *
+     * @param context The context
+     * @param config  The PRDownloaderConfig
+     */
+    public static void initialize(Context context, PRDownloaderConfig config) {
+        ComponentHolder.getInstance().init(context, config);
+        DownloadRequestQueue.initialize();
+    }
+
+    /**
+     * Method to make download request
+     *
+     * @param url      The url on which request is to be made
+     * @param dirPath  The directory path on which file is to be saved
+     * @param fileName The file name with which file is to be saved
+     * @return the DownloadRequestBuilder
+     */
+    public static DownloadRequestBuilder download(String url, String dirPath, String fileName) {
+        return new DownloadRequestBuilder(url, dirPath, fileName);
+    }
+
+    /**
+     * Method to pause request with the given downloadId
+     *
+     * @param downloadId The downloadId with which request is to be paused
+     */
+    public static void pause(int downloadId) {
+        DownloadRequestQueue.getInstance().pause(downloadId);
+    }
+
+    /**
+     * Method to resume request with the given downloadId
+     *
+     * @param downloadId The downloadId with which request is to be resumed
+     */
+    public static void resume(int downloadId) {
+        DownloadRequestQueue.getInstance().resume(downloadId);
+    }
+
+    /**
+     * Method to cancel request with the given downloadId
+     *
+     * @param downloadId The downloadId with which request is to be cancelled
+     */
+    public static void cancel(int downloadId) {
+        DownloadRequestQueue.getInstance().cancel(downloadId);
+    }
+
+    /**
+     * Method to cancel requests with the given tag
+     *
+     * @param tag The tag with which requests are to be cancelled
+     */
+    public static void cancel(Object tag) {
+        DownloadRequestQueue.getInstance().cancel(tag);
+    }
+
+    /**
+     * Method to cancel all requests
+     */
+    public static void cancelAll() {
+        DownloadRequestQueue.getInstance().cancelAll();
+    }
+
+    /**
+     * Method to check the request with the given downloadId is running or not
+     *
+     * @param downloadId The downloadId with which request status is to be checked
+     * @return the running status
+     */
+    public static Status getStatus(int downloadId) {
+        return DownloadRequestQueue.getInstance().getStatus(downloadId);
+    }
+
+    /**
+     * Method to clean up temporary resumed files which is older than the given day
+     *
+     * @param days the days
+     */
+    public static void cleanUp(int days) {
+        Utils.deleteUnwantedModelsAndTempFiles(days);
+    }
+
+    /**
+     * Shuts PRDownloader down
+     */
+    public static void shutDown() {
+        Core.shutDown();
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloaderConfig.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloaderConfig.java
new file mode 100755
index 0000000..4a49c83
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloaderConfig.java
@@ -0,0 +1,107 @@
+package com.downloader;
+
+import com.downloader.httpclient.DefaultHttpClient;
+import com.downloader.httpclient.HttpClient;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class PRDownloaderConfig {
+
+    private int readTimeout;
+    private int connectTimeout;
+    private String userAgent;
+    private HttpClient httpClient;
+    private boolean databaseEnabled;
+
+    private PRDownloaderConfig(Builder builder) {
+        this.readTimeout = builder.readTimeout;
+        this.connectTimeout = builder.connectTimeout;
+        this.userAgent = builder.userAgent;
+        this.httpClient = builder.httpClient;
+        this.databaseEnabled = builder.databaseEnabled;
+    }
+
+    public int getReadTimeout() {
+        return readTimeout;
+    }
+
+    public void setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+    }
+
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    public void setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+    }
+
+    public String getUserAgent() {
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public HttpClient getHttpClient() {
+        return httpClient;
+    }
+
+    public void setHttpClient(HttpClient httpClient) {
+        this.httpClient = httpClient;
+    }
+
+    public boolean isDatabaseEnabled() {
+        return databaseEnabled;
+    }
+
+    public void setDatabaseEnabled(boolean databaseEnabled) {
+        this.databaseEnabled = databaseEnabled;
+    }
+
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+
+        int readTimeout = Constants.DEFAULT_READ_TIMEOUT_IN_MILLS;
+        int connectTimeout = Constants.DEFAULT_CONNECT_TIMEOUT_IN_MILLS;
+        String userAgent = Constants.DEFAULT_USER_AGENT;
+        HttpClient httpClient = new DefaultHttpClient();
+        boolean databaseEnabled = false;
+
+        public Builder setReadTimeout(int readTimeout) {
+            this.readTimeout = readTimeout;
+            return this;
+        }
+
+        public Builder setConnectTimeout(int connectTimeout) {
+            this.connectTimeout = connectTimeout;
+            return this;
+        }
+
+        public Builder setUserAgent(String userAgent) {
+            this.userAgent = userAgent;
+            return this;
+        }
+
+        public Builder setHttpClient(HttpClient httpClient) {
+            this.httpClient = httpClient;
+            return this;
+        }
+
+        public Builder setDatabaseEnabled(boolean databaseEnabled) {
+            this.databaseEnabled = databaseEnabled;
+            return this;
+        }
+
+        public PRDownloaderConfig build() {
+            return new PRDownloaderConfig(this);
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Priority.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Priority.java
new file mode 100755
index 0000000..f9f46e2
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Priority.java
@@ -0,0 +1,32 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+/**
+ * Priority levels recognized by the request server.
+ */
+public enum Priority {
+
+    /**
+     * Lowest priority level. Used for prefetches of data.
+     */
+    LOW,
+
+    /**
+     * Medium priority level. Used for warming of data that might soon get visible.
+     */
+    MEDIUM,
+
+    /**
+     * Highest priority level. Used for data that are currently visible on screen.
+     */
+    HIGH,
+
+    /**
+     * Highest priority level. Used for data that are required instantly(mainly for emergency).
+     */
+    IMMEDIATE
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Progress.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Progress.java
new file mode 100755
index 0000000..b06db5a
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Progress.java
@@ -0,0 +1,26 @@
+package com.downloader;
+
+import java.io.Serializable;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Progress implements Serializable {
+
+    public long currentBytes;
+    public long totalBytes;
+
+    public Progress(long currentBytes, long totalBytes) {
+        this.currentBytes = currentBytes;
+        this.totalBytes = totalBytes;
+    }
+
+    @Override
+    public String toString() {
+        return "Progress{" +
+                "currentBytes=" + currentBytes +
+                ", totalBytes=" + totalBytes +
+                '}';
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Response.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Response.java
new file mode 100755
index 0000000..fd0f076
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Response.java
@@ -0,0 +1,46 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Response {
+
+    private Error error;
+    private boolean isSuccessful;
+    private boolean isPaused;
+    private boolean isCancelled;
+
+    public Error getError() {
+        return error;
+    }
+
+    public void setError(Error error) {
+        this.error = error;
+    }
+
+    public boolean isSuccessful() {
+        return isSuccessful;
+    }
+
+    public void setSuccessful(boolean successful) {
+        isSuccessful = successful;
+    }
+
+    public boolean isPaused() {
+        return isPaused;
+    }
+
+    public void setPaused(boolean paused) {
+        isPaused = paused;
+    }
+
+    public boolean isCancelled() {
+        return isCancelled;
+    }
+
+    public void setCancelled(boolean cancelled) {
+        isCancelled = cancelled;
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Status.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Status.java
new file mode 100755
index 0000000..cc6575c
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Status.java
@@ -0,0 +1,23 @@
+package com.downloader;
+
+/**
+ * Created by amitshekhar on 15/11/17.
+ */
+
+public enum Status {
+
+    QUEUED,
+
+    RUNNING,
+
+    PAUSED,
+
+    COMPLETED,
+
+    CANCELLED,
+
+    FAILED,
+
+    UNKNOWN
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/Core.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/Core.java
new file mode 100755
index 0000000..1d6e049
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/Core.java
@@ -0,0 +1,36 @@
+package com.downloader.core;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class Core {
+
+    private static Core instance = null;
+    private final ExecutorSupplier executorSupplier;
+
+    private Core() {
+        this.executorSupplier = new DefaultExecutorSupplier();
+    }
+
+    public static Core getInstance() {
+        if (instance == null) {
+            synchronized (Core.class) {
+                if (instance == null) {
+                    instance = new Core();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public ExecutorSupplier getExecutorSupplier() {
+        return executorSupplier;
+    }
+
+    public static void shutDown() {
+        if (instance != null) {
+            instance = null;
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DefaultExecutorSupplier.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DefaultExecutorSupplier.java
new file mode 100755
index 0000000..4a8a26e
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DefaultExecutorSupplier.java
@@ -0,0 +1,41 @@
+package com.downloader.core;
+
+import android.os.Process;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DefaultExecutorSupplier implements ExecutorSupplier {
+
+    private static final int DEFAULT_MAX_NUM_THREADS = 2 * Runtime.getRuntime().availableProcessors() + 1;
+    private final DownloadExecutor networkExecutor;
+    private final Executor backgroundExecutor;
+    private final Executor mainThreadExecutor;
+
+    DefaultExecutorSupplier() {
+        ThreadFactory backgroundPriorityThreadFactory = new PriorityThreadFactory(Process.THREAD_PRIORITY_BACKGROUND);
+        networkExecutor = new DownloadExecutor(DEFAULT_MAX_NUM_THREADS, backgroundPriorityThreadFactory);
+        backgroundExecutor = Executors.newSingleThreadExecutor();
+        mainThreadExecutor = new MainThreadExecutor();
+    }
+
+    @Override
+    public DownloadExecutor forDownloadTasks() {
+        return networkExecutor;
+    }
+
+    @Override
+    public Executor forBackgroundTasks() {
+        return backgroundExecutor;
+    }
+
+    @Override
+    public Executor forMainThreadTasks() {
+        return mainThreadExecutor;
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadExecutor.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadExecutor.java
new file mode 100755
index 0000000..fa659b8
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadExecutor.java
@@ -0,0 +1,27 @@
+package com.downloader.core;
+
+import com.downloader.internal.DownloadRunnable;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadExecutor extends ThreadPoolExecutor {
+
+    DownloadExecutor(int maxNumThreads, ThreadFactory threadFactory) {
+        super(maxNumThreads, maxNumThreads, 0, TimeUnit.MILLISECONDS, new PriorityBlockingQueue<Runnable>(), threadFactory);
+    }
+
+    @Override
+    public Future<?> submit(Runnable task) {
+        DownloadFutureTask futureTask = new DownloadFutureTask((DownloadRunnable) task);
+        execute(futureTask);
+        return futureTask;
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadFutureTask.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadFutureTask.java
new file mode 100755
index 0000000..d2f4b06
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadFutureTask.java
@@ -0,0 +1,27 @@
+package com.downloader.core;
+
+import com.downloader.Priority;
+import com.downloader.internal.DownloadRunnable;
+
+import java.util.concurrent.FutureTask;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadFutureTask extends FutureTask<DownloadRunnable> implements Comparable<DownloadFutureTask> {
+
+    private final DownloadRunnable runnable;
+
+    DownloadFutureTask(DownloadRunnable downloadRunnable) {
+        super(downloadRunnable, null);
+        this.runnable = downloadRunnable;
+    }
+
+    @Override
+    public int compareTo(DownloadFutureTask other) {
+        Priority p1 = runnable.priority;
+        Priority p2 = other.runnable.priority;
+        return (p1 == p2 ? runnable.sequence - other.runnable.sequence : p2.ordinal() - p1.ordinal());
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/ExecutorSupplier.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/ExecutorSupplier.java
new file mode 100755
index 0000000..34f75ac
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/ExecutorSupplier.java
@@ -0,0 +1,17 @@
+package com.downloader.core;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface ExecutorSupplier {
+
+    DownloadExecutor forDownloadTasks();
+
+    Executor forBackgroundTasks();
+
+    Executor forMainThreadTasks();
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/MainThreadExecutor.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/MainThreadExecutor.java
new file mode 100755
index 0000000..af6df63
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/MainThreadExecutor.java
@@ -0,0 +1,20 @@
+package com.downloader.core;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class MainThreadExecutor implements Executor {
+
+    private final Handler handler = new Handler(Looper.getMainLooper());
+
+    @Override
+    public void execute(Runnable runnable) {
+        handler.post(runnable);
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/PriorityThreadFactory.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/PriorityThreadFactory.java
new file mode 100755
index 0000000..a305ebc
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/PriorityThreadFactory.java
@@ -0,0 +1,34 @@
+package com.downloader.core;
+
+import android.os.Process;
+
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class PriorityThreadFactory implements ThreadFactory {
+
+    private final int mThreadPriority;
+
+    PriorityThreadFactory(int threadPriority) {
+        mThreadPriority = threadPriority;
+    }
+
+    @Override
+    public Thread newThread(final Runnable runnable) {
+        Runnable wrapperRunnable = new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    Process.setThreadPriority(mThreadPriority);
+                } catch (Throwable ignored) {
+
+                }
+                runnable.run();
+            }
+        };
+        return new Thread(wrapperRunnable);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/AppDbHelper.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/AppDbHelper.java
new file mode 100755
index 0000000..9955e70
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/AppDbHelper.java
@@ -0,0 +1,154 @@
+package com.downloader.database;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class AppDbHelper implements DbHelper {
+
+    public static final String TABLE_NAME = "prdownloader";
+    private final SQLiteDatabase db;
+
+    public AppDbHelper(Context context) {
+        DatabaseOpenHelper databaseOpenHelper = new DatabaseOpenHelper(context);
+        db = databaseOpenHelper.getWritableDatabase();
+    }
+
+    @Override
+    public DownloadModel find(int id) {
+        Cursor cursor = null;
+        DownloadModel model = null;
+        try {
+            cursor = db.rawQuery("SELECT * FROM " + TABLE_NAME + " WHERE " +
+                    DownloadModel.ID + " = " + id, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                model = new DownloadModel();
+                model.setId(id);
+                model.setUrl(cursor.getString(cursor.getColumnIndex(DownloadModel.URL)));
+                model.setETag(cursor.getString(cursor.getColumnIndex(DownloadModel.ETAG)));
+                model.setDirPath(cursor.getString(cursor.getColumnIndex(DownloadModel.DIR_PATH)));
+                model.setFileName(cursor.getString(cursor.getColumnIndex(DownloadModel.FILE_NAME)));
+                model.setTotalBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.TOTAL_BYTES)));
+                model.setDownloadedBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.DOWNLOADED_BYTES)));
+                model.setLastModifiedAt(cursor.getLong(cursor.getColumnIndex(DownloadModel.LAST_MODIFIED_AT)));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        return model;
+    }
+
+    @Override
+    public void insert(DownloadModel model) {
+        try {
+            ContentValues values = new ContentValues();
+            values.put(DownloadModel.ID, model.getId());
+            values.put(DownloadModel.URL, model.getUrl());
+            values.put(DownloadModel.ETAG, model.getETag());
+            values.put(DownloadModel.DIR_PATH, model.getDirPath());
+            values.put(DownloadModel.FILE_NAME, model.getFileName());
+            values.put(DownloadModel.TOTAL_BYTES, model.getTotalBytes());
+            values.put(DownloadModel.DOWNLOADED_BYTES, model.getDownloadedBytes());
+            values.put(DownloadModel.LAST_MODIFIED_AT, model.getLastModifiedAt());
+            db.insert(TABLE_NAME, null, values);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void update(DownloadModel model) {
+        try {
+            ContentValues values = new ContentValues();
+            values.put(DownloadModel.URL, model.getUrl());
+            values.put(DownloadModel.ETAG, model.getETag());
+            values.put(DownloadModel.DIR_PATH, model.getDirPath());
+            values.put(DownloadModel.FILE_NAME, model.getFileName());
+            values.put(DownloadModel.TOTAL_BYTES, model.getTotalBytes());
+            values.put(DownloadModel.DOWNLOADED_BYTES, model.getDownloadedBytes());
+            values.put(DownloadModel.LAST_MODIFIED_AT, model.getLastModifiedAt());
+            db.update(TABLE_NAME, values, DownloadModel.ID + " = ? ",
+                    new String[]{String.valueOf(model.getId())});
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void updateProgress(int id, long downloadedBytes, long lastModifiedAt) {
+        try {
+            ContentValues values = new ContentValues();
+            values.put(DownloadModel.DOWNLOADED_BYTES, downloadedBytes);
+            values.put(DownloadModel.LAST_MODIFIED_AT, lastModifiedAt);
+            db.update(TABLE_NAME, values, DownloadModel.ID + " = ? ",
+                    new String[]{String.valueOf(id)});
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void remove(int id) {
+        try {
+            db.execSQL("DELETE FROM " + TABLE_NAME + " WHERE " +
+                    DownloadModel.ID + " = " + id);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public List<DownloadModel> getUnwantedModels(int days) {
+        List<DownloadModel> models = new ArrayList<>();
+        Cursor cursor = null;
+        try {
+            final long daysInMillis = days * 24 * 60 * 60 * 1000L;
+            final long beforeTimeInMillis = System.currentTimeMillis() - daysInMillis;
+            cursor = db.rawQuery("SELECT * FROM " + TABLE_NAME + " WHERE " +
+                    DownloadModel.LAST_MODIFIED_AT + " <= " + beforeTimeInMillis, null);
+            if (cursor != null && cursor.moveToFirst()) {
+                do {
+                    DownloadModel model = new DownloadModel();
+                    model.setId(cursor.getInt(cursor.getColumnIndex(DownloadModel.ID)));
+                    model.setUrl(cursor.getString(cursor.getColumnIndex(DownloadModel.URL)));
+                    model.setETag(cursor.getString(cursor.getColumnIndex(DownloadModel.ETAG)));
+                    model.setDirPath(cursor.getString(cursor.getColumnIndex(DownloadModel.DIR_PATH)));
+                    model.setFileName(cursor.getString(cursor.getColumnIndex(DownloadModel.FILE_NAME)));
+                    model.setTotalBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.TOTAL_BYTES)));
+                    model.setDownloadedBytes(cursor.getLong(cursor.getColumnIndex(DownloadModel.DOWNLOADED_BYTES)));
+                    model.setLastModifiedAt(cursor.getLong(cursor.getColumnIndex(DownloadModel.LAST_MODIFIED_AT)));
+
+                    models.add(model);
+                } while (cursor.moveToNext());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        return models;
+    }
+
+    @Override
+    public void clear() {
+        try {
+            db.delete(TABLE_NAME, null, null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DatabaseOpenHelper.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DatabaseOpenHelper.java
new file mode 100755
index 0000000..5d44943
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DatabaseOpenHelper.java
@@ -0,0 +1,40 @@
+package com.downloader.database;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class DatabaseOpenHelper extends SQLiteOpenHelper {
+
+    private static final String DATABASE_NAME = "prdownloader.db";
+    private static final int DATABASE_VERSION = 1;
+
+    DatabaseOpenHelper(Context context) {
+        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL("CREATE TABLE IF NOT EXISTS " +
+                AppDbHelper.TABLE_NAME + "( " +
+                DownloadModel.ID + " INTEGER PRIMARY KEY, " +
+                DownloadModel.URL + " VARCHAR, " +
+                DownloadModel.ETAG + " VARCHAR, " +
+                DownloadModel.DIR_PATH + " VARCHAR, " +
+                DownloadModel.FILE_NAME + " VARCHAR, " +
+                DownloadModel.TOTAL_BYTES + " INTEGER, " +
+                DownloadModel.DOWNLOADED_BYTES + " INTEGER, " +
+                DownloadModel.LAST_MODIFIED_AT + " INTEGER " +
+                ")");
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int i, int i1) {
+
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DbHelper.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DbHelper.java
new file mode 100755
index 0000000..2b69d26
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DbHelper.java
@@ -0,0 +1,25 @@
+package com.downloader.database;
+
+import java.util.List;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public interface DbHelper {
+
+    DownloadModel find(int id);
+
+    void insert(DownloadModel model);
+
+    void update(DownloadModel model);
+
+    void updateProgress(int id, long downloadedBytes, long lastModifiedAt);
+
+    void remove(int id);
+
+    List<DownloadModel> getUnwantedModels(int days);
+
+    void clear();
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DownloadModel.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DownloadModel.java
new file mode 100755
index 0000000..ccffab0
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DownloadModel.java
@@ -0,0 +1,91 @@
+package com.downloader.database;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class DownloadModel {
+
+    static final String ID = "id";
+    static final String URL = "url";
+    static final String ETAG = "etag";
+    static final String DIR_PATH = "dir_path";
+    static final String FILE_NAME = "file_name";
+    static final String TOTAL_BYTES = "total_bytes";
+    static final String DOWNLOADED_BYTES = "downloaded_bytes";
+    static final String LAST_MODIFIED_AT = "last_modified_at";
+
+    private int id;
+    private String url;
+    private String eTag;
+    private String dirPath;
+    private String fileName;
+    private long totalBytes;
+    private long downloadedBytes;
+    private long lastModifiedAt;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getETag() {
+        return eTag;
+    }
+
+    public void setETag(String eTag) {
+        this.eTag = eTag;
+    }
+
+    public String getDirPath() {
+        return dirPath;
+    }
+
+    public void setDirPath(String dirPath) {
+        this.dirPath = dirPath;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public long getTotalBytes() {
+        return totalBytes;
+    }
+
+    public void setTotalBytes(long totalBytes) {
+        this.totalBytes = totalBytes;
+    }
+
+    public long getDownloadedBytes() {
+        return downloadedBytes;
+    }
+
+    public void setDownloadedBytes(long downloadedBytes) {
+        this.downloadedBytes = downloadedBytes;
+    }
+
+    public long getLastModifiedAt() {
+        return lastModifiedAt;
+    }
+
+    public void setLastModifiedAt(long lastModifiedAt) {
+        this.lastModifiedAt = lastModifiedAt;
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/NoOpsDbHelper.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/NoOpsDbHelper.java
new file mode 100755
index 0000000..23150a8
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/NoOpsDbHelper.java
@@ -0,0 +1,49 @@
+package com.downloader.database;
+
+import java.util.List;
+
+/**
+ * Created by anandgaurav on 14-11-2017.
+ */
+
+public class NoOpsDbHelper implements DbHelper {
+
+    public NoOpsDbHelper() {
+
+    }
+
+    @Override
+    public DownloadModel find(int id) {
+        return null;
+    }
+
+    @Override
+    public void insert(DownloadModel model) {
+
+    }
+
+    @Override
+    public void update(DownloadModel model) {
+
+    }
+
+    @Override
+    public void updateProgress(int id, long downloadedBytes, long lastModifiedAt) {
+
+    }
+
+    @Override
+    public void remove(int id) {
+
+    }
+
+    @Override
+    public List<DownloadModel> getUnwantedModels(int days) {
+        return null;
+    }
+
+    @Override
+    public void clear() {
+
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/handler/ProgressHandler.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/handler/ProgressHandler.java
new file mode 100755
index 0000000..dceab0f
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/handler/ProgressHandler.java
@@ -0,0 +1,38 @@
+package com.downloader.handler;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+import com.downloader.Constants;
+import com.downloader.Progress;
+import com.downloader.OnProgressListener;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class ProgressHandler extends Handler {
+
+    private final OnProgressListener listener;
+
+    public ProgressHandler(OnProgressListener listener) {
+        super(Looper.getMainLooper());
+        this.listener = listener;
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+        switch (msg.what) {
+            case Constants.UPDATE:
+                if (listener != null) {
+                    final Progress progress = (Progress) msg.obj;
+                    listener.onProgress(progress);
+                }
+                break;
+            default:
+                super.handleMessage(msg);
+                break;
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/DefaultHttpClient.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/DefaultHttpClient.java
new file mode 100755
index 0000000..22bbd9a
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/DefaultHttpClient.java
@@ -0,0 +1,111 @@
+package com.downloader.httpclient;
+
+import com.downloader.Constants;
+import com.downloader.request.DownloadRequest;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DefaultHttpClient implements HttpClient {
+
+    private URLConnection connection;
+
+    public DefaultHttpClient() {
+
+    }
+
+    @SuppressWarnings("CloneDoesntCallSuperClone")
+    @Override
+    public HttpClient clone() {
+        return new DefaultHttpClient();
+    }
+
+    @Override
+    public void connect(DownloadRequest request) throws IOException {
+        connection = new URL(request.getUrl()).openConnection();
+        connection.setReadTimeout(request.getReadTimeout());
+        connection.setConnectTimeout(request.getConnectTimeout());
+        final String range = String.format(Locale.ENGLISH,
+                "bytes=%d-", request.getDownloadedBytes());
+        connection.addRequestProperty(Constants.RANGE, range);
+        connection.addRequestProperty(Constants.USER_AGENT, request.getUserAgent());
+        addHeaders(request);
+        connection.connect();
+    }
+
+    @Override
+    public int getResponseCode() throws IOException {
+        int responseCode = 0;
+        if (connection instanceof HttpURLConnection) {
+            responseCode = ((HttpURLConnection) connection).getResponseCode();
+        }
+        return responseCode;
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return connection.getInputStream();
+    }
+
+    @Override
+    public long getContentLength() {
+        String length = connection.getHeaderField("Content-Length");
+        try {
+            return Long.parseLong(length);
+        } catch (NumberFormatException e) {
+            return -1;
+        }
+    }
+
+    @Override
+    public String getResponseHeader(String name) {
+        return connection.getHeaderField(name);
+    }
+
+    @Override
+    public void close() {
+        // no operation
+    }
+
+    @Override
+    public Map<String, List<String>> getHeaderFields() {
+        return connection.getHeaderFields();
+    }
+
+    @Override
+    public InputStream getErrorStream() {
+        if (connection instanceof HttpURLConnection) {
+            return ((HttpURLConnection) connection).getErrorStream();
+        }
+        return null;
+    }
+
+    private void addHeaders(DownloadRequest request) {
+        final HashMap<String, List<String>> headers = request.getHeaders();
+        if (headers != null) {
+            Set<Map.Entry<String, List<String>>> entries = headers.entrySet();
+            for (Map.Entry<String, List<String>> entry : entries) {
+                String name = entry.getKey();
+                List<String> list = entry.getValue();
+                if (list != null) {
+                    for (String value : list) {
+                        connection.addRequestProperty(name, value);
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/HttpClient.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/HttpClient.java
new file mode 100755
index 0000000..ca9d790
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/HttpClient.java
@@ -0,0 +1,34 @@
+package com.downloader.httpclient;
+
+import com.downloader.request.DownloadRequest;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface HttpClient extends Cloneable {
+
+    HttpClient clone();
+
+    void connect(DownloadRequest request) throws IOException;
+
+    int getResponseCode() throws IOException;
+
+    InputStream getInputStream() throws IOException;
+
+    long getContentLength();
+
+    String getResponseHeader(String name);
+
+    void close();
+
+    Map<String, List<String>> getHeaderFields();
+
+    InputStream getErrorStream() throws IOException;
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/ComponentHolder.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/ComponentHolder.java
new file mode 100755
index 0000000..88ede5c
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/ComponentHolder.java
@@ -0,0 +1,97 @@
+package com.downloader.internal;
+
+import android.content.Context;
+
+import com.downloader.Constants;
+import com.downloader.PRDownloader;
+import com.downloader.PRDownloaderConfig;
+import com.downloader.database.AppDbHelper;
+import com.downloader.database.DbHelper;
+import com.downloader.database.NoOpsDbHelper;
+import com.downloader.httpclient.DefaultHttpClient;
+import com.downloader.httpclient.HttpClient;
+
+/**
+ * Created by amitshekhar on 14/11/17.
+ */
+
+public class ComponentHolder {
+
+    private final static ComponentHolder INSTANCE = new ComponentHolder();
+    private int readTimeout;
+    private int connectTimeout;
+    private String userAgent;
+    private HttpClient httpClient;
+    private DbHelper dbHelper;
+
+    public static ComponentHolder getInstance() {
+        return INSTANCE;
+    }
+
+    public void init(Context context, PRDownloaderConfig config) {
+        this.readTimeout = config.getReadTimeout();
+        this.connectTimeout = config.getConnectTimeout();
+        this.userAgent = config.getUserAgent();
+        this.httpClient = config.getHttpClient();
+        this.dbHelper = config.isDatabaseEnabled() ? new AppDbHelper(context) : new NoOpsDbHelper();
+        if (config.isDatabaseEnabled()) {
+            PRDownloader.cleanUp(30);
+        }
+    }
+
+    public int getReadTimeout() {
+        if (readTimeout == 0) {
+            synchronized (ComponentHolder.class) {
+                if (readTimeout == 0) {
+                    readTimeout = Constants.DEFAULT_READ_TIMEOUT_IN_MILLS;
+                }
+            }
+        }
+        return readTimeout;
+    }
+
+    public int getConnectTimeout() {
+        if (connectTimeout == 0) {
+            synchronized (ComponentHolder.class) {
+                if (connectTimeout == 0) {
+                    connectTimeout = Constants.DEFAULT_CONNECT_TIMEOUT_IN_MILLS;
+                }
+            }
+        }
+        return connectTimeout;
+    }
+
+    public String getUserAgent() {
+        if (userAgent == null) {
+            synchronized (ComponentHolder.class) {
+                if (userAgent == null) {
+                    userAgent = Constants.DEFAULT_USER_AGENT;
+                }
+            }
+        }
+        return userAgent;
+    }
+
+    public DbHelper getDbHelper() {
+        if (dbHelper == null) {
+            synchronized (ComponentHolder.class) {
+                if (dbHelper == null) {
+                    dbHelper = new NoOpsDbHelper();
+                }
+            }
+        }
+        return dbHelper;
+    }
+
+    public HttpClient getHttpClient() {
+        if (httpClient == null) {
+            synchronized (ComponentHolder.class) {
+                if (httpClient == null) {
+                    httpClient = new DefaultHttpClient();
+                }
+            }
+        }
+        return httpClient.clone();
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRequestQueue.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRequestQueue.java
new file mode 100755
index 0000000..513f71a
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRequestQueue.java
@@ -0,0 +1,118 @@
+package com.downloader.internal;
+
+import com.downloader.Status;
+import com.downloader.core.Core;
+import com.downloader.request.DownloadRequest;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRequestQueue {
+
+    private static DownloadRequestQueue instance;
+    private final Map<Integer, DownloadRequest> currentRequestMap;
+    private final AtomicInteger sequenceGenerator;
+
+    private DownloadRequestQueue() {
+        currentRequestMap = new ConcurrentHashMap<>();
+        sequenceGenerator = new AtomicInteger();
+    }
+
+    public static void initialize() {
+        getInstance();
+    }
+
+    public static DownloadRequestQueue getInstance() {
+        if (instance == null) {
+            synchronized (DownloadRequestQueue.class) {
+                if (instance == null) {
+                    instance = new DownloadRequestQueue();
+                }
+            }
+        }
+        return instance;
+    }
+
+    private int getSequenceNumber() {
+        return sequenceGenerator.incrementAndGet();
+    }
+
+    public void pause(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        if (request != null) {
+            request.setStatus(Status.PAUSED);
+        }
+    }
+
+    public void resume(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        if (request != null) {
+            request.setStatus(Status.QUEUED);
+            request.setFuture(Core.getInstance()
+                    .getExecutorSupplier()
+                    .forDownloadTasks()
+                    .submit(new DownloadRunnable(request)));
+        }
+    }
+
+    private void cancelAndRemoveFromMap(DownloadRequest request) {
+        if (request != null) {
+            request.cancel();
+            currentRequestMap.remove(request.getDownloadId());
+        }
+    }
+
+    public void cancel(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        cancelAndRemoveFromMap(request);
+    }
+
+    public void cancel(Object tag) {
+        for (Map.Entry<Integer, DownloadRequest> currentRequestMapEntry : currentRequestMap.entrySet()) {
+            DownloadRequest request = currentRequestMapEntry.getValue();
+            if (request.getTag() instanceof String && tag instanceof String) {
+                final String tempRequestTag = (String) request.getTag();
+                final String tempTag = (String) tag;
+                if (tempRequestTag.equals(tempTag)) {
+                    cancelAndRemoveFromMap(request);
+                }
+            } else if (request.getTag().equals(tag)) {
+                cancelAndRemoveFromMap(request);
+            }
+        }
+    }
+
+    public void cancelAll() {
+        for (Map.Entry<Integer, DownloadRequest> currentRequestMapEntry : currentRequestMap.entrySet()) {
+            DownloadRequest request = currentRequestMapEntry.getValue();
+            cancelAndRemoveFromMap(request);
+        }
+    }
+
+    public Status getStatus(int downloadId) {
+        DownloadRequest request = currentRequestMap.get(downloadId);
+        if (request != null) {
+            return request.getStatus();
+        }
+        return Status.UNKNOWN;
+    }
+
+    public void addRequest(DownloadRequest request) {
+        currentRequestMap.put(request.getDownloadId(), request);
+        request.setStatus(Status.QUEUED);
+        request.setSequenceNumber(getSequenceNumber());
+        request.setFuture(Core.getInstance()
+                .getExecutorSupplier()
+                .forDownloadTasks()
+                .submit(new DownloadRunnable(request)));
+    }
+
+    public void finish(DownloadRequest request) {
+        currentRequestMap.remove(request.getDownloadId());
+    }
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRunnable.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRunnable.java
new file mode 100755
index 0000000..26d11d7
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRunnable.java
@@ -0,0 +1,41 @@
+package com.downloader.internal;
+
+import com.downloader.Error;
+import com.downloader.Priority;
+import com.downloader.Response;
+import com.downloader.Status;
+import com.downloader.request.DownloadRequest;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRunnable implements Runnable {
+
+    public final Priority priority;
+    public final int sequence;
+    public final DownloadRequest request;
+
+    DownloadRunnable(DownloadRequest request) {
+        this.request = request;
+        this.priority = request.getPriority();
+        this.sequence = request.getSequenceNumber();
+    }
+
+    @Override
+    public void run() {
+        request.setStatus(Status.RUNNING);
+        DownloadTask downloadTask = DownloadTask.create(request);
+        Response response = downloadTask.run();
+        if (response.isSuccessful()) {
+            request.deliverSuccess();
+        } else if (response.isPaused()) {
+            request.deliverPauseEvent();
+        } else if (response.getError() != null) {
+            request.deliverError(response.getError());
+        } else if (!response.isCancelled()) {
+            request.deliverError(new Error());
+        }
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadTask.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadTask.java
new file mode 100755
index 0000000..3702ba8
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadTask.java
@@ -0,0 +1,390 @@
+package com.downloader.internal;
+
+import com.downloader.Constants;
+import com.downloader.Error;
+import com.downloader.Progress;
+import com.downloader.Response;
+import com.downloader.Status;
+import com.downloader.database.DownloadModel;
+import com.downloader.handler.ProgressHandler;
+import com.downloader.httpclient.HttpClient;
+import com.downloader.internal.stream.FileDownloadOutputStream;
+import com.downloader.internal.stream.FileDownloadRandomAccessFile;
+import com.downloader.request.DownloadRequest;
+import com.downloader.utils.Utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadTask {
+
+    private static final int BUFFER_SIZE = 1024 * 4;
+    private static final long TIME_GAP_FOR_SYNC = 2000;
+    private static final long MIN_BYTES_FOR_SYNC = 65536;
+    private final DownloadRequest request;
+    private ProgressHandler progressHandler;
+    private long lastSyncTime;
+    private long lastSyncBytes;
+    private InputStream inputStream;
+    private FileDownloadOutputStream outputStream;
+    private HttpClient httpClient;
+    private long totalBytes;
+    private int responseCode;
+    private String eTag;
+    private boolean isResumeSupported;
+    private String tempPath;
+
+    private DownloadTask(DownloadRequest request) {
+        this.request = request;
+    }
+
+    static DownloadTask create(DownloadRequest request) {
+        return new DownloadTask(request);
+    }
+
+    Response run() {
+
+        Response response = new Response();
+
+        if (request.getStatus() == Status.CANCELLED) {
+            response.setCancelled(true);
+            return response;
+        } else if (request.getStatus() == Status.PAUSED) {
+            response.setPaused(true);
+            return response;
+        }
+
+        try {
+
+            if (request.getOnProgressListener() != null) {
+                progressHandler = new ProgressHandler(request.getOnProgressListener());
+            }
+
+            tempPath = Utils.getTempPath(request.getDirPath(), request.getFileName());
+
+            File file = new File(tempPath);
+
+            DownloadModel model = getDownloadModelIfAlreadyPresentInDatabase();
+
+            if (model != null) {
+                if (file.exists()) {
+                    request.setTotalBytes(model.getTotalBytes());
+                    request.setDownloadedBytes(model.getDownloadedBytes());
+                } else {
+                    removeNoMoreNeededModelFromDatabase();
+                    request.setDownloadedBytes(0);
+                    request.setTotalBytes(0);
+                    model = null;
+                }
+            }
+
+            httpClient = ComponentHolder.getInstance().getHttpClient();
+
+            httpClient.connect(request);
+
+            if (request.getStatus() == Status.CANCELLED) {
+                response.setCancelled(true);
+                return response;
+            } else if (request.getStatus() == Status.PAUSED) {
+                response.setPaused(true);
+                return response;
+            }
+
+            httpClient = Utils.getRedirectedConnectionIfAny(httpClient, request);
+
+            responseCode = httpClient.getResponseCode();
+
+            eTag = httpClient.getResponseHeader(Constants.ETAG);
+
+            if (checkIfFreshStartRequiredAndStart(model)) {
+                model = null;
+            }
+
+            if (!isSuccessful()) {
+                Error error = new Error();
+                error.setServerError(true);
+                error.setServerErrorMessage(convertStreamToString(httpClient.getErrorStream()));
+                error.setHeaderFields(httpClient.getHeaderFields());
+                error.setResponseCode(responseCode);
+                response.setError(error);
+                return response;
+            }
+
+            setResumeSupportedOrNot();
+
+            totalBytes = request.getTotalBytes();
+
+            if (!isResumeSupported) {
+                deleteTempFile();
+            }
+
+            if (totalBytes == 0) {
+                totalBytes = httpClient.getContentLength();
+                request.setTotalBytes(totalBytes);
+            }
+
+            if (isResumeSupported && model == null) {
+                createAndInsertNewModel();
+            }
+
+            if (request.getStatus() == Status.CANCELLED) {
+                response.setCancelled(true);
+                return response;
+            } else if (request.getStatus() == Status.PAUSED) {
+                response.setPaused(true);
+                return response;
+            }
+
+            request.deliverStartEvent();
+
+            inputStream = httpClient.getInputStream();
+
+            byte[] buff = new byte[BUFFER_SIZE];
+
+            if (!file.exists()) {
+                if (file.getParentFile() != null && !file.getParentFile().exists()) {
+                    if (file.getParentFile().mkdirs()) {
+                        //noinspection ResultOfMethodCallIgnored
+                        file.createNewFile();
+                    }
+                } else {
+                    //noinspection ResultOfMethodCallIgnored
+                    file.createNewFile();
+                }
+            }
+
+            this.outputStream = FileDownloadRandomAccessFile.create(file);
+
+            if (isResumeSupported && request.getDownloadedBytes() != 0) {
+                outputStream.seek(request.getDownloadedBytes());
+            }
+
+            if (request.getStatus() == Status.CANCELLED) {
+                response.setCancelled(true);
+                return response;
+            } else if (request.getStatus() == Status.PAUSED) {
+                response.setPaused(true);
+                return response;
+            }
+
+            do {
+
+                final int byteCount = inputStream.read(buff, 0, BUFFER_SIZE);
+
+                if (byteCount == -1) {
+                    break;
+                }
+
+                outputStream.write(buff, 0, byteCount);
+
+                request.setDownloadedBytes(request.getDownloadedBytes() + byteCount);
+
+                sendProgress();
+
+                syncIfRequired(outputStream);
+
+                if (request.getStatus() == Status.CANCELLED) {
+                    response.setCancelled(true);
+                    return response;
+                } else if (request.getStatus() == Status.PAUSED) {
+                    sync(outputStream);
+                    response.setPaused(true);
+                    return response;
+                }
+
+            } while (true);
+
+            final String path = Utils.getPath(request.getDirPath(), request.getFileName());
+
+            Utils.renameFileName(tempPath, path);
+
+            response.setSuccessful(true);
+
+            if (isResumeSupported) {
+                removeNoMoreNeededModelFromDatabase();
+            }
+
+        } catch (IOException | IllegalAccessException e) {
+            if (!isResumeSupported) {
+                deleteTempFile();
+            }
+            Error error = new Error();
+            error.setConnectionError(true);
+            error.setConnectionException(e);
+            response.setError(error);
+        } finally {
+            closeAllSafely(outputStream);
+        }
+
+        return response;
+    }
+
+    private void deleteTempFile() {
+        File file = new File(tempPath);
+        if (file.exists()) {
+            //noinspection ResultOfMethodCallIgnored
+            file.delete();
+        }
+    }
+
+    private boolean isSuccessful() {
+        return responseCode >= HttpURLConnection.HTTP_OK
+                && responseCode < HttpURLConnection.HTTP_MULT_CHOICE;
+    }
+
+    private void setResumeSupportedOrNot() {
+        isResumeSupported = (responseCode == HttpURLConnection.HTTP_PARTIAL);
+    }
+
+    private boolean checkIfFreshStartRequiredAndStart(DownloadModel model) throws IOException,
+            IllegalAccessException {
+        if (responseCode == Constants.HTTP_RANGE_NOT_SATISFIABLE || isETagChanged(model)) {
+            if (model != null) {
+                removeNoMoreNeededModelFromDatabase();
+            }
+            deleteTempFile();
+            request.setDownloadedBytes(0);
+            request.setTotalBytes(0);
+            httpClient = ComponentHolder.getInstance().getHttpClient();
+            httpClient.connect(request);
+            httpClient = Utils.getRedirectedConnectionIfAny(httpClient, request);
+            responseCode = httpClient.getResponseCode();
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isETagChanged(DownloadModel model) {
+        return !(eTag == null || model == null || model.getETag() == null)
+                && !model.getETag().equals(eTag);
+    }
+
+    private DownloadModel getDownloadModelIfAlreadyPresentInDatabase() {
+        return ComponentHolder.getInstance().getDbHelper().find(request.getDownloadId());
+    }
+
+    private void createAndInsertNewModel() {
+        DownloadModel model = new DownloadModel();
+        model.setId(request.getDownloadId());
+        model.setUrl(request.getUrl());
+        model.setETag(eTag);
+        model.setDirPath(request.getDirPath());
+        model.setFileName(request.getFileName());
+        model.setDownloadedBytes(request.getDownloadedBytes());
+        model.setTotalBytes(totalBytes);
+        model.setLastModifiedAt(System.currentTimeMillis());
+        ComponentHolder.getInstance().getDbHelper().insert(model);
+    }
+
+    private void removeNoMoreNeededModelFromDatabase() {
+        ComponentHolder.getInstance().getDbHelper().remove(request.getDownloadId());
+    }
+
+    private void sendProgress() {
+        if (request.getStatus() != Status.CANCELLED) {
+            if (progressHandler != null) {
+                progressHandler
+                        .obtainMessage(Constants.UPDATE,
+                                new Progress(request.getDownloadedBytes(),
+                                        totalBytes)).sendToTarget();
+            }
+        }
+    }
+
+    private void syncIfRequired(FileDownloadOutputStream outputStream) {
+        final long currentBytes = request.getDownloadedBytes();
+        final long currentTime = System.currentTimeMillis();
+        final long bytesDelta = currentBytes - lastSyncBytes;
+        final long timeDelta = currentTime - lastSyncTime;
+        if (bytesDelta > MIN_BYTES_FOR_SYNC && timeDelta > TIME_GAP_FOR_SYNC) {
+            sync(outputStream);
+            lastSyncBytes = currentBytes;
+            lastSyncTime = currentTime;
+        }
+    }
+
+    private void sync(FileDownloadOutputStream outputStream) {
+        boolean success;
+        try {
+            outputStream.flushAndSync();
+            success = true;
+        } catch (IOException e) {
+            success = false;
+            e.printStackTrace();
+        }
+        if (success && isResumeSupported) {
+            ComponentHolder.getInstance().getDbHelper()
+                    .updateProgress(request.getDownloadId(),
+                            request.getDownloadedBytes(),
+                            System.currentTimeMillis());
+        }
+
+    }
+
+    private void closeAllSafely(FileDownloadOutputStream outputStream) {
+        if (httpClient != null) {
+            try {
+                httpClient.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        if (inputStream != null) {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        try {
+            if (outputStream != null) {
+                try {
+                    sync(outputStream);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } finally {
+            if (outputStream != null)
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+        }
+    }
+
+    private String convertStreamToString(InputStream stream) {
+        StringBuilder stringBuilder = new StringBuilder();
+        if (stream != null) {
+            String line;
+            BufferedReader bufferedReader = null;
+            try {
+                bufferedReader = new BufferedReader(new InputStreamReader(stream));
+                while ((line = bufferedReader.readLine()) != null) {
+                    stringBuilder.append(line);
+                }
+            } catch (IOException ignored) {
+
+            } finally {
+                try {
+                    if (bufferedReader != null) {
+                        bufferedReader.close();
+                    }
+                } catch (NullPointerException | IOException ignored) {
+
+                }
+            }
+        }
+        return stringBuilder.toString();
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/SynchronousCall.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/SynchronousCall.java
new file mode 100755
index 0000000..008e4ec
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/SynchronousCall.java
@@ -0,0 +1,19 @@
+package com.downloader.internal;
+
+import com.downloader.Response;
+import com.downloader.request.DownloadRequest;
+
+public class SynchronousCall {
+
+    public final DownloadRequest request;
+
+    public SynchronousCall(DownloadRequest request) {
+        this.request = request;
+    }
+
+    public Response execute() {
+        DownloadTask downloadTask = DownloadTask.create(request);
+        return downloadTask.run();
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadOutputStream.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadOutputStream.java
new file mode 100755
index 0000000..1d080dd
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadOutputStream.java
@@ -0,0 +1,38 @@
+package com.downloader.internal.stream;
+
+
+import java.io.IOException;
+
+public interface FileDownloadOutputStream {
+
+    /**
+     * Writes <code>len</code> bytes from the specified byte array
+     * starting at offset <code>off</code> to this file.
+     */
+    void write(byte b[], int off, int len) throws IOException;
+
+    /**
+     * Flush all buffer to system and force all system buffers to synchronize with the underlying
+     * device.
+     */
+    void flushAndSync() throws IOException;
+
+    /**
+     * Closes this output stream and releases any system resources associated with this stream. The
+     * general contract of <code>close</code> is that it closes the output stream. A closed stream
+     * cannot perform output operations and cannot be reopened.
+     */
+    void close() throws IOException;
+
+    /**
+     * Sets the file-pointer offset, measured from the beginning of this file, at which the next
+     * read or write occurs.  The offset may be set beyond the end of the file.
+     */
+    void seek(long offset) throws IOException, IllegalAccessException;
+
+    /**
+     * Sets the length of this file.
+     */
+    void setLength(final long newLength) throws IOException, IllegalAccessException;
+
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadRandomAccessFile.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadRandomAccessFile.java
new file mode 100755
index 0000000..b0ebf7a
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadRandomAccessFile.java
@@ -0,0 +1,53 @@
+package com.downloader.internal.stream;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+public class FileDownloadRandomAccessFile implements FileDownloadOutputStream {
+
+    private final BufferedOutputStream out;
+    private final FileDescriptor fd;
+    private final RandomAccessFile randomAccess;
+
+    private FileDownloadRandomAccessFile(File file) throws IOException {
+        randomAccess = new RandomAccessFile(file, "rw");
+        fd = randomAccess.getFD();
+        out = new BufferedOutputStream(new FileOutputStream(randomAccess.getFD()));
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        out.write(b, off, len);
+    }
+
+    @Override
+    public void flushAndSync() throws IOException {
+        out.flush();
+        fd.sync();
+    }
+
+    @Override
+    public void close() throws IOException {
+        out.close();
+        randomAccess.close();
+    }
+
+    @Override
+    public void seek(long offset) throws IOException {
+        randomAccess.seek(offset);
+    }
+
+    @Override
+    public void setLength(long totalBytes) throws IOException {
+        randomAccess.setLength(totalBytes);
+    }
+
+    public static FileDownloadOutputStream create(File file) throws IOException {
+        return new FileDownloadRandomAccessFile(file);
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequest.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequest.java
new file mode 100755
index 0000000..04abfcf
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequest.java
@@ -0,0 +1,319 @@
+package com.downloader.request;
+
+import com.downloader.Error;
+import com.downloader.OnCancelListener;
+import com.downloader.OnDownloadListener;
+import com.downloader.OnPauseListener;
+import com.downloader.OnProgressListener;
+import com.downloader.OnStartOrResumeListener;
+import com.downloader.Priority;
+import com.downloader.Response;
+import com.downloader.Status;
+import com.downloader.core.Core;
+import com.downloader.internal.ComponentHolder;
+import com.downloader.internal.DownloadRequestQueue;
+import com.downloader.internal.SynchronousCall;
+import com.downloader.utils.Utils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.Future;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRequest {
+
+    private Priority priority;
+    private Object tag;
+    private String url;
+    private String dirPath;
+    private String fileName;
+    private int sequenceNumber;
+    private Future future;
+    private long downloadedBytes;
+    private long totalBytes;
+    private int readTimeout;
+    private int connectTimeout;
+    private String userAgent;
+    private OnProgressListener onProgressListener;
+    private OnDownloadListener onDownloadListener;
+    private OnStartOrResumeListener onStartOrResumeListener;
+    private OnPauseListener onPauseListener;
+    private OnCancelListener onCancelListener;
+    private int downloadId;
+    private HashMap<String, List<String>> headerMap;
+    private Status status;
+
+    DownloadRequest(DownloadRequestBuilder builder) {
+        this.url = builder.url;
+        this.dirPath = builder.dirPath;
+        this.fileName = builder.fileName;
+        this.headerMap = builder.headerMap;
+        this.priority = builder.priority;
+        this.tag = builder.tag;
+        this.readTimeout =
+                builder.readTimeout != 0 ?
+                        builder.readTimeout :
+                        getReadTimeoutFromConfig();
+        this.connectTimeout =
+                builder.connectTimeout != 0 ?
+                        builder.connectTimeout :
+                        getConnectTimeoutFromConfig();
+        this.userAgent = builder.userAgent;
+    }
+
+    public Priority getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Priority priority) {
+        this.priority = priority;
+    }
+
+    public Object getTag() {
+        return tag;
+    }
+
+    public void setTag(Object tag) {
+        this.tag = tag;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getDirPath() {
+        return dirPath;
+    }
+
+    public void setDirPath(String dirPath) {
+        this.dirPath = dirPath;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public int getSequenceNumber() {
+        return sequenceNumber;
+    }
+
+    public void setSequenceNumber(int sequenceNumber) {
+        this.sequenceNumber = sequenceNumber;
+    }
+
+    public HashMap<String, List<String>> getHeaders() {
+        return headerMap;
+    }
+
+    public Future getFuture() {
+        return future;
+    }
+
+    public void setFuture(Future future) {
+        this.future = future;
+    }
+
+    public long getDownloadedBytes() {
+        return downloadedBytes;
+    }
+
+    public void setDownloadedBytes(long downloadedBytes) {
+        this.downloadedBytes = downloadedBytes;
+    }
+
+    public long getTotalBytes() {
+        return totalBytes;
+    }
+
+    public void setTotalBytes(long totalBytes) {
+        this.totalBytes = totalBytes;
+    }
+
+    public int getReadTimeout() {
+        return readTimeout;
+    }
+
+    public void setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+    }
+
+    public int getConnectTimeout() {
+        return connectTimeout;
+    }
+
+    public void setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+    }
+
+    public String getUserAgent() {
+        if (userAgent == null) {
+            userAgent = ComponentHolder.getInstance().getUserAgent();
+        }
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public int getDownloadId() {
+        return downloadId;
+    }
+
+    public void setDownloadId(int downloadId) {
+        this.downloadId = downloadId;
+    }
+
+    public Status getStatus() {
+        return status;
+    }
+
+    public void setStatus(Status status) {
+        this.status = status;
+    }
+
+    public OnProgressListener getOnProgressListener() {
+        return onProgressListener;
+    }
+
+    public DownloadRequest setOnStartOrResumeListener(OnStartOrResumeListener onStartOrResumeListener) {
+        this.onStartOrResumeListener = onStartOrResumeListener;
+        return this;
+    }
+
+    public DownloadRequest setOnProgressListener(OnProgressListener onProgressListener) {
+        this.onProgressListener = onProgressListener;
+        return this;
+    }
+
+    public DownloadRequest setOnPauseListener(OnPauseListener onPauseListener) {
+        this.onPauseListener = onPauseListener;
+        return this;
+    }
+
+    public DownloadRequest setOnCancelListener(OnCancelListener onCancelListener) {
+        this.onCancelListener = onCancelListener;
+        return this;
+    }
+
+    public int start(OnDownloadListener onDownloadListener) {
+        this.onDownloadListener = onDownloadListener;
+        downloadId = Utils.getUniqueId(url, dirPath, fileName);
+        DownloadRequestQueue.getInstance().addRequest(this);
+        return downloadId;
+    }
+
+    public Response executeSync() {
+        downloadId = Utils.getUniqueId(url, dirPath, fileName);
+        return new SynchronousCall(this).execute();
+    }
+
+    public void deliverError(final Error error) {
+        if (status != Status.CANCELLED) {
+            setStatus(Status.FAILED);
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onDownloadListener != null) {
+                                onDownloadListener.onError(error);
+                            }
+                            finish();
+                        }
+                    });
+        }
+    }
+
+    public void deliverSuccess() {
+        if (status != Status.CANCELLED) {
+            setStatus(Status.COMPLETED);
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onDownloadListener != null) {
+                                onDownloadListener.onDownloadComplete();
+                            }
+                            finish();
+                        }
+                    });
+        }
+    }
+
+    public void deliverStartEvent() {
+        if (status != Status.CANCELLED) {
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onStartOrResumeListener != null) {
+                                onStartOrResumeListener.onStartOrResume();
+                            }
+                        }
+                    });
+        }
+    }
+
+    public void deliverPauseEvent() {
+        if (status != Status.CANCELLED) {
+            Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                    .execute(new Runnable() {
+                        public void run() {
+                            if (onPauseListener != null) {
+                                onPauseListener.onPause();
+                            }
+                        }
+                    });
+        }
+    }
+
+    private void deliverCancelEvent() {
+        Core.getInstance().getExecutorSupplier().forMainThreadTasks()
+                .execute(new Runnable() {
+                    public void run() {
+                        if (onCancelListener != null) {
+                            onCancelListener.onCancel();
+                        }
+                    }
+                });
+    }
+
+    public void cancel() {
+        status = Status.CANCELLED;
+        if (future != null) {
+            future.cancel(true);
+        }
+        deliverCancelEvent();
+        Utils.deleteTempFileAndDatabaseEntryInBackground(Utils.getTempPath(dirPath, fileName), downloadId);
+    }
+
+    private void finish() {
+        destroy();
+        DownloadRequestQueue.getInstance().finish(this);
+    }
+
+    private void destroy() {
+        this.onProgressListener = null;
+        this.onDownloadListener = null;
+        this.onStartOrResumeListener = null;
+        this.onPauseListener = null;
+        this.onCancelListener = null;
+    }
+
+    private int getReadTimeoutFromConfig() {
+        return ComponentHolder.getInstance().getReadTimeout();
+    }
+
+    private int getConnectTimeoutFromConfig() {
+        return ComponentHolder.getInstance().getConnectTimeout();
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequestBuilder.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequestBuilder.java
new file mode 100755
index 0000000..67d5dff
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequestBuilder.java
@@ -0,0 +1,81 @@
+package com.downloader.request;
+
+import com.downloader.Priority;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public class DownloadRequestBuilder implements RequestBuilder {
+
+    String url;
+    String dirPath;
+    String fileName;
+    Priority priority = Priority.MEDIUM;
+    Object tag;
+    int readTimeout;
+    int connectTimeout;
+    String userAgent;
+    HashMap<String, List<String>> headerMap;
+
+    public DownloadRequestBuilder(String url, String dirPath, String fileName) {
+        this.url = url;
+        this.dirPath = dirPath;
+        this.fileName = fileName;
+    }
+
+    @Override
+    public DownloadRequestBuilder setHeader(String name, String value) {
+        if (headerMap == null) {
+            headerMap = new HashMap<>();
+        }
+        List<String> list = headerMap.get(name);
+        if (list == null) {
+            list = new ArrayList<>();
+            headerMap.put(name, list);
+        }
+        if (!list.contains(value)) {
+            list.add(value);
+        }
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setPriority(Priority priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setTag(Object tag) {
+        this.tag = tag;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+        return this;
+    }
+
+    @Override
+    public DownloadRequestBuilder setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+        return this;
+    }
+
+    public DownloadRequest build() {
+        return new DownloadRequest(this);
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/RequestBuilder.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/RequestBuilder.java
new file mode 100755
index 0000000..f1919d5
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/RequestBuilder.java
@@ -0,0 +1,23 @@
+package com.downloader.request;
+
+import com.downloader.Priority;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public interface RequestBuilder {
+
+    RequestBuilder setHeader(String name, String value);
+
+    RequestBuilder setPriority(Priority priority);
+
+    RequestBuilder setTag(Object tag);
+
+    RequestBuilder setReadTimeout(int readTimeout);
+
+    RequestBuilder setConnectTimeout(int connectTimeout);
+
+    RequestBuilder setUserAgent(String userAgent);
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/utils/Utils.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/utils/Utils.java
new file mode 100755
index 0000000..6c0633f
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/java/com/downloader/utils/Utils.java
@@ -0,0 +1,157 @@
+package com.downloader.utils;
+
+import com.downloader.Constants;
+import com.downloader.core.Core;
+import com.downloader.database.DownloadModel;
+import com.downloader.httpclient.HttpClient;
+import com.downloader.internal.ComponentHolder;
+import com.downloader.request.DownloadRequest;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+
+/**
+ * Created by amitshekhar on 13/11/17.
+ */
+
+public final class Utils {
+
+    private final static int MAX_REDIRECTION = 10;
+
+    private Utils() {
+        // no instance
+    }
+
+    public static String getPath(String dirPath, String fileName) {
+        return dirPath + File.separator + fileName;
+    }
+
+    public static String getTempPath(String dirPath, String fileName) {
+        return getPath(dirPath, fileName) + ".temp";
+    }
+
+    public static void renameFileName(String oldPath, String newPath) throws IOException {
+        final File oldFile = new File(oldPath);
+        try {
+            final File newFile = new File(newPath);
+            if (newFile.exists()) {
+                if (!newFile.delete()) {
+                    throw new IOException("Deletion Failed");
+                }
+            }
+            if (!oldFile.renameTo(newFile)) {
+                throw new IOException("Rename Failed");
+            }
+        } finally {
+            if (oldFile.exists()) {
+                //noinspection ResultOfMethodCallIgnored
+                oldFile.delete();
+            }
+        }
+    }
+
+    public static void deleteTempFileAndDatabaseEntryInBackground(final String path, final int downloadId) {
+        Core.getInstance().getExecutorSupplier().forBackgroundTasks()
+                .execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        ComponentHolder.getInstance().getDbHelper().remove(downloadId);
+                        File file = new File(path);
+                        if (file.exists()) {
+                            //noinspection ResultOfMethodCallIgnored
+                            file.delete();
+                        }
+                    }
+                });
+    }
+
+    public static void deleteUnwantedModelsAndTempFiles(final int days) {
+        Core.getInstance().getExecutorSupplier().forBackgroundTasks()
+                .execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        List<DownloadModel> models = ComponentHolder.getInstance()
+                                .getDbHelper()
+                                .getUnwantedModels(days);
+                        if (models != null) {
+                            for (DownloadModel model : models) {
+                                final String tempPath = getTempPath(model.getDirPath(), model.getFileName());
+                                ComponentHolder.getInstance().getDbHelper().remove(model.getId());
+                                File file = new File(tempPath);
+                                if (file.exists()) {
+                                    //noinspection ResultOfMethodCallIgnored
+                                    file.delete();
+                                }
+                            }
+                        }
+                    }
+                });
+    }
+
+    public static int getUniqueId(String url, String dirPath, String fileName) {
+
+        String string = url + File.separator + dirPath + File.separator + fileName;
+
+        byte[] hash;
+
+        try {
+            hash = MessageDigest.getInstance("MD5").digest(string.getBytes("UTF-8"));
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("NoSuchAlgorithmException", e);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("UnsupportedEncodingException", e);
+        }
+
+        StringBuilder hex = new StringBuilder(hash.length * 2);
+
+        for (byte b : hash) {
+            if ((b & 0xFF) < 0x10) hex.append("0");
+            hex.append(Integer.toHexString(b & 0xFF));
+        }
+
+        return hex.toString().hashCode();
+
+    }
+
+    public static HttpClient getRedirectedConnectionIfAny(HttpClient httpClient,
+                                                          DownloadRequest request)
+            throws IOException, IllegalAccessException {
+        int redirectTimes = 0;
+        int code = httpClient.getResponseCode();
+        String location = httpClient.getResponseHeader("Location");
+
+        while (isRedirection(code)) {
+            if (location == null) {
+                throw new IllegalAccessException("Location is null");
+            }
+            httpClient.close();
+
+            request.setUrl(location);
+            httpClient = ComponentHolder.getInstance().getHttpClient();
+            httpClient.connect(request);
+            code = httpClient.getResponseCode();
+            location = httpClient.getResponseHeader("Location");
+            redirectTimes++;
+            if (redirectTimes >= MAX_REDIRECTION) {
+                throw new IllegalAccessException("Max redirection done");
+            }
+        }
+
+        return httpClient;
+    }
+
+    private static boolean isRedirection(int code) {
+        return code == HttpURLConnection.HTTP_MOVED_PERM
+                || code == HttpURLConnection.HTTP_MOVED_TEMP
+                || code == HttpURLConnection.HTTP_SEE_OTHER
+                || code == HttpURLConnection.HTTP_MULT_CHOICE
+                || code == Constants.HTTP_TEMPORARY_REDIRECT
+                || code == Constants.HTTP_PERMANENT_REDIRECT;
+    }
+
+}
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/res/values/strings.xml b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/res/values/strings.xml
new file mode 100755
index 0000000..e672d7b
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">downloader</string>
+</resources>
diff --git a/OnTime_User_live/lib/PRDownloader/prdownloader/src/test/java/com/downloader/ExampleUnitTest.java b/OnTime_User_live/lib/PRDownloader/prdownloader/src/test/java/com/downloader/ExampleUnitTest.java
new file mode 100755
index 0000000..49f38ab
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/prdownloader/src/test/java/com/downloader/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.downloader;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/PRDownloader/settings.gradle b/OnTime_User_live/lib/PRDownloader/settings.gradle
new file mode 100755
index 0000000..85308ca
--- /dev/null
+++ b/OnTime_User_live/lib/PRDownloader/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':prdownloader'
diff --git a/OnTime_User_live/lib/README.md b/OnTime_User_live/lib/README.md
new file mode 100755
index 0000000..72232c8
--- /dev/null
+++ b/OnTime_User_live/lib/README.md
@@ -0,0 +1,17 @@
+# Local libraries (not shared)
+
+These modules are **included only in this app**. They are not shared with other OnTime apps (Driver, Merchant). Each app has its own copy under its own `lib/` folder.
+
+## Modules
+
+| Module | Path | Description |
+|--------|------|-------------|
+| rating-view | `RatingView/rating-view` | Rating bar widget (Ornolfr/RatingView) |
+| textdrawable | `TextDrawable/library` | Text-based drawables (amulyakhare/TextDrawable) |
+| prdownloader | `PRDownloader/prdownloader` | File downloader (PRDownloader) |
+| liboverscroll | `overscroll-decor/liboverscroll` | Overscroll effects (everything/overscroll-decor) |
+| fragmentanimations | `FragmentAnimations/fragmentanimations` | Fragment transition animations |
+
+## Usage
+
+Referenced in `settings.gradle` and linked via `implementation project(':module')` in `app/build.gradle` when the app uses them. All libs are modernized to **compileSdk 33**, **targetSdk 33**, **minSdk 21**, and AndroidX.
diff --git a/OnTime_User_live/lib/RatingView/.gitignore b/OnTime_User_live/lib/RatingView/.gitignore
new file mode 100755
index 0000000..c6cbe56
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
diff --git a/OnTime_User_live/lib/RatingView/LICENSE b/OnTime_User_live/lib/RatingView/LICENSE
new file mode 100755
index 0000000..2bb9ad2
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/LICENSE
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/OnTime_User_live/lib/RatingView/README.md b/OnTime_User_live/lib/RatingView/README.md
new file mode 100755
index 0000000..166e28d
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/README.md
@@ -0,0 +1,29 @@
+# RatingView
+[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-RatingView-green.svg?style=true)](https://android-arsenal.com/details/1/3770)
+
+Simple android widget that can replace standard inconvenient RatingBar in your app.
+
+![Screenshot](https://googledrive.com/host/0Bwz1_b9mA7XYbC1EQ28xaHVwcGc/ratingview2.jpg)
+##Description
+The default Android `RatingBar` widget hardly can satisfy developers' needs. It's a pain to customize it at all. This simple view can take a huge advantage of setting and scaling drawables for rating view easily.
+##Usage
+You can download this library with the following line in your `app` module `build.gradle`:
+```gradle
+compile 'com.github.ornolfr:rating-view:0.1.2@aar'
+```    
+##Example
+Declare `RatingView` in your XML with `app` attributes:
+```xml
+<com.github.ornolfr.ratingview.RatingView
+	android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:drawable_empty="@drawable/ic_star_empty"
+    app:drawable_filled="@drawable/ic_star_filled"
+    app:drawable_half="@drawable/ic_star_half"
+    app:drawable_margin="4dp"
+    app:drawable_size="24dp"
+    app:is_indicator="false"
+    app:max_count="5"
+    app:rating="3.5" />
+```
+And use it through `RatingView` instance in your code. Goog luck!
diff --git a/OnTime_User_live/lib/RatingView/app/.gitignore b/OnTime_User_live/lib/RatingView/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_User_live/lib/RatingView/app/build.gradle b/OnTime_User_live/lib/RatingView/app/build.gradle
new file mode 100755
index 0000000..2b321d4
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/app/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
+
+    defaultConfig {
+        applicationId "com.github.ornolfr.ratingview"
+        minSdkVersion 15
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile project(':rating-view')
+}
diff --git a/OnTime_User_live/lib/RatingView/app/proguard-rules.pro b/OnTime_User_live/lib/RatingView/app/proguard-rules.pro
new file mode 100755
index 0000000..4ed9620
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\Roman\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/AndroidManifest.xml b/OnTime_User_live/lib/RatingView/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..41609b2
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/app/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.github.ornolfr.ratingview_sample">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name="com.github.ornolfr.ratingview_sample.MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/java/com/github/ornolfr/ratingview_sample/MainActivity.java b/OnTime_User_live/lib/RatingView/app/src/main/java/com/github/ornolfr/ratingview_sample/MainActivity.java
new file mode 100755
index 0000000..fd3a122
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/app/src/main/java/com/github/ornolfr/ratingview_sample/MainActivity.java
@@ -0,0 +1,55 @@
+package com.github.ornolfr.ratingview_sample;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.github.ornolfr.ratingview.RatingView;
+
+import java.util.Random;
+
+public class MainActivity extends AppCompatActivity implements View.OnClickListener {
+
+    private RatingView ratingView;
+
+    private Button buttonRating, buttonIndicator;
+
+    private Random random = new Random();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        ratingView = (RatingView) findViewById(R.id.ratingView);
+
+        buttonIndicator = (Button) findViewById(R.id.buttonIndicator);
+        buttonRating = (Button) findViewById(R.id.buttonRating);
+
+        buttonIndicator.setOnClickListener(this);
+        buttonRating.setOnClickListener(this);
+
+        ratingView.setOnRatingChangedListener(new RatingView.OnRatingChangedListener() {
+            @Override
+            public void onRatingChange(float oldRating, float newRating) {
+                Toast.makeText(MainActivity.this, "Old rating = " + oldRating + "; New rating = " + newRating, Toast.LENGTH_SHORT).show();
+            }
+        });
+
+    }
+
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.buttonIndicator:
+                ratingView.setIsIndicator(!ratingView.isIndicator());
+                break;
+            case R.id.buttonRating:
+                ratingView.setRating(random.nextFloat() * ratingView.getMaxCount());
+                break;
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/res/layout/activity_main.xml b/OnTime_User_live/lib/RatingView/app/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..837ed43
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.github.ornolfr.ratingview_sample.MainActivity">
+
+    <com.github.ornolfr.ratingview.RatingView
+        android:id="@+id/ratingView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:max_count="5"
+        android:foregroundGravity="bottom"
+        android:layout_marginBottom="16dp" />
+
+    <Button
+        android:id="@+id/buttonRating"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:text="Change rating!" />
+
+    <Button
+        android:id="@+id/buttonIndicator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:text="Make indicator!" />
+
+    <View
+        android:layout_width="24dp"
+        android:padding="8dp"
+        android:layout_height="24dp" />
+
+</LinearLayout>
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..cde69bc
Binary files /dev/null and b/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..c133a0c
Binary files /dev/null and b/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..bfa42f0
Binary files /dev/null and b/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..324e72c
Binary files /dev/null and b/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..aee44e1
Binary files /dev/null and b/OnTime_User_live/lib/RatingView/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/res/values-w820dp/dimens.xml b/OnTime_User_live/lib/RatingView/app/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/res/values/colors.xml b/OnTime_User_live/lib/RatingView/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..3ab3e9c
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/res/values/dimens.xml b/OnTime_User_live/lib/RatingView/app/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..47c8224
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/res/values/strings.xml b/OnTime_User_live/lib/RatingView/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..608d04b
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">RatingView-Sample</string>
+</resources>
diff --git a/OnTime_User_live/lib/RatingView/app/src/main/res/values/styles.xml b/OnTime_User_live/lib/RatingView/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..5885930
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/app/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+</resources>
diff --git a/OnTime_User_live/lib/RatingView/build.gradle b/OnTime_User_live/lib/RatingView/build.gradle
new file mode 100755
index 0000000..66c8924
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/build.gradle
@@ -0,0 +1,24 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/OnTime_User_live/lib/RatingView/gradle.properties b/OnTime_User_live/lib/RatingView/gradle.properties
new file mode 100755
index 0000000..1d3591c
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/OnTime_User_live/lib/RatingView/gradle/wrapper/gradle-wrapper.properties b/OnTime_User_live/lib/RatingView/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..122a0dc
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/OnTime_User_live/lib/RatingView/gradlew b/OnTime_User_live/lib/RatingView/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_User_live/lib/RatingView/gradlew.bat b/OnTime_User_live/lib/RatingView/gradlew.bat
new file mode 100755
index 0000000..8a0b282
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_User_live/lib/RatingView/rating-view/.gitignore b/OnTime_User_live/lib/RatingView/rating-view/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/rating-view/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_User_live/lib/RatingView/rating-view/build.gradle b/OnTime_User_live/lib/RatingView/rating-view/build.gradle
new file mode 100755
index 0000000..60f3141
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/rating-view/build.gradle
@@ -0,0 +1,49 @@
+apply plugin: 'com.android.library'
+ext {
+    bintrayRepo = 'maven'
+    bintrayName = 'rating-view'
+
+    publishedGroupId = 'com.github.ornolfr'
+    libraryName = 'RatingView'
+    artifact = 'rating-view'
+
+    libraryDescription = 'Simple android widget that can replace standard inconvenient RatingBar in your app.'
+
+    siteUrl = 'https://github.com/Ornolfr/RatingView'
+    gitUrl = 'https://github.com/Ornolfr/RatingView.git'
+
+    libraryVersion = '0.1.2'
+
+    developerId = 'ornolfr'
+    developerName = 'Roman Samoylenko'
+    developerEmail = 'ornolfr1@gmail.com'
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
+android {
+    compileSdk 33
+    namespace 'com.github.ornolfr.ratingview'
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+}
+
+// Publishing scripts removed; library used as local project dependency
diff --git a/OnTime_User_live/lib/RatingView/rating-view/proguard-rules.pro b/OnTime_User_live/lib/RatingView/rating-view/proguard-rules.pro
new file mode 100755
index 0000000..4ed9620
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/rating-view/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\Roman\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_User_live/lib/RatingView/rating-view/src/main/AndroidManifest.xml b/OnTime_User_live/lib/RatingView/rating-view/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..3840020
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/rating-view/src/main/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.github.ornolfr.ratingview">
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true">
+
+    </application>
+
+</manifest>
diff --git a/OnTime_User_live/lib/RatingView/rating-view/src/main/java/com/github/ornolfr/ratingview/RatingView.java b/OnTime_User_live/lib/RatingView/rating-view/src/main/java/com/github/ornolfr/ratingview/RatingView.java
new file mode 100755
index 0000000..5f8a095
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/rating-view/src/main/java/com/github/ornolfr/ratingview/RatingView.java
@@ -0,0 +1,334 @@
+package com.github.ornolfr.ratingview;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.MotionEvent;
+import android.view.View;
+
+
+/**
+ * Created by Ornolfr on 10.06.2016.
+ */
+public class RatingView extends View implements View.OnTouchListener {
+
+    //Default values
+    private static final boolean DEFAULT_IS_INDICATOR = false;
+
+    private static final float DEFAULT_RATING = 3.5f;
+
+    private static final int DEFAULT_MAX_COUNT = 5;
+
+    private static final int DEFAULT_DRAWABLE_SIZE_IN_DP = 32;
+
+    private static final int DEFAULT_DRAWABLE_MARGIN_IN_DP = 4;
+
+    private OnRatingChangedListener mListener;
+
+    //Bitmaps for your rating drawables
+    private Bitmap mDrawableEmpty, mDrawableHalf, mDrawableFilled;
+
+    //For drawing view
+    private Rect mRect = new Rect();
+
+    //Boolean field: if true - user cannot affect the view
+    private boolean mIsIndicator;
+
+    //Float field: displayed rating, 0 <= mRating <= mMaxCount
+    private float mRating;
+
+    //Integer field: max drawables count and rating as well
+    private int mMaxCount;
+
+    //Integer field: drawable size
+    private int mDrawableSize;
+
+    //Integer field: inner margin between drawables
+    private int mDrawableMargin;
+
+    /**
+     * This interface will return rating value before changing it and after
+     */
+    public interface OnRatingChangedListener {
+        void onRatingChange(float oldRating, float newRating);
+    }
+
+
+    public RatingView(Context context) {
+        super(context);
+        init(null, 0, 0);
+    }
+
+    public RatingView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs, 0, 0);
+    }
+
+    public RatingView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(attrs, defStyleAttr, 0);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public RatingView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(attrs, defStyleAttr, defStyleRes);
+    }
+
+    private void init(AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        TypedArray a = getContext().obtainStyledAttributes
+                (attrs, R.styleable.RatingView, defStyleAttr, defStyleRes);
+
+        mDrawableMargin = (int) a.getDimension(R.styleable.RatingView_drawable_margin,
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_DRAWABLE_MARGIN_IN_DP, getResources().getDisplayMetrics()));
+
+        mDrawableSize = (int) a.getDimension(R.styleable.RatingView_drawable_size,
+                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_DRAWABLE_SIZE_IN_DP, getResources().getDisplayMetrics()));
+
+        if (mDrawableSize < 0)
+            throw new IllegalArgumentException("Drawable size < 0");
+
+        mMaxCount = a.getInteger(R.styleable.RatingView_max_count, DEFAULT_MAX_COUNT);
+
+        if (mMaxCount < 1)
+            throw new IllegalArgumentException("Max count < 1");
+
+        mRating = a.getFloat(R.styleable.RatingView_rating, DEFAULT_RATING);
+
+        mIsIndicator = a.getBoolean(R.styleable.RatingView_is_indicator, DEFAULT_IS_INDICATOR);
+
+        mDrawableEmpty = BitmapFactory.decodeResource(getContext().getResources(),
+                a.getResourceId(R.styleable.RatingView_drawable_empty, R.drawable.ic_star_empty));
+
+        mDrawableHalf = BitmapFactory.decodeResource(getContext().getResources(),
+                a.getResourceId(R.styleable.RatingView_drawable_half, R.drawable.ic_star_half));
+
+        mDrawableFilled = BitmapFactory.decodeResource(getContext().getResources(),
+                a.getResourceId(R.styleable.RatingView_drawable_filled, R.drawable.ic_star_filled));
+
+        a.recycle();
+
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(resolveSize((mDrawableSize * mMaxCount) + (mDrawableMargin * (mMaxCount - 1))/* + getPaddingLeft() + getPaddingRight()*/, widthMeasureSpec),
+                resolveSize(mDrawableSize, heightMeasureSpec)/* + getPaddingBottom() + getPaddingTop()*/);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (!mIsIndicator)
+            setOnTouchListener(this);
+//        canvas.translate(getPaddingLeft(), getPaddingTop());
+        if (mDrawableFilled != null && mDrawableHalf != null && mDrawableEmpty != null) {
+            //set view size
+            mRect.set(0, 0, mDrawableSize, mDrawableSize);
+
+            int fullDrawablesCount = (int) mRating;
+            int emptyDrawablesCount = mMaxCount - Math.round(mRating);
+
+            if (mRating - fullDrawablesCount >= 0.75f)
+                fullDrawablesCount++;
+
+            //drawing full drawables
+            for (int i = 0; i < fullDrawablesCount; i++) {
+                canvas.drawBitmap(mDrawableFilled, null, mRect, null);
+                mRect.offset(mDrawableSize + mDrawableMargin, 0);
+            }
+
+            //drawing half drawable if needed
+            if (mRating - fullDrawablesCount >= 0.25f && mRating - fullDrawablesCount < 0.75f) {
+                canvas.drawBitmap(mDrawableHalf, null, mRect, null);
+                mRect.offset(mDrawableSize + mDrawableMargin, 0);
+            }
+
+            //drawing empty drawables
+            for (int i = 0; i < emptyDrawablesCount; i++) {
+                canvas.drawBitmap(mDrawableEmpty, null, mRect, null);
+                mRect.offset(mDrawableSize + mDrawableMargin, 0);
+            }
+
+        }
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        switch (event.getActionMasked()) {
+            case MotionEvent.ACTION_DOWN:
+                return true;
+            case MotionEvent.ACTION_UP:
+                setRating(Math.round(event.getX() / getWidth() * mMaxCount + 0.5));
+                return false;
+            default: //do nothing
+                break;
+        }
+        return super.onTouchEvent(event);
+    }
+
+    /**
+     * Sets OnRatingChangedListener on this view, which will give you old and new rating.
+     *
+     * @param listener your listener
+     */
+    public void setOnRatingChangedListener(OnRatingChangedListener listener) {
+        mListener = listener;
+    }
+
+    /**
+     * Sets whether rating view is isIndicator or not
+     *
+     * @param isIndicator boolean, true - user can't interact the view
+     */
+    public void setIsIndicator(boolean isIndicator) {
+        mIsIndicator = isIndicator;
+        setOnTouchListener(mIsIndicator ? null : this);
+    }
+
+    /**
+     * Sets the rating of this view
+     *
+     * @param rating custom rating
+     */
+    public void setRating(float rating) {
+        float newRating = rating;
+        if (newRating < 0) {
+            newRating = 0;
+        } else if (newRating > mMaxCount) {
+            newRating = mMaxCount;
+        }
+        if (mListener != null)
+            mListener.onRatingChange(mRating, newRating);
+        mRating = newRating;
+        invalidate();
+    }
+
+    /**
+     * Sets empty drawable
+     *
+     * @param drawableEmpty bitmap of your drawable
+     */
+    public void setDrawableEmpty(Bitmap drawableEmpty) {
+        this.mDrawableEmpty = drawableEmpty;
+        invalidate();
+    }
+
+    /**
+     * Sets half drawable
+     *
+     * @param drawableHalf bitmap of your drawable
+     */
+    public void setDrawableHalf(Bitmap drawableHalf) {
+        this.mDrawableHalf = drawableHalf;
+        invalidate();
+    }
+
+    /**
+     * Sets filled drawable
+     *
+     * @param drawableFilled bitmap of your drawable
+     */
+    public void setDrawableFilled(Bitmap drawableFilled) {
+        this.mDrawableFilled = drawableFilled;
+        invalidate();
+    }
+
+    /**
+     * @return is it indicator or not
+     */
+    public boolean isIndicator() {
+        return mIsIndicator;
+    }
+
+    /**
+     * @return current rating
+     */
+    public float getRating() {
+        return mRating;
+    }
+
+    /**
+     * @return current max count
+     */
+    public int getMaxCount() {
+        return mMaxCount;
+    }
+
+    /**
+     * @return drawable size in px
+     */
+    public int getDrawableSize() {
+        return mDrawableSize;
+    }
+
+    /**
+     * @return drawable margin in px
+     */
+    public int getDrawableMargin() {
+        return mDrawableMargin;
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        Parcelable superState = super.onSaveInstanceState();
+        SavedState savedState = new SavedState(superState);
+        savedState.mRating = mRating;
+        savedState.mIndicator = mIsIndicator;
+        return savedState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state instanceof SavedState) {
+            SavedState savedState = (SavedState) state;
+            super.onRestoreInstanceState(savedState.getSuperState());
+            mRating = savedState.mRating;
+            mIsIndicator = savedState.mIndicator;
+        } else {
+            super.onRestoreInstanceState(state);
+        }
+    }
+
+    static class SavedState extends BaseSavedState {
+
+        float mRating;
+        boolean mIndicator;
+
+        SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        private SavedState(Parcel in) {
+            super(in);
+            this.mRating = in.readFloat();
+            this.mIndicator = in.readInt() == 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel out, int flags) {
+            super.writeToParcel(out, flags);
+            out.writeFloat(this.mRating);
+            out.writeInt(this.mIndicator ? 1 : 0);
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR = new Parcelable.Creator<SavedState>() {
+            public SavedState createFromParcel(Parcel in) {
+                return new SavedState(in);
+            }
+
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+    }
+
+}
diff --git a/OnTime_User_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_empty.png b/OnTime_User_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_empty.png
new file mode 100755
index 0000000..5caaccf
Binary files /dev/null and b/OnTime_User_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_empty.png differ
diff --git a/OnTime_User_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_filled.png b/OnTime_User_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_filled.png
new file mode 100755
index 0000000..382f673
Binary files /dev/null and b/OnTime_User_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_filled.png differ
diff --git a/OnTime_User_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_half.png b/OnTime_User_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_half.png
new file mode 100755
index 0000000..d95aaac
Binary files /dev/null and b/OnTime_User_live/lib/RatingView/rating-view/src/main/res/drawable/ic_star_half.png differ
diff --git a/OnTime_User_live/lib/RatingView/rating-view/src/main/res/values/attrs_rating_view.xml b/OnTime_User_live/lib/RatingView/rating-view/src/main/res/values/attrs_rating_view.xml
new file mode 100755
index 0000000..aabfcd9
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/rating-view/src/main/res/values/attrs_rating_view.xml
@@ -0,0 +1,12 @@
+<resources>
+    <declare-styleable name="RatingView">
+        <attr name="drawable_margin" format="dimension" />
+        <attr name="drawable_size" format="dimension"/>
+        <attr name="max_count" format="integer" />
+        <attr name="rating" format="float" />
+        <attr name="is_indicator" format="boolean" />
+        <attr name="drawable_empty" format="reference" />
+        <attr name="drawable_filled" format="reference" />
+        <attr name="drawable_half" format="reference" />
+    </declare-styleable>
+</resources>
diff --git a/OnTime_User_live/lib/RatingView/rating-view/src/main/res/values/strings.xml b/OnTime_User_live/lib/RatingView/rating-view/src/main/res/values/strings.xml
new file mode 100755
index 0000000..eb16c6d
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/rating-view/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">RatingView</string>
+</resources>
diff --git a/OnTime_User_live/lib/RatingView/settings.gradle b/OnTime_User_live/lib/RatingView/settings.gradle
new file mode 100755
index 0000000..36f3078
--- /dev/null
+++ b/OnTime_User_live/lib/RatingView/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':rating-view'
diff --git a/OnTime_User_live/lib/TextDrawable/.gitignore b/OnTime_User_live/lib/TextDrawable/.gitignore
new file mode 100755
index 0000000..bba431a
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/.gitignore
@@ -0,0 +1,32 @@
+#built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
+
+# Eclipse project files
+.classpath
+.project
+
+# Android Studio
+.idea
+#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
+.gradle
+build/
\ No newline at end of file
diff --git a/OnTime_User_live/lib/TextDrawable/LICENSE b/OnTime_User_live/lib/TextDrawable/LICENSE
new file mode 100755
index 0000000..f864661
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Amulya Khare
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/OnTime_User_live/lib/TextDrawable/README.md b/OnTime_User_live/lib/TextDrawable/README.md
new file mode 100755
index 0000000..631c708
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/README.md
@@ -0,0 +1,133 @@
+###TextDrawable 
+This light-weight library provides images with letter/text like the Gmail app. It extends the `Drawable` class thus can be used with existing/custom/network `ImageView` classes. Also included is a [fluent interface](http://en.wikipedia.org/wiki/Fluent_interface) for creating drawables and a customizable `ColorGenerator`.
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen1-material.png" width="350"/>
+<img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen2-material.png" width="350"/>
+</p>
+
+###How to use
+
+#### Import with Gradle:
+
+```groovy
+repositories{
+    maven {
+        url 'http://dl.bintray.com/amulyakhare/maven'
+    }
+}
+
+dependencies {
+    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+}
+```
+
+####1. Create simple tile:
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen3.png"/>
+</p>
+
+```xml
+<ImageView android:layout_width="60dp"
+	       android:layout_height="60dp"
+	       android:id="@+id/image_view"/>
+```
+**Note:** Specify width/height for the `ImageView` and the `drawable` will auto-scale to fit the size.
+```java
+TextDrawable drawable = TextDrawable.builder()
+                .buildRect("A", Color.RED);
+
+ImageView image = (ImageView) findViewById(R.id.image_view);
+image.setImageDrawable(drawable);
+```
+
+####2. Create rounded corner or circular tiles:
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen6.png"/>
+</p>
+
+```java
+TextDrawable drawable1 = TextDrawable.builder()
+                .buildRoundRect("A", Color.RED, 10); // radius in px
+
+TextDrawable drawable2 = TextDrawable.builder()
+                .buildRound("A", Color.RED);
+```
+
+####3. Add border:
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen5.png"/>
+</p>
+
+```java
+TextDrawable drawable = TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(4) /* thickness in px */
+                .endConfig()
+                .buildRoundRect("A", Color.RED, 10);
+```
+
+####4. Modify font style:
+
+```java
+TextDrawable drawable = TextDrawable.builder()
+                .beginConfig()
+	                .textColor(Color.BLACK)
+                    .useFont(Typeface.DEFAULT)
+                    .fontSize(30) /* size in px */
+                    .bold()
+                    .toUpperCase()
+                .endConfig()
+                .buildRect("a", Color.RED)
+```
+
+####5. Built-in color generator:
+
+```java
+ColorGenerator generator = ColorGenerator.MATERIAL; // or use DEFAULT
+// generate random color
+int color1 = generator.getRandomColor();
+// generate color based on a key (same key returns the same color), useful for list/grid views
+int color2 = generator.getColor("user@gmail.com")
+
+// declare the builder object once.
+TextDrawable.IBuilder builder = TextDrawable.builder()
+				.beginConfig()
+					.withBorder(4)
+				.endConfig()
+				.rect();
+
+// reuse the builder specs to create multiple drawables
+TextDrawable ic1 = builder.build("A", color1);
+TextDrawable ic2 = builder.build("B", color2);
+``` 
+
+####6. Specify the width / height:
+
+```xml
+<ImageView android:layout_width="wrap_content"
+	       android:layout_height="wrap_content"
+	       android:id="@+id/image_view"/>
+```
+**Note:**  The `ImageView` could use `wrap_content` width/height. You could set the width/height of the `drawable` using code.
+
+```java
+TextDrawable drawable = TextDrawable.builder()
+				.beginConfig()
+					.width(60)  // width in px
+					.height(60) // height in px
+				.endConfig()
+                .buildRect("A", Color.RED);
+
+ImageView image = (ImageView) findViewById(R.id.image_view);
+image.setImageDrawable(drawable);
+```
+
+####7. Other features:
+
+1. Mix-match with other drawables. Use it in conjunction with `LayerDrawable`, `InsetDrawable`, `AnimationDrawable`, `TransitionDrawable` etc.
+
+2. Compatible with other views (not just `ImageView`). Use it as background drawable, compound drawable for `TextView`, `Button` etc.
+
+3. Use multiple letters or `unicode` characters to create interesting tiles. 
+
+<p align="center"><img src ="https://github.com/amulyakhare/TextDrawable/blob/master/screens/screen7.png" width="350"/></p>
diff --git a/OnTime_User_live/lib/TextDrawable/build.gradle b/OnTime_User_live/lib/TextDrawable/build.gradle
new file mode 100755
index 0000000..3a8a17e
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/build.gradle
@@ -0,0 +1,18 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.0'
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/OnTime_User_live/lib/TextDrawable/gradle.properties b/OnTime_User_live/lib/TextDrawable/gradle.properties
new file mode 100755
index 0000000..5d08ba7
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/gradle.properties
@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Settings specified in this file will override any Gradle settings
+# configured through the IDE.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
\ No newline at end of file
diff --git a/OnTime_User_live/lib/TextDrawable/gradle/wrapper/gradle-wrapper.properties b/OnTime_User_live/lib/TextDrawable/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..ffc5028
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Mar 02 14:59:31 WIB 2026
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_User_live/lib/TextDrawable/gradlew b/OnTime_User_live/lib/TextDrawable/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_User_live/lib/TextDrawable/gradlew.bat b/OnTime_User_live/lib/TextDrawable/gradlew.bat
new file mode 100755
index 0000000..aec9973
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_User_live/lib/TextDrawable/library/.gitignore b/OnTime_User_live/lib/TextDrawable/library/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/library/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_User_live/lib/TextDrawable/library/build.gradle b/OnTime_User_live/lib/TextDrawable/library/build.gradle
new file mode 100755
index 0000000..c3d6237
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/library/build.gradle
@@ -0,0 +1,39 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'com.amulyakhare.textdrawable'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 2
+        versionName "1.1"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/main/java'
+        }
+        resources {
+            srcDir 'src/main/res'
+        }
+    }
+}
+
+task sourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from sourceSets.main.java, sourceSets.main.resources
+}
diff --git a/OnTime_User_live/lib/TextDrawable/library/proguard-rules.pro b/OnTime_User_live/lib/TextDrawable/library/proguard-rules.pro
new file mode 100755
index 0000000..38b532c
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/library/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/gardev/android/adt-bundle-linux/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_User_live/lib/TextDrawable/library/src/main/AndroidManifest.xml b/OnTime_User_live/lib/TextDrawable/library/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..a4307de
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/library/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest package="com.amulyakhare.textdrawable">
+    <application/>
+</manifest>
diff --git a/OnTime_User_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java b/OnTime_User_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java
new file mode 100755
index 0000000..db42f8b
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java
@@ -0,0 +1,316 @@
+package com.amulyakhare.textdrawable;
+
+import android.graphics.*;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.OvalShape;
+import android.graphics.drawable.shapes.RectShape;
+import android.graphics.drawable.shapes.RoundRectShape;
+
+/**
+ * @author amulya
+ * @datetime 14 Oct 2014, 3:53 PM
+ */
+public class TextDrawable extends ShapeDrawable {
+
+    private final Paint textPaint;
+    private final Paint borderPaint;
+    private static final float SHADE_FACTOR = 0.9f;
+    private final String text;
+    private final int color;
+    private final RectShape shape;
+    private final int height;
+    private final int width;
+    private final int fontSize;
+    private final float radius;
+    private final int borderThickness;
+
+    private TextDrawable(Builder builder) {
+        super(builder.shape);
+
+        // shape properties
+        shape = builder.shape;
+        height = builder.height;
+        width = builder.width;
+        radius = builder.radius;
+
+        // text and color
+        text = builder.toUpperCase ? builder.text.toUpperCase() : builder.text;
+        color = builder.color;
+
+        // text paint settings
+        fontSize = builder.fontSize;
+        textPaint = new Paint();
+        textPaint.setColor(builder.textColor);
+        textPaint.setAntiAlias(true);
+        textPaint.setFakeBoldText(builder.isBold);
+        textPaint.setStyle(Paint.Style.FILL);
+        textPaint.setTypeface(builder.font);
+        textPaint.setTextAlign(Paint.Align.CENTER);
+        textPaint.setStrokeWidth(builder.borderThickness);
+
+        // border paint settings
+        borderThickness = builder.borderThickness;
+        borderPaint = new Paint();
+        borderPaint.setColor(getDarkerShade(color));
+        borderPaint.setStyle(Paint.Style.STROKE);
+        borderPaint.setStrokeWidth(borderThickness);
+
+        // drawable paint color
+        Paint paint = getPaint();
+        paint.setColor(color);
+
+    }
+
+    private int getDarkerShade(int color) {
+        return Color.rgb((int)(SHADE_FACTOR * Color.red(color)),
+                (int)(SHADE_FACTOR * Color.green(color)),
+                (int)(SHADE_FACTOR * Color.blue(color)));
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        super.draw(canvas);
+        Rect r = getBounds();
+
+
+        // draw border
+        if (borderThickness > 0) {
+            drawBorder(canvas);
+        }
+
+        int count = canvas.save();
+        canvas.translate(r.left, r.top);
+
+        // draw text
+        int width = this.width < 0 ? r.width() : this.width;
+        int height = this.height < 0 ? r.height() : this.height;
+        int fontSize = this.fontSize < 0 ? (Math.min(width, height) / 2) : this.fontSize;
+        textPaint.setTextSize(fontSize);
+        canvas.drawText(text, width / 2, height / 2 - ((textPaint.descent() + textPaint.ascent()) / 2), textPaint);
+
+        canvas.restoreToCount(count);
+
+    }
+
+    private void drawBorder(Canvas canvas) {
+        RectF rect = new RectF(getBounds());
+        rect.inset(borderThickness/2, borderThickness/2);
+
+        if (shape instanceof OvalShape) {
+            canvas.drawOval(rect, borderPaint);
+        }
+        else if (shape instanceof RoundRectShape) {
+            canvas.drawRoundRect(rect, radius, radius, borderPaint);
+        }
+        else {
+            canvas.drawRect(rect, borderPaint);
+        }
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        textPaint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter cf) {
+        textPaint.setColorFilter(cf);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return width;
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return height;
+    }
+
+    public static IShapeBuilder builder() {
+        return new Builder();
+    }
+
+    public static class Builder implements IConfigBuilder, IShapeBuilder, IBuilder {
+
+        private String text;
+
+        private int color;
+
+        private int borderThickness;
+
+        private int width;
+
+        private int height;
+
+        private Typeface font;
+
+        private RectShape shape;
+
+        public int textColor;
+
+        private int fontSize;
+
+        private boolean isBold;
+
+        private boolean toUpperCase;
+
+        public float radius;
+
+        private Builder() {
+            text = "";
+            color = Color.GRAY;
+            textColor = Color.WHITE;
+            borderThickness = 0;
+            width = -1;
+            height = -1;
+            shape = new RectShape();
+            font = Typeface.create("sans-serif-light", Typeface.NORMAL);
+            fontSize = -1;
+            isBold = false;
+            toUpperCase = false;
+        }
+
+        public IConfigBuilder width(int width) {
+            this.width = width;
+            return this;
+        }
+
+        public IConfigBuilder height(int height) {
+            this.height = height;
+            return this;
+        }
+
+        public IConfigBuilder textColor(int color) {
+            this.textColor = color;
+            return this;
+        }
+
+        public IConfigBuilder withBorder(int thickness) {
+            this.borderThickness = thickness;
+            return this;
+        }
+
+        public IConfigBuilder useFont(Typeface font) {
+            this.font = font;
+            return this;
+        }
+
+        public IConfigBuilder fontSize(int size) {
+            this.fontSize = size;
+            return this;
+        }
+
+        public IConfigBuilder bold() {
+            this.isBold = true;
+            return this;
+        }
+
+        public IConfigBuilder toUpperCase() {
+            this.toUpperCase = true;
+            return this;
+        }
+
+        @Override
+        public IConfigBuilder beginConfig() {
+            return this;
+        }
+
+        @Override
+        public IShapeBuilder endConfig() {
+            return this;
+        }
+
+        @Override
+        public IBuilder rect() {
+            this.shape = new RectShape();
+            return this;
+        }
+
+        @Override
+        public IBuilder round() {
+            this.shape = new OvalShape();
+            return this;
+        }
+
+        @Override
+        public IBuilder roundRect(int radius) {
+            this.radius = radius;
+            float[] radii = {radius, radius, radius, radius, radius, radius, radius, radius};
+            this.shape = new RoundRectShape(radii, null, null);
+            return this;
+        }
+
+        @Override
+        public TextDrawable buildRect(String text, int color) {
+            rect();
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable buildRoundRect(String text, int color, int radius) {
+            roundRect(radius);
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable buildRound(String text, int color) {
+            round();
+            return build(text, color);
+        }
+
+        @Override
+        public TextDrawable build(String text, int color) {
+            this.color = color;
+            this.text = text;
+            return new TextDrawable(this);
+        }
+    }
+
+    public interface IConfigBuilder {
+        public IConfigBuilder width(int width);
+
+        public IConfigBuilder height(int height);
+
+        public IConfigBuilder textColor(int color);
+
+        public IConfigBuilder withBorder(int thickness);
+
+        public IConfigBuilder useFont(Typeface font);
+
+        public IConfigBuilder fontSize(int size);
+
+        public IConfigBuilder bold();
+
+        public IConfigBuilder toUpperCase();
+
+        public IShapeBuilder endConfig();
+    }
+
+    public static interface IBuilder {
+
+        public TextDrawable build(String text, int color);
+    }
+
+    public static interface IShapeBuilder {
+
+        public IConfigBuilder beginConfig();
+
+        public IBuilder rect();
+
+        public IBuilder round();
+
+        public IBuilder roundRect(int radius);
+
+        public TextDrawable buildRect(String text, int color);
+
+        public TextDrawable buildRoundRect(String text, int color, int radius);
+
+        public TextDrawable buildRound(String text, int color);
+    }
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java b/OnTime_User_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java
new file mode 100755
index 0000000..198c18f
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java
@@ -0,0 +1,69 @@
+package com.amulyakhare.textdrawable.util;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * @author amulya
+ * @datetime 14 Oct 2014, 5:20 PM
+ */
+public class ColorGenerator {
+
+    public static ColorGenerator DEFAULT;
+
+    public static ColorGenerator MATERIAL;
+
+    static {
+        DEFAULT = create(Arrays.asList(
+                0xfff16364,
+                0xfff58559,
+                0xfff9a43e,
+                0xffe4c62e,
+                0xff67bf74,
+                0xff59a2be,
+                0xff2093cd,
+                0xffad62a7,
+                0xff805781
+        ));
+        MATERIAL = create(Arrays.asList(
+                0xffe57373,
+                0xfff06292,
+                0xffba68c8,
+                0xff9575cd,
+                0xff7986cb,
+                0xff64b5f6,
+                0xff4fc3f7,
+                0xff4dd0e1,
+                0xff4db6ac,
+                0xff81c784,
+                0xffaed581,
+                0xffff8a65,
+                0xffd4e157,
+                0xffffd54f,
+                0xffffb74d,
+                0xffa1887f,
+                0xff90a4ae
+        ));
+    }
+
+    private final List<Integer> mColors;
+    private final Random mRandom;
+
+    public static ColorGenerator create(List<Integer> colorList) {
+        return new ColorGenerator(colorList);
+    }
+
+    private ColorGenerator(List<Integer> colorList) {
+        mColors = colorList;
+        mRandom = new Random(System.currentTimeMillis());
+    }
+
+    public int getRandomColor() {
+        return mColors.get(mRandom.nextInt(mColors.size()));
+    }
+
+    public int getColor(Object key) {
+        return mColors.get(Math.abs(key.hashCode()) % mColors.size());
+    }
+}
diff --git a/OnTime_User_live/lib/TextDrawable/sample/.gitignore b/OnTime_User_live/lib/TextDrawable/sample/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_User_live/lib/TextDrawable/sample/build.gradle b/OnTime_User_live/lib/TextDrawable/sample/build.gradle
new file mode 100755
index 0000000..85e0728
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.1"
+
+    defaultConfig {
+        applicationId "com.amulyakhare.td"
+        minSdkVersion 10
+        targetSdkVersion 21
+        versionCode 2
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(':library')
+    compile 'com.android.support:appcompat-v7:21.0.3'
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/TextDrawable/sample/proguard-rules.pro b/OnTime_User_live/lib/TextDrawable/sample/proguard-rules.pro
new file mode 100755
index 0000000..38b532c
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /home/gardev/android/adt-bundle-linux/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/AndroidManifest.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..3f1ab69
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.amulyakhare.td" >
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.amulyakhare.td.sample.MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.amulyakhare.td.sample.ListActivity"
+            android:label="@string/title_activity_check_box" >
+        </activity>
+    </application>
+
+</manifest>
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/ListActivity.java b/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/ListActivity.java
new file mode 100755
index 0000000..f9832d7
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/ListActivity.java
@@ -0,0 +1,193 @@
+package com.amulyakhare.td.sample;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.amulyakhare.td.R;
+import com.amulyakhare.td.sample.sample.DrawableProvider;
+import com.amulyakhare.textdrawable.TextDrawable;
+import com.amulyakhare.textdrawable.util.ColorGenerator;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ListActivity extends ActionBarActivity {
+
+    private static final int HIGHLIGHT_COLOR = 0x999be6ff;
+
+    // list of data items
+    private List<ListData> mDataList = Arrays.asList(
+            new ListData("Iron Man"),
+            new ListData("Captain America"),
+            new ListData("James Bond"),
+            new ListData("Harry Potter"),
+            new ListData("Sherlock Holmes"),
+            new ListData("Black Widow"),
+            new ListData("Hawk Eye"),
+            new ListData("Iron Man"),
+            new ListData("Guava"),
+            new ListData("Tomato"),
+            new ListData("Pineapple"),
+            new ListData("Strawberry"),
+            new ListData("Watermelon"),
+            new ListData("Pears"),
+            new ListData("Kiwi"),
+            new ListData("Plums")
+    );
+
+    // declare the color generator and drawable builder
+    private ColorGenerator mColorGenerator = ColorGenerator.MATERIAL;
+    private TextDrawable.IBuilder mDrawableBuilder;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_list);
+
+        Intent intent = getIntent();
+        int type = intent.getIntExtra(MainActivity.TYPE, DrawableProvider.SAMPLE_RECT);
+
+        // initialize the builder based on the "TYPE"
+        switch (type) {
+            case DrawableProvider.SAMPLE_RECT:
+                mDrawableBuilder = TextDrawable.builder()
+                        .rect();
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT:
+                mDrawableBuilder = TextDrawable.builder()
+                        .roundRect(10);
+                break;
+            case DrawableProvider.SAMPLE_ROUND:
+                mDrawableBuilder = TextDrawable.builder()
+                        .round();
+                break;
+            case DrawableProvider.SAMPLE_RECT_BORDER:
+                mDrawableBuilder = TextDrawable.builder()
+                        .beginConfig()
+                            .withBorder(4)
+                        .endConfig()
+                        .rect();
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT_BORDER:
+                mDrawableBuilder = TextDrawable.builder()
+                        .beginConfig()
+                            .withBorder(4)
+                        .endConfig()
+                        .roundRect(10);
+                break;
+            case DrawableProvider.SAMPLE_ROUND_BORDER:
+                mDrawableBuilder = TextDrawable.builder()
+                        .beginConfig()
+                            .withBorder(4)
+                        .endConfig()
+                        .round();
+                break;
+        }
+
+        // init the list view and its adapter
+        ListView listView = (ListView) findViewById(R.id.listView);
+        listView.setAdapter(new SampleAdapter());
+    }
+
+    private class SampleAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return mDataList.size();
+        }
+
+        @Override
+        public ListData getItem(int position) {
+            return mDataList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(final int position, View convertView, ViewGroup parent) {
+            final ViewHolder holder;
+            if (convertView == null) {
+                convertView = View.inflate(ListActivity.this, R.layout.list_item_layout, null);
+                holder = new ViewHolder(convertView);
+                convertView.setTag(holder);
+            } else {
+                holder = (ViewHolder) convertView.getTag();
+            }
+
+            ListData item = getItem(position);
+
+            // provide support for selected state
+            updateCheckedState(holder, item);
+            holder.imageView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    // when the image is clicked, update the selected state
+                    ListData data = getItem(position);
+                    data.setChecked(!data.isChecked);
+                    updateCheckedState(holder, data);
+                }
+            });
+            holder.textView.setText(item.data);
+
+            return convertView;
+        }
+
+        private void updateCheckedState(ViewHolder holder, ListData item) {
+            if (item.isChecked) {
+                holder.imageView.setImageDrawable(mDrawableBuilder.build(" ", 0xff616161));
+                holder.view.setBackgroundColor(HIGHLIGHT_COLOR);
+                holder.checkIcon.setVisibility(View.VISIBLE);
+            }
+            else {
+                TextDrawable drawable = mDrawableBuilder.build(String.valueOf(item.data.charAt(0)), mColorGenerator.getColor(item.data));
+                holder.imageView.setImageDrawable(drawable);
+                holder.view.setBackgroundColor(Color.TRANSPARENT);
+                holder.checkIcon.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    private static class ViewHolder {
+
+        private View view;
+
+        private ImageView imageView;
+
+        private TextView textView;
+
+        private ImageView checkIcon;
+
+        private ViewHolder(View view) {
+            this.view = view;
+            imageView = (ImageView) view.findViewById(R.id.imageView);
+            textView = (TextView) view.findViewById(R.id.textView);
+            checkIcon = (ImageView) view.findViewById(R.id.check_icon);
+        }
+    }
+
+    private static class ListData {
+
+        private String data;
+
+        private boolean isChecked;
+
+        public ListData(String data) {
+            this.data = data;
+        }
+
+        public void setChecked(boolean isChecked) {
+            this.isChecked = isChecked;
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/MainActivity.java b/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/MainActivity.java
new file mode 100755
index 0000000..fd2ca43
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/MainActivity.java
@@ -0,0 +1,119 @@
+package com.amulyakhare.td.sample;
+
+import android.content.Intent;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.*;
+
+import com.amulyakhare.td.R;
+import com.amulyakhare.td.sample.sample.DataItem;
+import com.amulyakhare.td.sample.sample.DataSource;
+
+public class MainActivity extends ActionBarActivity implements AdapterView.OnItemClickListener {
+
+    public static final String TYPE = "TYPE";
+    private DataSource mDataSource;
+    private ListView mListView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        mListView = (ListView) findViewById(R.id.listView);
+        mDataSource = new DataSource(this);
+        mListView.setAdapter(new SampleAdapter());
+        mListView.setOnItemClickListener(this);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        DataItem item = (DataItem) mListView.getItemAtPosition(position);
+
+        // if navigation is supported, open the next activity
+        if (item.getNavigationInfo() != DataSource.NO_NAVIGATION) {
+            Intent intent = new Intent(this, ListActivity.class);
+            intent.putExtra(TYPE, item.getNavigationInfo());
+            startActivity(intent);
+        }
+    }
+
+    private class SampleAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return mDataSource.getCount();
+        }
+
+        @Override
+        public DataItem getItem(int position) {
+            return mDataSource.getItem(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            ViewHolder holder;
+            if (convertView == null) {
+                convertView = View.inflate(MainActivity.this, R.layout.list_item_layout, null);
+                holder = new ViewHolder(convertView);
+                convertView.setTag(holder);
+            } else {
+                holder = (ViewHolder) convertView.getTag();
+            }
+
+            DataItem item = getItem(position);
+
+            final Drawable drawable = item.getDrawable();
+            holder.imageView.setImageDrawable(drawable);
+            holder.textView.setText(item.getLabel());
+
+            // if navigation is supported, show the ">" navigation icon
+            if (item.getNavigationInfo() != DataSource.NO_NAVIGATION) {
+                holder.textView.setCompoundDrawablesWithIntrinsicBounds(null,
+                        null,
+                        getResources().getDrawable(R.drawable.ic_action_next_item),
+                        null);
+            }
+            else {
+                holder.textView.setCompoundDrawablesWithIntrinsicBounds(null,
+                        null,
+                        null,
+                        null);
+            }
+
+            // fix for animation not playing for some below 4.4 devices
+            if (drawable instanceof AnimationDrawable) {
+                holder.imageView.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        ((AnimationDrawable) drawable).stop();
+                        ((AnimationDrawable) drawable).start();
+                    }
+                });
+            }
+
+            return convertView;
+        }
+    }
+
+    private static class ViewHolder {
+
+        private ImageView imageView;
+
+        private TextView textView;
+
+        private ViewHolder(View view) {
+            imageView = (ImageView) view.findViewById(R.id.imageView);
+            textView = (TextView) view.findViewById(R.id.textView);
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataItem.java b/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataItem.java
new file mode 100755
index 0000000..30b247d
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataItem.java
@@ -0,0 +1,34 @@
+package com.amulyakhare.td.sample.sample;
+
+import android.graphics.drawable.Drawable;
+
+/**
+ * @author amulya
+ * @datetime 17 Oct 2014, 3:50 PM
+ */
+public class DataItem {
+
+    private String label;
+
+    private Drawable drawable;
+
+    private int navigationInfo;
+
+    public DataItem(String label, Drawable drawable, int navigationInfo) {
+        this.label = label;
+        this.drawable = drawable;
+        this.navigationInfo = navigationInfo;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public Drawable getDrawable() {
+        return drawable;
+    }
+
+    public int getNavigationInfo() {
+        return navigationInfo;
+    }
+}
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataSource.java b/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataSource.java
new file mode 100755
index 0000000..8180a84
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataSource.java
@@ -0,0 +1,99 @@
+package com.amulyakhare.td.sample.sample;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+
+import java.util.ArrayList;
+
+/**
+ * @author amulya
+ * @datetime 17 Oct 2014, 3:49 PM
+ */
+public class DataSource {
+
+    public static final int NO_NAVIGATION = -1;
+
+    private ArrayList<DataItem> mDataSource;
+    private DrawableProvider mProvider;
+
+    public DataSource(Context context) {
+        mProvider = new DrawableProvider(context);
+        mDataSource = new ArrayList<DataItem>();
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_RECT));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND_RECT));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_RECT_BORDER));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND_RECT_BORDER));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ROUND_BORDER));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_MULTIPLE_LETTERS));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_FONT));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_SIZE));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_ANIMATION));
+        mDataSource.add(itemFromType(DrawableProvider.SAMPLE_MISC));
+    }
+
+    public int getCount() {
+        return mDataSource.size();
+    }
+
+    public DataItem getItem(int position) {
+        return mDataSource.get(position);
+    }
+
+    private DataItem itemFromType(int type) {
+        String label = null;
+        Drawable drawable = null;
+        switch (type) {
+            case DrawableProvider.SAMPLE_RECT:
+                label = "Rectangle with Text";
+                drawable = mProvider.getRect("A");
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT:
+                label = "Round Corner with Text";
+                drawable = mProvider.getRoundRect("B");
+                break;
+            case DrawableProvider.SAMPLE_ROUND:
+                label = "Round with Text";
+                drawable = mProvider.getRound("C");
+                break;
+            case DrawableProvider.SAMPLE_RECT_BORDER:
+                label = "Rectangle with Border";
+                drawable = mProvider.getRectWithBorder("D");
+                break;
+            case DrawableProvider.SAMPLE_ROUND_RECT_BORDER:
+                label = "Round Corner with Border";
+                drawable = mProvider.getRoundRectWithBorder("E");
+                break;
+            case DrawableProvider.SAMPLE_ROUND_BORDER:
+                label = "Round with Border";
+                drawable = mProvider.getRoundWithBorder("F");
+                break;
+            case DrawableProvider.SAMPLE_MULTIPLE_LETTERS:
+                label = "Support multiple letters";
+                drawable = mProvider.getRectWithMultiLetter();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_FONT:
+                label = "Support variable font styles";
+                drawable = mProvider.getRoundWithCustomFont();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_SIZE:
+                label = "Support for custom size";
+                drawable = mProvider.getRectWithCustomSize();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_ANIMATION:
+                label = "Support for animations";
+                drawable = mProvider.getRectWithAnimation();
+                type = NO_NAVIGATION;
+                break;
+            case DrawableProvider.SAMPLE_MISC:
+                label = "Miscellaneous";
+                drawable =  mProvider.getRect("\u03c0");
+                type = NO_NAVIGATION;
+                break;
+        }
+        return new DataItem(label, drawable, type);
+    }
+}
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DrawableProvider.java b/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DrawableProvider.java
new file mode 100755
index 0000000..e183b11
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DrawableProvider.java
@@ -0,0 +1,146 @@
+package com.amulyakhare.td.sample.sample;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.InsetDrawable;
+import android.graphics.drawable.LayerDrawable;
+import android.util.TypedValue;
+
+import com.amulyakhare.textdrawable.TextDrawable;
+import com.amulyakhare.textdrawable.util.ColorGenerator;
+
+/**
+ * @author amulya
+ * @datetime 17 Oct 2014, 4:02 PM
+ */
+public class DrawableProvider {
+
+    public static final int SAMPLE_RECT = 1;
+    public static final int SAMPLE_ROUND_RECT = 2;
+    public static final int SAMPLE_ROUND = 3;
+    public static final int SAMPLE_RECT_BORDER = 4;
+    public static final int SAMPLE_ROUND_RECT_BORDER = 5;
+    public static final int SAMPLE_ROUND_BORDER = 6;
+    public static final int SAMPLE_MULTIPLE_LETTERS = 7;
+    public static final int SAMPLE_FONT = 8;
+    public static final int SAMPLE_SIZE = 9;
+    public static final int SAMPLE_ANIMATION = 10;
+    public static final int SAMPLE_MISC = 11;
+
+    private final ColorGenerator mGenerator;
+    private final Context mContext;
+
+    public DrawableProvider(Context context) {
+        mGenerator = ColorGenerator.DEFAULT;
+        mContext = context;
+    }
+
+    public TextDrawable getRect(String text) {
+        return TextDrawable.builder()
+                .buildRect(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRound(String text) {
+        return TextDrawable.builder()
+                .buildRound(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundRect(String text) {
+        return TextDrawable.builder()
+                .buildRoundRect(text, mGenerator.getColor(text), toPx(10));
+    }
+
+    public TextDrawable getRectWithBorder(String text) {
+        return TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(toPx(2))
+                .endConfig()
+                .buildRect(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundWithBorder(String text) {
+        return TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(toPx(2))
+                .endConfig()
+                .buildRound(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundRectWithBorder(String text) {
+        return TextDrawable.builder()
+                .beginConfig()
+                    .withBorder(toPx(2))
+                .endConfig()
+                .buildRoundRect(text, mGenerator.getColor(text), toPx(10));
+    }
+
+    public TextDrawable getRectWithMultiLetter() {
+        String text = "AK";
+        return TextDrawable.builder()
+                .beginConfig()
+                    .fontSize(toPx(20))
+                    .toUpperCase()
+                .endConfig()
+                .buildRect(text, mGenerator.getColor(text));
+    }
+
+    public TextDrawable getRoundWithCustomFont() {
+        String text = "Bold";
+        return TextDrawable.builder()
+                .beginConfig()
+                    .useFont(Typeface.DEFAULT)
+                    .fontSize(toPx(15))
+                    .textColor(0xfff58559)
+                    .bold()
+                .endConfig()
+                .buildRect(text, Color.DKGRAY /*toPx(5)*/);
+    }
+
+    public Drawable getRectWithCustomSize() {
+        String leftText = "I";
+        String rightText = "J";
+
+        TextDrawable.IBuilder builder = TextDrawable.builder()
+                .beginConfig()
+                    .width(toPx(29))
+                    .withBorder(toPx(2))
+                .endConfig()
+                .rect();
+
+        TextDrawable left = builder
+                .build(leftText, mGenerator.getColor(leftText));
+
+        TextDrawable right = builder
+                .build(rightText, mGenerator.getColor(rightText));
+
+        Drawable[] layerList = {
+                new InsetDrawable(left, 0, 0, toPx(31), 0),
+                new InsetDrawable(right, toPx(31), 0, 0, 0)
+        };
+        return new LayerDrawable(layerList);
+    }
+
+    public Drawable getRectWithAnimation() {
+        TextDrawable.IBuilder builder = TextDrawable.builder()
+                .rect();
+
+        AnimationDrawable animationDrawable = new AnimationDrawable();
+        for (int i = 10; i > 0; i--) {
+            TextDrawable frame = builder.build(String.valueOf(i), mGenerator.getRandomColor());
+            animationDrawable.addFrame(frame, 1200);
+        }
+        animationDrawable.setOneShot(false);
+        animationDrawable.start();
+
+        return animationDrawable;
+    }
+
+    public int toPx(int dp) {
+        Resources resources = mContext.getResources();
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, resources.getDisplayMetrics());
+    }
+}
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_alpha.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_alpha.png
new file mode 100755
index 0000000..8fc3239
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_alpha.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm.9.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm.9.png
new file mode 100755
index 0000000..7cf7352
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm.9.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm1.9.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm1.9.png
new file mode 100755
index 0000000..7d2fcc0
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm1.9.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_action_next_item.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_action_next_item.png
new file mode 100755
index 0000000..67f1482
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_action_next_item.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_launcher.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100755
index 0000000..96a442e
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-ldpi/check_sm.9.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-ldpi/check_sm.9.png
new file mode 100755
index 0000000..1dbf4f7
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-ldpi/check_sm.9.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/check_sm.9.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/check_sm.9.png
new file mode 100755
index 0000000..d44d02c
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/check_sm.9.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_action_next_item.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_action_next_item.png
new file mode 100755
index 0000000..47365a3
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_action_next_item.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_launcher.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100755
index 0000000..359047d
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/check_sm.9.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/check_sm.9.png
new file mode 100755
index 0000000..9981a75
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/check_sm.9.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_action_next_item.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_action_next_item.png
new file mode 100755
index 0000000..5f30474
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_action_next_item.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_launcher.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..71c6d76
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/check_sm.9.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/check_sm.9.png
new file mode 100755
index 0000000..8766797
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/check_sm.9.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_action_next_item.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_action_next_item.png
new file mode 100755
index 0000000..51479d8
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_action_next_item.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_launcher.png b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..4df1894
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/activity_check_box.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/activity_check_box.xml
new file mode 100755
index 0000000..cd5a02c
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/activity_check_box.xml
@@ -0,0 +1,16 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.amulyakhare.td.sample.ListActivity">
+
+    <ImageButton
+        android:id="@+id/imageButton"
+        android:layout_width="100dp"
+        android:layout_height="100dp" />
+
+</RelativeLayout>
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/activity_list.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/activity_list.xml
new file mode 100755
index 0000000..b87aee7
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/activity_list.xml
@@ -0,0 +1,8 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/listView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.amulyakhare.td.sample.MiscActivity">
+
+</ListView>
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/activity_main.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..c3942ff
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/activity_main.xml
@@ -0,0 +1,8 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          android:id="@+id/listView"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          tools:context="com.amulyakhare.td.sample.MiscActivity">
+
+</ListView>
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/list_item_layout.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/list_item_layout.xml
new file mode 100755
index 0000000..bd69f42
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/layout/list_item_layout.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:padding="16dp"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <FrameLayout
+        android:layout_marginRight="16dp"
+        android:layout_width="60dp"
+        android:layout_height="60dp">
+
+        <ImageView
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:id="@+id/imageView"/>
+
+        <ImageView
+            android:visibility="gone"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:src="@drawable/check_sm"
+            android:id="@+id/check_icon"/>
+    </FrameLayout>
+
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:id="@+id/textView"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/menu/check_box.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/menu/check_box.xml
new file mode 100755
index 0000000..734bf82
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/menu/check_box.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.amulyakhare.td.sample.ListActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/menu/list.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/menu/list.xml
new file mode 100755
index 0000000..77fb30e
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/menu/list.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.amulyakhare.td.sample.MiscActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/menu/main.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/menu/main.xml
new file mode 100755
index 0000000..7fe7424
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/menu/main.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".MainActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values-w820dp/dimens.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values/dimens.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..47c8224
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values/strings.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values/strings.xml
new file mode 100755
index 0000000..6e1ab46
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">TextDrawable Sample</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
+    <string name="title_activity_list">TextDrawable Sample</string>
+    <string name="title_activity_check_box">TextDrawable Sample</string>
+
+</resources>
diff --git a/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values/styles.xml b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values/styles.xml
new file mode 100755
index 0000000..766ab99
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/sample/src/main/res/values/styles.xml
@@ -0,0 +1,8 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+    </style>
+
+</resources>
diff --git a/OnTime_User_live/lib/TextDrawable/screens/screen1-material.png b/OnTime_User_live/lib/TextDrawable/screens/screen1-material.png
new file mode 100755
index 0000000..b8bfdbb
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/screens/screen1-material.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/screens/screen1.png b/OnTime_User_live/lib/TextDrawable/screens/screen1.png
new file mode 100755
index 0000000..8fc9e8f
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/screens/screen1.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/screens/screen2-material.png b/OnTime_User_live/lib/TextDrawable/screens/screen2-material.png
new file mode 100755
index 0000000..77c9b6b
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/screens/screen2-material.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/screens/screen2.png b/OnTime_User_live/lib/TextDrawable/screens/screen2.png
new file mode 100755
index 0000000..dc0afad
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/screens/screen2.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/screens/screen3.png b/OnTime_User_live/lib/TextDrawable/screens/screen3.png
new file mode 100755
index 0000000..7d3e5f3
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/screens/screen3.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/screens/screen4.png b/OnTime_User_live/lib/TextDrawable/screens/screen4.png
new file mode 100755
index 0000000..0099dab
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/screens/screen4.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/screens/screen5.png b/OnTime_User_live/lib/TextDrawable/screens/screen5.png
new file mode 100755
index 0000000..686c636
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/screens/screen5.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/screens/screen6.png b/OnTime_User_live/lib/TextDrawable/screens/screen6.png
new file mode 100755
index 0000000..140e120
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/screens/screen6.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/screens/screen7.png b/OnTime_User_live/lib/TextDrawable/screens/screen7.png
new file mode 100755
index 0000000..c3d2b69
Binary files /dev/null and b/OnTime_User_live/lib/TextDrawable/screens/screen7.png differ
diff --git a/OnTime_User_live/lib/TextDrawable/settings.gradle b/OnTime_User_live/lib/TextDrawable/settings.gradle
new file mode 100755
index 0000000..2b99c92
--- /dev/null
+++ b/OnTime_User_live/lib/TextDrawable/settings.gradle
@@ -0,0 +1,4 @@
+include ':sample'
+
+include 'library'
+project(':library').projectDir = new File('library')
diff --git a/OnTime_User_live/lib/flexbox-layout/.circleci/config.yml b/OnTime_User_live/lib/flexbox-layout/.circleci/config.yml
new file mode 100755
index 0000000..7666cf3
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/.circleci/config.yml
@@ -0,0 +1,51 @@
+version: 2
+jobs:
+  build:
+    working_directory: ~/code
+    docker:
+      - image: circleci/android:api-29
+    environment:
+      JVM_OPTS: -Xmx3200m
+      MAX_RETRY: 4
+    steps:
+      - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "flexbox/build.gradle" }}
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies
+      - run:
+          name: Set up gcloud service key
+          command: |
+            if [ -n "$GCLOUD_SERVICE_KEY" ]; then echo ${GCLOUD_SERVICE_KEY} | base64 --decode > ${HOME}/client-secret.json ;
+                gcloud config set project ${GCLOUD_PROJECT} ;
+                gcloud auth activate-service-account ${GCLOUD_SERVICE_ACCOUNT} --key-file ${HOME}/client-secret.json ;
+            fi
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "flexbox/build.gradle" }}
+      - run:
+          name: Build apks
+          command: ./gradlew build assembleAndroidTest
+      - run:
+          name: Run Firebase Test Lab
+          command: |
+            if [ -n "$GCLOUD_SERVICE_KEY" ]; then set +e ;
+              counter=0 ;
+              result=1 ;
+              while [ $result != 0 -a $counter -lt $MAX_RETRY ]; do
+                gcloud firebase test android run \
+                  --type instrumentation \
+                  --app demo-playground/build/outputs/apk/debug/demo-playground-debug.apk \
+                  --test flexbox/build/outputs/apk/androidTest/debug/flexbox-debug-androidTest.apk \
+                  --device-ids hammerhead,sailfish \
+                  --os-version-ids 19,21,23,24,25,26 \
+                  --locales en --orientations portrait,landscape \
+                  --results-bucket android-devrel-ci-flexbox \
+                  --timeout 180s ;
+                result=$? ;
+                let counter=counter+1 ;
+              done
+              exit $result ;
+            fi
diff --git a/OnTime_User_live/lib/flexbox-layout/.github/issue_template.md b/OnTime_User_live/lib/flexbox-layout/.github/issue_template.md
new file mode 100755
index 0000000..cc9edf0
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/.github/issue_template.md
@@ -0,0 +1,15 @@
+- [ ] I have searched [existing issues](https://github.com/google/flexbox-layout/issues) and confirmed this is not a duplicate
+
+## Issues and steps to reproduce
+*Please replace this with steps to reproduce your issue.*
+
+## Expected behavior
+*Please describe what you expected would happen.*
+
+## Version of the flexbox library
+*e.g. 0.2.6, 0.3.0-alpha3*
+
+## Link to code
+*Please link to the code we can use to reproduce this issue.*
+*A complete project we can build/run is preferred, if you can't provide one, please show*
+*us relevant code*
diff --git a/OnTime_User_live/lib/flexbox-layout/.github/workflows/gradle-wrapper-validation.yml b/OnTime_User_live/lib/flexbox-layout/.github/workflows/gradle-wrapper-validation.yml
new file mode 100755
index 0000000..405a2b3
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1
diff --git a/OnTime_User_live/lib/flexbox-layout/.gitignore b/OnTime_User_live/lib/flexbox-layout/.gitignore
new file mode 100755
index 0000000..113ffcc
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/.gitignore
@@ -0,0 +1,50 @@
+*.iml
+.gradle
+.idea/
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+!.idea/codeStyleSettings.xml
+.DS_Store
+/build
+/captures
+.vscode/
+
+# Taken from Android.gitignore https://github.com/github/gitignore/blob/master/Android.gitignore
+#
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
diff --git a/OnTime_User_live/lib/flexbox-layout/CONTRIBUTING.md b/OnTime_User_live/lib/flexbox-layout/CONTRIBUTING.md
new file mode 100755
index 0000000..050f92a
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/CONTRIBUTING.md
@@ -0,0 +1,45 @@
+# How to become a contributor and submit your own code
+
+## Contributor License Agreements
+
+We'd love to accept your sample apps and patches! Before we can take them, we
+have to jump a couple of legal hurdles.
+
+Please fill out either the individual or corporate Contributor License Agreement (CLA).
+
+  * If you are an individual writing original source code and you're sure you
+    own the intellectual property, then you'll need to sign an [individual CLA]
+    (https://cla.developers.google.com).
+  * If you work for a company that wants to allow you to contribute your work,
+    then you'll need to sign a [corporate CLA]
+    (https://cla.developers.google.com).
+
+Follow either of the two links above to access the appropriate CLA and
+instructions for how to sign and return it. Once we receive it, we'll be able to
+accept your pull requests.
+
+## Contributing A Patch
+
+1. Submit an issue describing your proposed change to the repo in question.
+1. The repo owner will respond to your issue promptly.
+1. If your proposed change is accepted, and you haven't already done so, sign a
+   Contributor License Agreement (see details above).
+1. Fork the desired repo, develop and test your code changes.
+1. Ensure that your code adheres to the existing style in the sample to which
+   you are contributing. Refer to the
+   [Android Code Style Guide]
+   (https://source.android.com/source/code-style.html) for the
+   recommended coding standards for this organization.
+1. Ensure that your code has an appropriate set of unit tests which all pass.
+1. Submit a pull request.
+
+## Code Style
+
+This repository follows the official Android code style.
+When you send a patch, please try to follow that.
+Here are the example steps to follow:
+
+1. From Android Studio or IntelliJ IDEA, navigate to "Preferences" -> "Editor" -> "Code Style"
+1. Select "Import Scheme" by clicking the gear icon next to the Scheme pull down
+1. Choose <root directory of flexbox-layout>/tool/codeStyleSettings.xml
+1. Create a new scheme by typing a scheme name in the "To" edit box or apply to the current scheme.
diff --git a/OnTime_User_live/lib/flexbox-layout/LICENSE b/OnTime_User_live/lib/flexbox-layout/LICENSE
new file mode 100755
index 0000000..b397cbe
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018 Google LLC
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/OnTime_User_live/lib/flexbox-layout/README.md b/OnTime_User_live/lib/flexbox-layout/README.md
new file mode 100755
index 0000000..85c9057
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/README.md
@@ -0,0 +1,407 @@
+# FlexboxLayout
+[ ![Circle CI](https://circleci.com/gh/google/flexbox-layout.svg?style=shield&circle-token=2a42716dfffab73d73c5ce7ed7b3ee620cfa137b) ](https://circleci.com/gh/google/flexbox-layout/tree/main)
+
+FlexboxLayout is a library project which brings the similar capabilities of
+[CSS Flexible Box Layout Module](https://www.w3.org/TR/css-flexbox-1) to Android.
+
+# Installation
+Add the following dependency to your `build.gradle` file:
+
+```
+dependencies {
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
+}
+```
+
+**Starting from 3.0.0, the groupId is changed to `com.google.android.flexbox` in preparation to uploading the artifacts to google maven.
+You can still download the artifacts from jcenter for the past versions with the prior groupId (`com.google.android`), but migrating the library 3.0.0 is recommended.**
+
+Note that the default values for `alignItems` and `alignContent` for `FlexboxLayout` have been changed from `stretch` to `flex_start` starting from 2.0.0, it may break the existing apps.
+Please make sure to set `stretch` explicitly if you want to apply the behavior of `stretch`.
+
+
+Note that starting from 1.1.0, the library is expeced to use with AndroidX. Please migrate to [AndroidX](https://developer.android.com/jetpack/androidx/migrate) if you use 1.1.0 or above.
+
+Please use 1.0.0 if you haven't migrated to AndroidX.
+
+
+# Usage
+There are two ways of using Flexbox in your layout.
+
+## FlexboxLayout
+The first one is `FlexboxLayout` that extends the `ViewGroup` like `LinearLayout` and `RelativeLayout`.
+You can specify the attributes from a layout XML like:
+```xml
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/textview1"
+        android:layout_width="120dp"
+        android:layout_height="80dp"
+        app:layout_flexBasisPercent="50%"
+        />
+
+    <TextView
+        android:id="@+id/textview2"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        app:layout_alignSelf="center"
+        />
+
+    <TextView
+        android:id="@+id/textview3"
+        android:layout_width="160dp"
+        android:layout_height="80dp"
+        app:layout_alignSelf="flex_end"
+        />
+</com.google.android.flexbox.FlexboxLayout>
+```
+
+Or from code like:
+```java
+FlexboxLayout flexboxLayout = (FlexboxLayout) findViewById(R.id.flexbox_layout);
+flexboxLayout.setFlexDirection(FlexDirection.ROW);
+
+View view = flexboxLayout.getChildAt(0);
+FlexboxLayout.LayoutParams lp = (FlexboxLayout.LayoutParams) view.getLayoutParams();
+lp.setOrder(-1);
+lp.setFlexGrow(2);
+view.setLayoutParams(lp);
+```
+
+## FlexboxLayoutManager (within RecyclerView)
+The second one is `FlexboxLayoutManager` that can be used within `RecyclerView`.
+
+```java
+RecyclerView recyclerView = (RecyclerView) context.findViewById(R.id.recyclerview);
+FlexboxLayoutManager layoutManager = new FlexboxLayoutManager(context);
+layoutManager.setFlexDirection(FlexDirection.COLUMN);
+layoutManager.setJustifyContent(JustifyContent.FLEX_END);
+recyclerView.setLayoutManager(layoutManager);
+```
+
+or for the attributes for the children of the `FlexboxLayoutManager` you can do like:
+
+```java
+mImageView.setImageDrawable(drawable);
+ViewGroup.LayoutParams lp = mImageView.getLayoutParams();
+if (lp instanceof FlexboxLayoutManager.LayoutParams) {
+    FlexboxLayoutManager.LayoutParams flexboxLp = (FlexboxLayoutManager.LayoutParams) lp;
+    flexboxLp.setFlexGrow(1.0f);
+    flexboxLp.setAlignSelf(AlignSelf.FLEX_END);
+}
+```
+
+The advantage of using `FlexboxLayoutManager` is that it recycles the views that go off the screen
+for reuse for the views that are appearing as the user scrolls instead of inflating every individual view,
+which consumes much less memory especially when the number of items contained in the Flexbox container is large.
+
+![FlexboxLayoutManager in action](/assets/flexbox-layoutmanager.gif)
+
+
+## Supported attributes/features comparison
+Due to some characteristics of `RecyclerView`, some Flexbox attributes are not available/not implemented
+to the `FlexboxLayoutManager`.
+Here is a quick overview of the attributes/features comparison between the two implementations.
+
+|Attribute / Feature|FlexboxLayout| FlexboxLayoutManager (RecyclerView)|
+| ------- |:-----------:|:----------------------------------:|
+|flexDirection|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|flexWrap|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png) (except `wrap_reverse`)|
+|justifyContent|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|alignItems|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|alignContent|![Check](/assets/pngs/check_green_small.png)| - |
+|layout_order|![Check](/assets/pngs/check_green_small.png)| - |
+|layout_flexGrow|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_flexShrink|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_alignSelf|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_flexBasisPercent|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_(min/max)Width|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_(min/max)Height|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|layout_wrapBefore|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|Divider|![Check](/assets/pngs/check_green_small.png)|![Check](/assets/pngs/check_green_small.png)|
+|View recycling| - |![Check](/assets/pngs/check_green_small.png)|
+|Scrolling| *1 |![Check](/assets/pngs/check_green_small.png)|
+
+*1 Partially possible by wrapping it with `ScrollView`. But it isn't likely to work with a large set
+   of views inside the layout. Because it doesn't consider view recycling.
+
+# Supported attributes
+
+## Attributes for the FlexboxLayout:
+
+* __flexDirection__
+  * This attribute determines the direction of the main axis (and the cross axis, perpendicular to the main axis). The direction children items are placed inside the Flexbox layout.
+  Possible values are:
+    * row (default)
+    * row_reverse
+    * column
+    * column_reverse
+
+    ![Flex Direction explanation](/assets/flex-direction.gif)
+
+* __flexWrap__
+  * This attribute controls whether the flex container is single-line or multi-line, and the
+  direction of the cross axis. Possible values are:
+    * nowrap (default for FlexboxLayout)
+    * wrap (default for FlexboxLayoutManager)
+    * wrap_reverse (not supported by FlexboxLayoutManager)
+
+    ![Flex Wrap explanation](/assets/flex-wrap.gif)
+
+* __justifyContent__
+  * This attribute controls the alignment along the main axis. Possible values are:
+    * flex_start (default)
+    * flex_end
+    * center
+    * space_between
+    * space_around
+    * space_evenly
+
+    ![Justify Content explanation](/assets/justify-content.gif)
+
+* __alignItems__
+  * This attribute controls the alignment along the cross axis. Possible values are:
+    * flex_start (default for FlexboxLayout)
+    * flex_end
+    * center
+    * baseline
+    * stretch (default for FlexboxLayoutManager)
+
+    ![Align Items explanation](/assets/align-items.gif)
+
+* __alignContent__
+  * This attribute controls the alignment of the flex lines in the flex container. Possible values
+  are:
+    * flex_start (default)
+    * flex_end
+    * center
+    * space_between
+    * space_around
+    * stretch
+
+    ![Align Content explanation](/assets/align-content.gif)
+
+* __showDividerHorizontal__ (one or more of `none | beginning | middle | end`)
+* __dividerDrawableHorizontal__ (reference to a drawable)
+  * Puts horizontal dividers between flex lines (or flex items when flexDirection
+  is set to `column` or `column_rebase`).
+  
+* __showDividerVertical__ (one or more of `none | beginning | middle | end`)
+* __dividerDrawableVertical__ (reference to a drawable)
+  * Puts vertical dividers between flex items (or flex lines when flexDirection
+  is set to `column` or `column_rebase`).
+
+* __showDivider__ (one or more of `none | beginning | middle | end`)
+* __dividerDrawable__ (reference to a drawable)
+  * Shorthand for setting both horizontal and vertical dividers. Note that if used with other attributes
+  (such as `justifyContent="space_around"` or `alignContent="space_between"` ... etc) for putting 
+  spaces between flex lines or flex items, you may see unexpected spaces. Please avoid using these
+  at the same time.
+  
+  Example of putting both vertical and horizontal dividers.
+  
+  `res/drawable/divider.xml`
+  ```xml
+  <shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size
+        android:width="8dp"
+        android:height="12dp" />
+    <solid android:color="#44A444" />
+  </shape> 
+  ```
+  
+  `res/layout/content_main.xml`
+  ```xml
+  <com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:flexWrap="wrap"
+    app:showDivider="beginning|middle"
+    app:dividerDrawable="@drawable/divider" >
+
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="220dp"
+        android:layout_height="80dp"
+        android:text="1" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="120dp"
+        android:layout_height="80dp"
+        android:text="2" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="160dp"
+        android:layout_height="80dp"
+        android:text="3" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:text="4" />
+    <TextView
+        style="@style/FlexItem"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="5" />
+  ```
+  
+  ![Dividers beginning and middle](/assets/divider-beginning-middle.png)
+
+
+## Attributes for the children of a FlexboxLayout
+
+* __layout_order__ (integer)
+  * This attribute can change how the ordering of the children views are laid out.
+  By default, children are displayed and laid out in the same order as they appear in the
+  layout XML. If not specified, `1` is set as a default value.
+
+    ![Order explanation](/assets/layout_order.gif)
+
+* __layout_flexGrow__ (float)
+  * This attribute determines how much this child will grow if positive free space is
+  distributed relative to the rest of other flex items included in the same flex line.
+  If a flex item has a positive `layout_flexGrow` value, the item will take up the remaining
+  space in the flex line. If multiple flex items in the same flex line have positive `layout_flexGrow`
+  values, the remaining free space is distributed depending on the proportion of their declared
+  `layout_flexGrow` value. (Similar to the `layout_weight` attribute in the `LinearLayout`)
+  If not specified, `0` is set as a default value.
+
+    ![Flex Grow explanation](/assets/layout_flexGrow.gif)
+
+* __layout_flexShrink__ (float)
+  * This attribute determines how much this child will shrink if negative free space is
+  distributed relative to the rest of other flex items included in the same flex line.
+  If not specified, `1` is set as a default value.
+
+    ![Flex Shrink explanation](/assets/layout_flexShrink.gif)
+
+* __layout_alignSelf__
+  * This attribute determines the alignment along the cross axis (perpendicular to the
+  main axis). The alignment in the same direction can be determined by the
+  `alignItems` in the parent, but if this is set to other than
+  `auto`, the cross axis alignment is overridden for this child. Possible values are:
+    * auto (default)
+    * flex_start
+    * flex_end
+    * center
+    * baseline
+    * stretch
+
+    ![Align Self explanation](/assets/layout_alignSelf.gif)
+
+* __layout_flexBasisPercent__ (fraction)
+  * The initial flex item length in a fraction format relative to its parent.
+  The initial main size of this child view is trying to be expanded as the specified
+  fraction against the parent main size.
+  If this value is set, the length specified from `layout_width`
+  (or `layout_height`) is overridden by the calculated value from this attribute.
+  This attribute is only effective when the parent's length is definite (MeasureSpec mode is
+  `MeasureSpec.EXACTLY`). The default value is `-1`, which means not set.
+
+    ![Flex basis percent explanation](/assets/layout_flexBasisPercent.gif)
+
+* __layout_minWidth__ / __layout_minHeight__ (dimension)
+  * These attributes impose minimum size constraints for the children of FlexboxLayout.
+  A child view won't shrink less than the value of these attributes (varies based on the
+  `flexDirection` attribute as to which attribute imposes the size constraint along the
+  main axis) regardless of the `layout_flexShrink` attribute.
+
+    ![Min width explanation](/assets/layout_minWidth.gif)
+
+* __layout_maxWidth__ / __layout_maxHeight__ (dimension)
+  * These attributes impose maximum size constraints for the children of FlexboxLayout.
+  A child view won't be expanded more than the value of these attributes (varies based on the
+  `flexDirection` attribute as to which attribute imposes the size constraint along the
+  main axis) regardless of the `layout_flexGrow` attribute.
+
+    ![Max width explanation](/assets/layout_maxWidth.gif)
+
+* __layout_wrapBefore__ (boolean)
+  * This attribute forces a flex line wrapping, the default value is `false`.
+  i.e. if this is set to `true` for a
+  flex item, the item will become the first item of a flex line. (A wrapping happens
+  regardless of the flex items being processed in the previous flex line)
+  This attribute is ignored if the `flex_wrap` attribute is set to `nowrap`.
+  The equivalent attribute isn't defined in the original CSS Flexible Box Module
+  specification, but having this attribute is useful for Android developers. For example, to flatten
+  the layouts when building a grid-like layout or for a situation where developers want
+  to put a new flex line to make a semantic difference from the previous one, etc.
+
+    ![Wrap before explanation](/assets/layout_wrapBefore.gif)
+
+# Others
+
+## Known differences from the original CSS specification
+This library tries to achieve the same capabilities of the original
+[Flexible Box specification](https://www.w3.org/TR/css-flexbox-1) as much as possible,
+but due to some reasons such as the way specifying attributes can't be the same between
+CSS and Android XML, there are some known differences from the original specification.
+
+(1) There is no [flex-flow](https://www.w3.org/TR/css-flexbox-1/#flex-flow-property)
+equivalent attribute
+  * Because `flex-flow` is a shorthand for setting the `flex-direction` and `flex-wrap` properties,
+  specifying two attributes from a single attribute is not practical in Android.
+
+(2) There is no [flex](https://www.w3.org/TR/css-flexbox-1/#flex-property) equivalent attribute
+  * Likewise `flex` is a shorthand for setting the `flex-grow`, `flex-shrink` and `flex-basis`,
+  specifying those attributes from a single attribute is not practical.
+
+(3) `layout_flexBasisPercent` is introduced instead of
+  [flexBasis](https://www.w3.org/TR/css-flexbox-1/#flex-basis-property)
+  * Both `layout_flexBasisPercent` in this library and `flex-basis` property in the CSS are used to
+  determine the initial length of an individual flex item. The `flex-basis` property accepts width
+  values such as `1em`, `10px`, and `content` as strings as well as percentage values such as
+  `10%` and `30%`. `layout_flexBasisPercent` only accepts percentage values.
+  However, specifying initial fixed width values can be done by specifying width (or height) values in
+  layout_width (or layout_height, varies depending on the `flexDirection`). Also, the same
+  effect can be done by specifying "wrap_content" in layout_width (or layout_height) if
+  developers want to achieve the same effect as 'content'. Thus, `layout_flexBasisPercent` only
+  accepts percentage values, which can't be done through layout_width (or layout_height) for
+  simplicity.
+
+(4) `layout_wrapBefore` is introduced.
+  * The equivalent attribute doesn't exist in the CSS Flexible Box Module specification,
+  but as explained above, Android developers will benefit by having this attribute for having
+  more control over when a wrapping happens.
+
+(5) Default values for `alignItems` and `alignContent` are set to `flex_start` instead of `stretch`.
+  * Setting `stretch` for the `alignItems` is expensive because the children of `FlexboxLayout` are measured more than twice. The difference is more obvious when the layout hierarchy is deeply nested.
+
+## Xamarin Binding
+Xamarin binding is now available on [NuGet](https://www.nuget.org/packages/FlexboxLayoutXamarinBindingAndroid/) thanks to [@btripp](https://github.com/btripp)
+
+## Demo apps
+### Flexbox Playground demo app
+The `demo-playground` module works as a playground demo app for trying various values for the supported attributes.
+You can install it by
+```
+./gradlew demo-playground:installDebug
+```
+
+### Cat gallery demo app
+The `demo-cat-gallery` module showcases the usage of the FlexboxLayoutManager inside the RecyclerView
+that handles various sizes of views aligned nicely regardless of the device width like the
+Google Photo app without loading all the images on the memory.
+Thus compared to using the {@link FlexboxLayout}, it's much less likely to abuse the memory,
+which sometimes leads to the OutOfMemoryError.
+```
+./gradlew demo-cat-gallery:installDebug
+```
+
+## How to make contributions
+Please read and follow the steps in [CONTRIBUTING.md](/CONTRIBUTING.md)
+
+## License
+Please see [LICENSE](/LICENSE)
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/align-content.gif b/OnTime_User_live/lib/flexbox-layout/assets/align-content.gif
new file mode 100755
index 0000000..235cb5b
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/align-content.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/align-items.gif b/OnTime_User_live/lib/flexbox-layout/assets/align-items.gif
new file mode 100755
index 0000000..2fca514
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/align-items.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/divider-beginning-middle.png b/OnTime_User_live/lib/flexbox-layout/assets/divider-beginning-middle.png
new file mode 100755
index 0000000..f67560d
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/divider-beginning-middle.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/flex-direction.gif b/OnTime_User_live/lib/flexbox-layout/assets/flex-direction.gif
new file mode 100755
index 0000000..0d556bf
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/flex-direction.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/flex-wrap.gif b/OnTime_User_live/lib/flexbox-layout/assets/flex-wrap.gif
new file mode 100755
index 0000000..352f505
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/flex-wrap.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/flexbox-layoutmanager.gif b/OnTime_User_live/lib/flexbox-layout/assets/flexbox-layoutmanager.gif
new file mode 100755
index 0000000..1df2908
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/flexbox-layoutmanager.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/flexbox-visual.png b/OnTime_User_live/lib/flexbox-layout/assets/flexbox-visual.png
new file mode 100755
index 0000000..40a91e2
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/flexbox-visual.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-full-width.png b/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-full-width.png
new file mode 100755
index 0000000..f30a62e
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-full-width.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-half.png b/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-half.png
new file mode 100755
index 0000000..5cd6dc9
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-half.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-one-fourth.png b/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-one-fourth.png
new file mode 100755
index 0000000..56e83b3
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-one-fourth.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-three-fourth.png b/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-three-fourth.png
new file mode 100755
index 0000000..ae97ac9
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/fluid-grid/nexus9-three-fourth.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/justify-content.gif b/OnTime_User_live/lib/flexbox-layout/assets/justify-content.gif
new file mode 100755
index 0000000..18d3af5
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/justify-content.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/layout_alignSelf.gif b/OnTime_User_live/lib/flexbox-layout/assets/layout_alignSelf.gif
new file mode 100755
index 0000000..c5af6a3
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/layout_alignSelf.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/layout_flexBasisPercent.gif b/OnTime_User_live/lib/flexbox-layout/assets/layout_flexBasisPercent.gif
new file mode 100755
index 0000000..3c92e91
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/layout_flexBasisPercent.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/layout_flexGrow.gif b/OnTime_User_live/lib/flexbox-layout/assets/layout_flexGrow.gif
new file mode 100755
index 0000000..ab730d7
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/layout_flexGrow.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/layout_flexShrink.gif b/OnTime_User_live/lib/flexbox-layout/assets/layout_flexShrink.gif
new file mode 100755
index 0000000..612a96f
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/layout_flexShrink.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/layout_maxWidth.gif b/OnTime_User_live/lib/flexbox-layout/assets/layout_maxWidth.gif
new file mode 100755
index 0000000..c742093
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/layout_maxWidth.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/layout_minWidth.gif b/OnTime_User_live/lib/flexbox-layout/assets/layout_minWidth.gif
new file mode 100755
index 0000000..2c639d5
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/layout_minWidth.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/layout_order.gif b/OnTime_User_live/lib/flexbox-layout/assets/layout_order.gif
new file mode 100755
index 0000000..d37e07d
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/layout_order.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/layout_wrapBefore.gif b/OnTime_User_live/lib/flexbox-layout/assets/layout_wrapBefore.gif
new file mode 100755
index 0000000..9d9af91
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/layout_wrapBefore.gif differ
diff --git a/OnTime_User_live/lib/flexbox-layout/assets/pngs/check_green_small.png b/OnTime_User_live/lib/flexbox-layout/assets/pngs/check_green_small.png
new file mode 100755
index 0000000..f5fbfa9
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/assets/pngs/check_green_small.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/build.gradle b/OnTime_User_live/lib/flexbox-layout/build.gradle
new file mode 100755
index 0000000..9d17521
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/build.gradle
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext {
+        minSdkVersion = 14
+        targetSdkVersion = 30
+        compileSdkVersion = 30
+
+        androidGradlePluginVersion = "4.2.0"
+        androidxAnnotationVersion = "1.2.0"
+        androidxAppCompatVersion = "1.2.0"
+        androidxCoreVersion = "1.3.2"
+        androidxPreferenceVersion = "1.1.1"
+        androidxRecyclerViewVersion = "1.2.0"
+        androidxEspressoVersion = "3.3.0"
+        androidxTestExtVersion = "1.1.2"
+        androidxTestVersion = "1.3.0"
+        junitVersion = "4.13.2"
+        kotlinVersion = "1.4.32"
+        materialVersion = "1.3.0"
+    }
+
+    repositories {
+        jcenter()
+        google()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:$androidGradlePluginVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+        google()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
+
+// This allows to disable pre dexing. If not disabled, it makes each CI build slow
+// See https://circleci.com/docs/android/#disable-pre-dexing-to-improve-build-performance
+//     http://tools.android.com/tech-docs/new-build-system/tips#TOC-Improving-Build-Server-performance
+project.ext.preDexLibs = !project.hasProperty('disablePreDex')
+
+subprojects {
+    project.plugins.whenPluginAdded { plugin ->
+        if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        } else if ("com.android.build.gradle.LibraryPlugin" == plugin.class.name) {
+            project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/build.gradle b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/build.gradle
new file mode 100755
index 0000000..10cd543
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/build.gradle
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        applicationId "com.google.android.flexbox.apps.catgallery"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation project(path: ":flexbox")
+    implementation "androidx.appcompat:appcompat:${rootProject.androidxAppCompatVersion}"
+    implementation "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
+    implementation "com.google.android.material:material:${rootProject.materialVersion}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.kotlinVersion}"
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/proguard-rules.pro b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/proguard-rules.pro
new file mode 100755
index 0000000..312658e
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /usr/local/google/home/thagikura/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/AndroidManifest.xml b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..9badf19
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.google.android.flexbox.apps.catgallery">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatAdapter.kt b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatAdapter.kt
new file mode 100755
index 0000000..11b2930
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatAdapter.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.apps.catgallery
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * Adapter class that handles the data set with the {@link RecyclerView.LayoutManager}
+ */
+internal class CatAdapter : RecyclerView.Adapter<CatViewHolder>() {
+
+    companion object {
+        private val CAT_IMAGE_IDS = intArrayOf(
+                R.drawable.cat_1,
+                R.drawable.cat_2,
+                R.drawable.cat_3,
+                R.drawable.cat_4,
+                R.drawable.cat_5,
+                R.drawable.cat_6,
+                R.drawable.cat_7,
+                R.drawable.cat_8,
+                R.drawable.cat_9,
+                R.drawable.cat_10,
+                R.drawable.cat_11,
+                R.drawable.cat_12,
+                R.drawable.cat_13,
+                R.drawable.cat_14,
+                R.drawable.cat_15,
+                R.drawable.cat_16,
+                R.drawable.cat_17,
+                R.drawable.cat_18,
+                R.drawable.cat_19
+        )
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CatViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.viewholder_cat, parent, false)
+        return CatViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: CatViewHolder, position: Int) {
+        val pos = position % CAT_IMAGE_IDS.size
+        holder.bindTo(CAT_IMAGE_IDS[pos])
+    }
+
+    override fun getItemCount() = CAT_IMAGE_IDS.size * 4
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt
new file mode 100755
index 0000000..1778879
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.apps.catgallery
+
+import android.view.View
+import android.widget.ImageView
+import androidx.annotation.DrawableRes
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * ViewHolder that represents a cat image.
+ */
+internal class CatViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    private val imageView: ImageView = itemView.findViewById(R.id.imageview)
+
+    internal fun bindTo(@DrawableRes drawableRes: Int) {
+        imageView.setImageResource(drawableRes)
+        val lp = imageView.layoutParams
+        if (lp is FlexboxLayoutManager.LayoutParams) {
+            lp.flexGrow = 1f
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt
new file mode 100755
index 0000000..bbf1e0b
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.apps.catgallery
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * Launcher Activity for the cat gallery demo app that demonstrates the usage of the
+ * {@link FlexboxLayoutManager} that handles various sizes of views aligned nicely regardless of
+ * the device width like the Google Photo app without loading all the images on the memory.
+ * Thus compared to using the {@link FlexboxLayout}, it's much less likely to abuse the memory,
+ * which some times leads to the OutOfMemoryError.
+ */
+class MainActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val toolbar: Toolbar = findViewById(R.id.toolbar)
+        setSupportActionBar(toolbar)
+
+        val flexboxLayoutManager = FlexboxLayoutManager(this).apply {
+            flexWrap = FlexWrap.WRAP
+            flexDirection = FlexDirection.ROW
+            alignItems = AlignItems.STRETCH
+        }
+
+        val recyclerView: RecyclerView = findViewById(R.id.recyclerview)
+        recyclerView.apply {
+            layoutManager = flexboxLayoutManager
+            adapter = CatAdapter()
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_1.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_1.jpg
new file mode 100755
index 0000000..bf23d09
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_1.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_10.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_10.jpg
new file mode 100755
index 0000000..f030ea7
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_10.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_11.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_11.jpg
new file mode 100755
index 0000000..fa1e644
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_11.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_12.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_12.jpg
new file mode 100755
index 0000000..a0c5f5d
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_12.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_13.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_13.jpg
new file mode 100755
index 0000000..4679ffb
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_13.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_14.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_14.jpg
new file mode 100755
index 0000000..13e7aab
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_14.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_15.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_15.jpg
new file mode 100755
index 0000000..31cc4a1
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_15.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_16.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_16.jpg
new file mode 100755
index 0000000..1af0ec8
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_16.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_17.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_17.jpg
new file mode 100755
index 0000000..a3bcfe9
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_17.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_18.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_18.jpg
new file mode 100755
index 0000000..b35a982
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_18.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_19.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_19.jpg
new file mode 100755
index 0000000..74fa74c
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_19.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_2.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_2.jpg
new file mode 100755
index 0000000..e248def
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_2.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_3.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_3.jpg
new file mode 100755
index 0000000..ecb4452
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_3.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_4.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_4.jpg
new file mode 100755
index 0000000..b43bb2d
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_4.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_5.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_5.jpg
new file mode 100755
index 0000000..9efac65
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_5.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_6.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_6.jpg
new file mode 100755
index 0000000..ae6e72a
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_6.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_7.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_7.jpg
new file mode 100755
index 0000000..7a1680a
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_7.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_8.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_8.jpg
new file mode 100755
index 0000000..86d7347
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_8.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_9.jpg b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_9.jpg
new file mode 100755
index 0000000..8d4f7be
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_9.jpg differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/activity_main.xml b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..e80b356
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/activity_main.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="com.google.android.flexbox.apps.catgallery.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/app_bar_height"
+        android:fitsSystemWindows="true"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/toolbar_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true"
+            app:contentScrim="?attr/colorPrimary"
+            app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:layout_collapseMode="pin"
+                app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/content_main"/>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/content_main.xml b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/content_main.xml
new file mode 100755
index 0000000..316888f
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/content_main.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    android:id="@+id/recyclerview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/viewholder_cat.xml b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/viewholder_cat.xml
new file mode 100755
index 0000000..7426446
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/viewholder_cat.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/imageview"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:scaleType="centerCrop"
+    android:layout_margin="1dp"
+    android:contentDescription="@string/content_description_cat_view_holder"/>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..21141fe
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..ee878a6
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..47e7af4
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..fb48540
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..a919b0a
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values-v21/styles.xml b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..4ec0e24
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values-v21/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/colors.xml b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/colors.xml
new file mode 100755
index 0000000..b45d91a
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/dimens.xml b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..bac3851
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/dimens.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <dimen name="app_bar_height">180dp</dimen>
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/strings.xml b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/strings.xml
new file mode 100755
index 0000000..bac6179
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <string name="app_name">Cat Gallery</string>
+    <string name="content_description_cat_view_holder">Cat image</string>
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/styles.xml b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/styles.xml
new file mode 100755
index 0000000..6334ac5
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/styles.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
+
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/build.gradle b/OnTime_User_live/lib/flexbox-layout/demo-playground/build.gradle
new file mode 100755
index 0000000..ad350da
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/build.gradle
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        applicationId "com.google.android.apps.flexbox"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation project(":flexbox")
+    implementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
+    implementation "androidx.appcompat:appcompat:${rootProject.androidxAppCompatVersion}"
+    implementation "androidx.preference:preference:${rootProject.androidxPreferenceVersion}"
+    implementation "com.google.android.material:material:${rootProject.materialVersion}"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+
+    testImplementation "junit:junit:${rootProject.ext.junitVersion}"
+
+    androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
+    androidTestImplementation "androidx.test:runner:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test:rules:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test.espresso:espresso-core:${rootProject.androidxEspressoVersion}"
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/proguard-rules.pro b/OnTime_User_live/lib/flexbox-layout/demo-playground/proguard-rules.pro
new file mode 100755
index 0000000..6ca2aba
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/proguard-rules.pro
@@ -0,0 +1,33 @@
+#
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt
new file mode 100755
index 0000000..6a2d169
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.apps.flexbox.test
+
+import android.content.pm.ActivityInfo
+import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.RadioGroup
+import android.widget.Spinner
+import android.widget.TextView
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import com.google.android.apps.flexbox.R
+import com.google.android.flexbox.*
+import com.google.android.material.navigation.NavigationView
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.core.Is.`is`
+import org.junit.Assert.*
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [MainActivity].
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class MainActivityTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(MainActivity::class.java)
+
+    @Test
+    @FlakyTest
+    fun testAddFlexItem() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val beforeCount = flexboxLayout.childCount
+        onView(withId(R.id.add_fab)).perform(click())
+
+        assertThat(flexboxLayout.childCount, `is`(beforeCount + 1))
+    }
+
+    @Test
+    @FlakyTest
+    fun testRemoveFlexItem() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val beforeCount = flexboxLayout.childCount
+        onView(withId(R.id.remove_fab)).perform(click())
+
+        assertThat(flexboxLayout.childCount, `is`(beforeCount - 1))
+    }
+
+    @Test
+    @FlakyTest
+    fun testConfigurationChange() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.add_fab)).perform(click())
+        onView(withId(R.id.add_fab)).perform(click())
+        onView(withId(R.id.add_fab)).perform(click())
+        val beforeCount = flexboxLayout.childCount
+
+        activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Verify the flex items are restored across the configuration change.
+        assertThat(flexboxLayout.childCount, `is`(beforeCount))
+    }
+
+    @Test
+    @FlakyTest
+    fun testFlexDirectionSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_flex_direction).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val columnPosition = spinnerAdapter.getPosition(activity.getString(R.string.column))
+        activity.runOnUiThread { spinner.setSelection(columnPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val rowReversePosition = spinnerAdapter.getPosition(activity.getString(R.string.row_reverse))
+        activity.runOnUiThread { spinner.setSelection(rowReversePosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+    }
+
+    @Test
+    @FlakyTest
+    fun testFlexWrapSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_flex_wrap).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val wrapReversePosition = spinnerAdapter.getPosition(activity.getString(R.string.wrap_reverse))
+        activity.runOnUiThread { spinner.setSelection(wrapReversePosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+
+        val noWrapPosition = spinnerAdapter.getPosition(activity.getString(R.string.nowrap))
+        activity.runOnUiThread { spinner.setSelection(noWrapPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+    }
+
+    @Test
+    @FlakyTest
+    fun testJustifyContentSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<View>(R.id.nav_view) as NavigationView
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_justify_content).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val spaceBetweenPosition = spinnerAdapter.getPosition(activity.getString(R.string.space_between))
+        activity.runOnUiThread { spinner.setSelection(spaceBetweenPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        val centerPosition = spinnerAdapter.getPosition(activity.getString(R.string.center))
+        activity.runOnUiThread { spinner.setSelection(centerPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+    }
+
+    @Test
+    @FlakyTest
+    fun testAlignItemsSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_align_items).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val baselinePosition = spinnerAdapter.getPosition(activity.getString(R.string.baseline))
+        activity.runOnUiThread { spinner.setSelection(baselinePosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.BASELINE))
+
+        val flexEndPosition = spinnerAdapter.getPosition(activity.getString(R.string.flex_end))
+        activity.runOnUiThread { spinner.setSelection(flexEndPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+    }
+
+    @Test
+    @FlakyTest
+    fun testAlignContentSpinner() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        val menu = navigationView.menu
+        val spinner = menu.findItem(R.id.menu_item_align_content).actionView as Spinner
+        val spinnerAdapter = spinner.adapter as ArrayAdapter<CharSequence>
+
+        val spaceAroundPosition = spinnerAdapter.getPosition(activity.getString(R.string.space_around))
+        activity.runOnUiThread { spinner.setSelection(spaceAroundPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+
+        val stretchPosition = spinnerAdapter.getPosition(activity.getString(R.string.stretch))
+        activity.runOnUiThread { spinner.setSelection(stretchPosition) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeOrder() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_order)).perform(replaceText("3"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = flexboxLayout.getReorderedChildAt(0) as TextView
+        val second = flexboxLayout.getReorderedChildAt(1) as TextView
+        val third = flexboxLayout.getReorderedChildAt(2) as TextView
+
+        assertThat(first.text.toString(), `is`("2"))
+        assertThat(second.text.toString(), `is`("3"))
+        assertThat(third.text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeFlexGrow() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_flex_grow)).perform(replaceText("1"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = activity.findViewById<View>(R.id.textview1) as TextView
+        val second = activity.findViewById<View>(R.id.textview2) as TextView
+        val third = activity.findViewById<View>(R.id.textview3) as TextView
+        assertNotNull(first)
+        assertNotNull(second)
+        assertNotNull(third)
+
+        assertThat(first.width, `is`(flexboxLayout.width - second.width - third.width))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeFlexGrowFloat() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_flex_grow)).perform(replaceText("1.0"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = activity.findViewById<View>(R.id.textview1) as TextView
+        val second = activity.findViewById<View>(R.id.textview2) as TextView
+        val third = activity.findViewById<View>(R.id.textview3) as TextView
+        assertNotNull(first)
+        assertNotNull(second)
+        assertNotNull(third)
+
+        assertThat(first.width, `is`(flexboxLayout.width - second.width - third.width))
+    }
+
+    @Test
+    @FlakyTest
+    fun testEditFragment_changeFlexBasisPercent() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+        assertNotNull(flexboxLayout)
+        onView(withId(R.id.textview1)).perform(click())
+        onView(withId(R.id.edit_text_flex_basis_percent))
+                .perform(replaceText("50"), closeSoftKeyboard())
+        onView(withId(R.id.button_ok)).perform(click())
+        val first = activity.findViewById<TextView>(R.id.textview1)
+        val second = activity.findViewById<TextView>(R.id.textview2)
+        val third = activity.findViewById<TextView>(R.id.textview3)
+        assertNotNull(first)
+        assertNotNull(second)
+        assertNotNull(third)
+
+        assertTrue(first.width - 1 <= flexboxLayout.width / 2 || flexboxLayout.width / 2 <= first.width + 1)
+    }
+
+    @Test
+    @FlakyTest
+    fun testSwitchRecyclerViewFragment() {
+        val activity = activityRule.activity
+        val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+        assertNotNull(flexboxLayout)
+        val navigationView = activity.findViewById<NavigationView>(R.id.nav_view)
+        assertNotNull(navigationView)
+        assertNull(activity.findViewById(R.id.recyclerview))
+        assertNotNull(activity.findViewById(R.id.flexbox_layout))
+
+        val radioGroup = navigationView.getHeaderView(0)
+                .findViewById<RadioGroup>(R.id.radiogroup_container_implementation)
+        activity.runOnUiThread { radioGroup.check(R.id.radiobutton_recyclerview) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertNotNull(activity.findViewById(R.id.recyclerview))
+        assertNull(activity.findViewById(R.id.flexbox_layout))
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/AndroidManifest.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..1bb3c9a
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.google.android.apps.flexbox">
+
+    <uses-sdk tools:overrideLibrary="android.support.v14.preference" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name="com.google.android.flexbox.MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="com.google.android.flexbox.SettingsActivity" />
+    </application>
+
+</manifest>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/Extensions.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/Extensions.kt
new file mode 100755
index 0000000..7f16a7e
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/Extensions.kt
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Context
+
+/**
+ * Convert pixel to dp. Preserve the negative value as it's used for representing
+ * MATCH_PARENT(-1) and WRAP_CONTENT(-2).
+ * Ignore the round error that might happen in dividing the pixel by the density.
+ *
+ * @param pixel   the value in pixel
+ *
+ * @return the converted value in dp
+ */
+fun Context.pixelToDp(pixel: Int): Int {
+    val displayMetrics = this.resources.displayMetrics
+    return if (pixel < 0) pixel else Math.round(pixel / displayMetrics.density)
+}
+
+/**
+ * Convert dp to pixel. Preserve the negative value as it's used for representing
+ * MATCH_PARENT(-1) and WRAP_CONTENT(-2).
+ *
+ * @param dp      the value in dp
+ *
+ * @return the converted value in pixel
+ */
+fun Context.dpToPixel(dp: Int): Int {
+    val displayMetrics = this.resources.displayMetrics
+    return if (dp < 0) dp else Math.round(dp * displayMetrics.density)
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt
new file mode 100755
index 0000000..26b8330
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.apps.flexbox.R
+
+/**
+ * [RecyclerView.Adapter] implementation for [FlexItemViewHolder].
+ */
+internal class FlexItemAdapter(private val activity: AppCompatActivity,
+                               private val flexContainer: FlexContainer)
+    : RecyclerView.Adapter<FlexItemViewHolder>() {
+
+    private val layoutParams = mutableListOf<FlexboxLayoutManager.LayoutParams>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FlexItemViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.viewholder_flex_item, parent, false)
+
+        return FlexItemViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: FlexItemViewHolder, position: Int) {
+        val adapterPosition = holder.adapterPosition
+        // TODO: More optimized set the click listener inside the view holder
+        holder.itemView.setOnClickListener(FlexItemClickListener(activity,
+                FlexItemChangedListenerImplRecyclerView(flexContainer, this),
+                adapterPosition))
+        holder.bindTo(layoutParams[position])
+    }
+
+    fun addItem(lp: FlexboxLayoutManager.LayoutParams) {
+        layoutParams.add(lp)
+        notifyItemInserted(layoutParams.size - 1)
+    }
+
+    fun removeItem(position: Int) {
+        if (position < 0 || position >= layoutParams.size) {
+            return
+        }
+        layoutParams.removeAt(position)
+        notifyItemRemoved(layoutParams.size)
+        notifyItemRangeChanged(position, layoutParams.size)
+    }
+
+    val items get() = layoutParams
+
+    override fun getItemCount() = layoutParams.size
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListener.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListener.kt
new file mode 100755
index 0000000..979cc2c
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListener.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+/**
+ * A listener that listens to the change of a flex item
+ */
+internal interface FlexItemChangedListener {
+
+    fun onFlexItemChanged(flexItem: FlexItem, viewIndex: Int)
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImpl.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImpl.kt
new file mode 100755
index 0000000..9e25dfc
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImpl.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.ViewGroup
+
+/**
+ * Default implementation for the [FlexItemChangedListener].
+ */
+internal class FlexItemChangedListenerImpl(private val flexContainer: FlexContainer) : FlexItemChangedListener {
+
+    override fun onFlexItemChanged(flexItem: FlexItem, viewIndex: Int) {
+        val view = flexContainer.getFlexItemAt(viewIndex)
+        view.layoutParams = flexItem as ViewGroup.LayoutParams
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt
new file mode 100755
index 0000000..acedf7d
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * Implementation for the [FlexItemChangedListener].
+ * It expects RecyclerView as the underlying flex container implementation.
+ */
+internal class FlexItemChangedListenerImplRecyclerView(private val flexContainer: FlexContainer,
+                                              private val adapter: RecyclerView.Adapter<*>) : FlexItemChangedListener {
+
+    override fun onFlexItemChanged(flexItem: FlexItem, viewIndex: Int) {
+        val view = flexContainer.getFlexItemAt(viewIndex)
+        view.layoutParams = flexItem as ViewGroup.LayoutParams
+        adapter.notifyDataSetChanged()
+        // TODO: An Exception is thrown if notifyItemChanged(int) is used.
+        // Investigate that, but using LinearLayoutManager also produces the same Exception
+        // java.lang.IllegalArgumentException: Called attach on a child which is not detached:
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt
new file mode 100755
index 0000000..6ba866b
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+
+/**
+ * Implementation of the [android.view.View.OnClickListener] when a flex item is clicked in
+ * the Flexbox Playground demo app.
+ */
+internal class FlexItemClickListener(private val activity: AppCompatActivity, private val flexItemChangedListener: FlexItemChangedListener,
+                                     private val viewIndex: Int) : View.OnClickListener {
+
+    override fun onClick(v: View) =
+            FlexItemEditFragment.newInstance(v.layoutParams as FlexItem, viewIndex).apply {
+                setFlexItemChangedListener(flexItemChangedListener)
+            }.show(activity.supportFragmentManager, EDIT_DIALOG_TAG)
+
+    companion object {
+
+        private const val EDIT_DIALOG_TAG = "edit_dialog_tag"
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt
new file mode 100755
index 0000000..5b59832
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt
@@ -0,0 +1,369 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Context
+import android.os.Build
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
+import android.widget.*
+import androidx.fragment.app.DialogFragment
+import com.google.android.apps.flexbox.R
+import com.google.android.flexbox.validators.*
+import com.google.android.material.textfield.TextInputLayout
+
+/**
+ * DialogFragment that changes the properties for a flex item.
+ */
+internal class FlexItemEditFragment : DialogFragment() {
+
+    private lateinit var alignSelfAuto: String
+
+    private lateinit var alignSelfFlexStart: String
+
+    private lateinit var alignSelfFlexEnd: String
+
+    private lateinit var alignSelfCenter: String
+
+    private lateinit var alignSelfBaseline: String
+
+    private lateinit var alignSelfStretch: String
+
+    private var viewIndex: Int = 0
+
+    private lateinit var flexItem: FlexItem
+
+    /**
+     * Instance of a [FlexItem] being edited. At first it's created as another instance from
+     * the [flexItem] because otherwise changes before clicking the ok button will be
+     * reflected if the [flexItem] is changed directly.
+     */
+    private lateinit var flexItemInEdit: FlexItem
+
+    private var flexItemChangedListener: FlexItemChangedListener? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            setStyle(STYLE_NORMAL, android.R.style.Theme_Material_Light_Dialog)
+        } else {
+            setStyle(STYLE_NORMAL, android.R.style.Theme_Dialog)
+        }
+        arguments?.let {
+            flexItem = it.getParcelable(FLEX_ITEM_KEY)!!
+            viewIndex = it.getInt(VIEW_INDEX_KEY)
+        }
+        flexItemInEdit = createNewFlexItem(flexItem)
+
+        activity?.let {
+            alignSelfAuto = it.getString(R.string.auto)
+            alignSelfFlexStart = it.getString(R.string.flex_start)
+            alignSelfFlexEnd = it.getString(R.string.flex_end)
+            alignSelfCenter = it.getString(R.string.center)
+            alignSelfBaseline = it.getString(R.string.baseline)
+            alignSelfStretch = it.getString(R.string.stretch)
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        val view = inflater.inflate(R.layout.fragment_flex_item_edit, container, false)
+        dialog?.setTitle((viewIndex + 1).toString())
+
+        val context = activity ?: return view
+        val orderTextInput: TextInputLayout = view.findViewById(R.id.input_layout_order)
+        val orderEdit: EditText = view.findViewById(R.id.edit_text_order)
+        orderEdit.setText(flexItem.order.toString())
+        orderEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, orderTextInput, IntegerInputValidator(),
+                        R.string.must_be_integer))
+        if (flexItem is FlexboxLayoutManager.LayoutParams) {
+            // Order is not enabled in FlexboxLayoutManager
+            orderEdit.isEnabled = false
+        }
+
+        val flexGrowInput: TextInputLayout = view .findViewById(R.id.input_layout_flex_grow)
+        val flexGrowEdit: EditText = view.findViewById(R.id.edit_text_flex_grow)
+        flexGrowEdit.setText(flexItem.flexGrow.toString())
+        flexGrowEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, flexGrowInput, NonNegativeDecimalInputValidator(),
+                        R.string.must_be_non_negative_float))
+
+        val flexShrinkInput: TextInputLayout = view.findViewById(R.id.input_layout_flex_shrink)
+        val flexShrinkEdit: EditText = view.findViewById(R.id.edit_text_flex_shrink)
+        flexShrinkEdit.setText(flexItem.flexShrink.toString())
+        flexShrinkEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, flexShrinkInput, NonNegativeDecimalInputValidator(),
+                        R.string.must_be_non_negative_float))
+
+        val flexBasisPercentInput: TextInputLayout =
+                view.findViewById(R.id.input_layout_flex_basis_percent)
+        val flexBasisPercentEdit: EditText = view.findViewById(R.id.edit_text_flex_basis_percent)
+        if (flexItem.flexBasisPercent != FlexboxLayout.LayoutParams.FLEX_BASIS_PERCENT_DEFAULT) {
+            flexBasisPercentEdit
+                    .setText(Math.round(flexItem.flexBasisPercent * 100).toString())
+        } else {
+            flexBasisPercentEdit.setText(flexItem.flexBasisPercent.toInt().toString())
+        }
+        flexBasisPercentEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, flexBasisPercentInput, FlexBasisPercentInputValidator(),
+                        R.string.must_be_minus_one_or_non_negative_integer))
+
+        val widthInput: TextInputLayout = view.findViewById(R.id.input_layout_width)
+        val widthEdit: EditText = view.findViewById(R.id.edit_text_width)
+        widthEdit.setText(context.pixelToDp(flexItem.width).toString())
+        widthEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, widthInput, DimensionInputValidator(),
+                        R.string.must_be_minus_one_or_minus_two_or_non_negative_integer))
+
+        val heightInput: TextInputLayout = view.findViewById(R.id.input_layout_height)
+        val heightEdit: EditText= view.findViewById(R.id.edit_text_height)
+        heightEdit.setText(context.pixelToDp(flexItem.height).toString())
+        heightEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, heightInput, DimensionInputValidator(),
+                        R.string.must_be_minus_one_or_minus_two_or_non_negative_integer))
+
+        val minWidthInput: TextInputLayout = view.findViewById(R.id.input_layout_min_width)
+        val minWidthEdit: EditText = view.findViewById(R.id.edit_text_min_width)
+        minWidthEdit.setText(context.pixelToDp(flexItem.minWidth).toString())
+        minWidthEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, minWidthInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        val minHeightInput: TextInputLayout = view.findViewById(R.id.input_layout_min_height)
+        val minHeightEdit: EditText = view.findViewById(R.id.edit_text_min_height)
+        minHeightEdit.setText(context.pixelToDp(flexItem.minHeight).toString())
+        minHeightEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, minHeightInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        val maxWidthInput: TextInputLayout = view.findViewById(R.id.input_layout_max_width)
+        val maxWidthEdit: EditText = view.findViewById(R.id.edit_text_max_width)
+        maxWidthEdit.setText(context.pixelToDp(flexItem.maxWidth).toString())
+        maxWidthEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, maxWidthInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        val maxHeightInput: TextInputLayout = view.findViewById(R.id.input_layout_max_height)
+        val maxHeightEdit: EditText = view.findViewById(R.id.edit_text_max_height)
+        maxHeightEdit.setText(context.pixelToDp(flexItem.maxHeight).toString())
+        maxHeightEdit.addTextChangedListener(
+                FlexEditTextWatcher(context, maxHeightInput, FixedDimensionInputValidator(),
+                        R.string.must_be_non_negative_integer))
+
+        setNextFocusesOnEnterDown(orderEdit, flexGrowEdit, flexShrinkEdit, flexBasisPercentEdit,
+                widthEdit, heightEdit, minWidthEdit, minHeightEdit, maxWidthEdit, maxHeightEdit)
+
+        val alignSelfSpinner: Spinner = view.findViewById(R.id.spinner_align_self)
+        val arrayAdapter = ArrayAdapter.createFromResource(requireActivity(),
+                R.array.array_align_self, R.layout.spinner_item)
+        alignSelfSpinner.adapter = arrayAdapter
+        alignSelfSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                        id: Long) {
+                flexItemInEdit.alignSelf = when (parent.getItemAtPosition(position).toString()) {
+                    alignSelfAuto -> AlignSelf.AUTO
+                    alignSelfFlexStart -> AlignItems.FLEX_START
+                    alignSelfFlexEnd -> AlignItems.FLEX_END
+                    alignSelfCenter -> AlignItems.CENTER
+                    alignSelfBaseline -> AlignItems.BASELINE
+                    alignSelfStretch -> AlignItems.STRETCH
+                    else -> return
+                }
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>) {
+                // No op
+            }
+        }
+
+        val wrapBeforeCheckBox: CheckBox = view.findViewById(R.id.checkbox_wrap_before)
+        wrapBeforeCheckBox.isChecked = flexItem.isWrapBefore
+        wrapBeforeCheckBox.setOnCheckedChangeListener { _, isChecked ->
+            flexItemInEdit.isWrapBefore = isChecked }
+        val alignSelfPosition = arrayAdapter
+                .getPosition(alignSelfAsString(flexItem.alignSelf))
+        alignSelfSpinner.setSelection(alignSelfPosition)
+
+        view.findViewById<Button>(R.id.button_cancel).setOnClickListener {
+            copyFlexItemValues(flexItem, flexItemInEdit)
+            dismiss()
+        }
+        val okButton: Button = view.findViewById(R.id.button_ok)
+        okButton.setOnClickListener(View.OnClickListener {
+            if (orderTextInput.isErrorEnabled || flexGrowInput.isErrorEnabled ||
+                    flexBasisPercentInput.isErrorEnabled || widthInput.isErrorEnabled ||
+                    heightInput.isErrorEnabled || minWidthInput.isErrorEnabled ||
+                    minHeightInput.isErrorEnabled || maxWidthInput.isErrorEnabled ||
+                    maxHeightInput.isErrorEnabled) {
+                Toast.makeText(activity, R.string.invalid_values_exist, Toast.LENGTH_SHORT)
+                        .show()
+                return@OnClickListener
+            }
+            if (flexItemChangedListener != null) {
+                copyFlexItemValues(flexItemInEdit, flexItem)
+                flexItemChangedListener!!.onFlexItemChanged(flexItem, viewIndex)
+            }
+            dismiss()
+        })
+        return view
+    }
+
+    fun setFlexItemChangedListener(flexItemChangedListener: FlexItemChangedListener) {
+        this.flexItemChangedListener = flexItemChangedListener
+    }
+
+    private fun setNextFocusesOnEnterDown(vararg textViews: TextView) {
+        // This can be done by setting android:nextFocus* as in
+        // https://developer.android.com/training/keyboard-input/navigation.html
+        // But it requires API level 11 as a minimum sdk version. To support the lower level
+        // devices,
+        // doing it programmatically.
+        for (i in textViews.indices) {
+            textViews[i].setOnEditorActionListener { v, actionId, event ->
+                if (actionId == EditorInfo.IME_ACTION_NEXT ||
+                        actionId == EditorInfo.IME_ACTION_DONE ||
+                        actionId == EditorInfo.IME_NULL
+                                && event.action == KeyEvent.ACTION_DOWN
+                                && event.keyCode == KeyEvent.KEYCODE_ENTER) {
+                    if (i + 1 < textViews.size) {
+                        textViews[i + 1].requestFocus()
+                    } else if (i == textViews.size - 1) {
+                        val inputMethodManager = activity?.getSystemService(
+                                Context.INPUT_METHOD_SERVICE) as InputMethodManager?
+                        inputMethodManager?.hideSoftInputFromWindow(v.windowToken, 0)
+                    }
+                }
+                true
+            }
+
+            // Suppress the key focus change by KeyEvent.ACTION_UP of the enter key
+            textViews[i].setOnKeyListener { _, keyCode, event -> keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP }
+        }
+
+    }
+
+    private fun alignSelfAsString(alignSelf: Int): String {
+        return when (alignSelf) {
+            AlignSelf.AUTO -> alignSelfAuto
+            AlignItems.FLEX_START -> alignSelfFlexStart
+            AlignItems.FLEX_END -> alignSelfFlexEnd
+            AlignItems.CENTER -> alignSelfCenter
+            AlignItems.BASELINE -> alignSelfBaseline
+            AlignItems.STRETCH -> alignSelfStretch
+            else -> alignSelfAuto
+        }
+    }
+
+    private inner class FlexEditTextWatcher internal constructor(val context: Context,
+                                                                 val textInputLayout: TextInputLayout,
+                                                                 val inputValidator: InputValidator,
+                                                                 val errorMessageId: Int) : TextWatcher {
+
+        override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
+            // No op
+        }
+
+        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+            if (inputValidator.isValidInput(s)) {
+                textInputLayout.isErrorEnabled = false
+                textInputLayout.error = ""
+            } else {
+                textInputLayout.isErrorEnabled = true
+                textInputLayout.error = activity?.resources?.getString(errorMessageId)
+            }
+        }
+
+        override fun afterTextChanged(editable: Editable) {
+            if (textInputLayout.isErrorEnabled || editable.isEmpty() ||
+                    !inputValidator.isValidInput(editable.toString())) {
+                return
+            }
+            val value = editable.toString().toFloatOrNull() ?: return
+            when (textInputLayout.id) {
+                R.id.input_layout_order -> if (flexItemInEdit !is FlexboxLayoutManager.LayoutParams) {
+                    flexItemInEdit.order = value.toInt()
+                } else return
+                R.id.input_layout_flex_grow -> flexItemInEdit.flexGrow = value
+                R.id.input_layout_flex_shrink -> flexItemInEdit.flexShrink = value
+                R.id.input_layout_width -> flexItemInEdit.width = context.dpToPixel(value.toInt())
+                R.id.input_layout_height -> flexItemInEdit.height = context.dpToPixel(value.toInt())
+                R.id.input_layout_flex_basis_percent -> if (value != FlexboxLayout.LayoutParams.FLEX_BASIS_PERCENT_DEFAULT) {
+                    flexItemInEdit.flexBasisPercent = value.toInt() / 100.0f
+                } else {
+                    flexItemInEdit.flexBasisPercent = FlexItem.FLEX_BASIS_PERCENT_DEFAULT
+                }
+                R.id.input_layout_min_width -> flexItemInEdit.minWidth = context.dpToPixel(value.toInt())
+                R.id.input_layout_min_height -> flexItemInEdit.minHeight = context.dpToPixel(value.toInt())
+                R.id.input_layout_max_width -> flexItemInEdit.maxWidth = context.dpToPixel(value.toInt())
+                R.id.input_layout_max_height -> flexItemInEdit.maxHeight = context.dpToPixel(value.toInt())
+                else -> return
+            }
+        }
+    }
+
+    private fun createNewFlexItem(item: FlexItem): FlexItem {
+        if (item is FlexboxLayout.LayoutParams) {
+            val newItem = FlexboxLayout.LayoutParams(item.getWidth(), item.getHeight())
+            copyFlexItemValues(item, newItem)
+            return newItem
+        } else if (item is FlexboxLayoutManager.LayoutParams) {
+            val newItem = FlexboxLayoutManager.LayoutParams(item.getWidth(), item.getHeight())
+            copyFlexItemValues(item, newItem)
+            return newItem
+        }
+        throw IllegalArgumentException("Unknown FlexItem: $item")
+    }
+
+    private fun copyFlexItemValues(from: FlexItem, to: FlexItem) {
+        if (from !is FlexboxLayoutManager.LayoutParams) {
+            to.order = from.order
+        }
+        to.flexGrow = from.flexGrow
+        to.flexShrink = from.flexShrink
+        to.flexBasisPercent = from.flexBasisPercent
+        to.height = from.height
+        to.width = from.width
+        to.maxHeight = from.maxHeight
+        to.minHeight = from.minHeight
+        to.maxWidth = from.maxWidth
+        to.minWidth = from.minWidth
+        to.alignSelf = from.alignSelf
+        to.isWrapBefore = from.isWrapBefore
+    }
+
+    companion object {
+
+        private const val FLEX_ITEM_KEY = "flex_item"
+
+        private const val VIEW_INDEX_KEY = "view_index"
+
+        fun newInstance(flexItem: FlexItem, viewIndex: Int) = FlexItemEditFragment().apply {
+            arguments = Bundle().apply {
+                putParcelable(FLEX_ITEM_KEY, flexItem)
+                putInt(VIEW_INDEX_KEY, viewIndex)
+            }
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt
new file mode 100755
index 0000000..1e9f4a2
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.Gravity
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.apps.flexbox.R
+
+/**
+ * ViewHolder implementation for a flex item.
+ */
+class FlexItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    private val textView: TextView = itemView.findViewById(R.id.textview)
+
+    fun bindTo(params: RecyclerView.LayoutParams) {
+        val adapterPosition = adapterPosition
+        textView.apply {
+            text = (adapterPosition + 1).toString()
+            setBackgroundResource(R.drawable.flex_item_background)
+            gravity = Gravity.CENTER
+            layoutParams = params
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt
new file mode 100755
index 0000000..146299f
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Context
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import com.google.android.apps.flexbox.R
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import java.util.*
+
+/**
+ * Fragment that contains the [FlexboxLayout] as the playground.
+ */
+class FlexboxLayoutFragment : Fragment() {
+
+    private lateinit var flexContainer: FlexboxLayout
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_flexboxlayout, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val activity = activity as MainActivity
+        flexContainer = view.findViewById(R.id.flexbox_layout)
+
+        val fragmentHelper = FragmentHelper(activity, flexContainer)
+        fragmentHelper.initializeViews()
+        if (savedInstanceState != null) {
+            val flexItems = savedInstanceState
+                    .getParcelableArrayList<FlexItem>(FLEX_ITEMS_KEY)!!
+            flexContainer.removeAllViews()
+            for (i in flexItems.indices) {
+                val flexItem = flexItems[i]
+                val textView = createBaseFlexItemTextView(activity, i)
+                textView.layoutParams = flexItem as FlexboxLayout.LayoutParams
+                flexContainer.addView(textView)
+            }
+        }
+        for (i in 0 until flexContainer.flexItemCount) {
+            flexContainer.getFlexItemAt(i).setOnClickListener(
+                    FlexItemClickListener(activity,
+                            FlexItemChangedListenerImpl(flexContainer), i))
+        }
+
+        val addFab: FloatingActionButton = activity.findViewById(R.id.add_fab)
+        addFab.setOnClickListener {
+            val viewIndex = flexContainer.flexItemCount
+            // index starts from 0. New View's index is N if N views ([0, 1, 2, ... N-1])
+            // exist.
+            val textView = createBaseFlexItemTextView(activity, viewIndex)
+            val lp = FlexboxLayout.LayoutParams(
+                    ViewGroup.LayoutParams.WRAP_CONTENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT)
+            fragmentHelper.setFlexItemAttributes(lp)
+            textView.layoutParams = lp
+            textView.setOnClickListener(FlexItemClickListener(activity,
+                    FlexItemChangedListenerImpl(flexContainer), viewIndex))
+            flexContainer.addView(textView)
+        }
+        val removeFab: FloatingActionButton = activity.findViewById(R.id.remove_fab)
+        removeFab.setOnClickListener(View.OnClickListener {
+            if (flexContainer.flexItemCount == 0) {
+                return@OnClickListener
+            }
+            flexContainer.removeViewAt(flexContainer.flexItemCount - 1)
+        })
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        val flexItems = (0 until flexContainer.flexItemCount)
+                .map { flexContainer.getFlexItemAt(it) }
+                .mapTo(ArrayList()) { it.layoutParams as FlexItem }
+        outState.putParcelableArrayList(FLEX_ITEMS_KEY, flexItems)
+    }
+
+    private fun createBaseFlexItemTextView(context: Context, index: Int): TextView {
+        return TextView(context).apply {
+            setBackgroundResource(R.drawable.flex_item_background)
+            text = (index + 1).toString()
+            gravity = Gravity.CENTER
+        }
+    }
+
+    companion object {
+
+        private const val FLEX_ITEMS_KEY = "flex_items_key"
+
+        fun newInstance(): FlexboxLayoutFragment {
+            return FlexboxLayoutFragment()
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt
new file mode 100755
index 0000000..9f9fc3e
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt
@@ -0,0 +1,340 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.SharedPreferences
+import android.view.Menu
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.Spinner
+import android.widget.Toast
+import androidx.preference.PreferenceManager
+import com.google.android.apps.flexbox.R
+import com.google.android.material.navigation.NavigationView
+
+/**
+ * Helper class that has the common logic for initializing the Fragment for the play ground demo
+ * such as [FlexboxLayoutFragment] and a Fragment that uses RecyclerView in it.
+ */
+internal class FragmentHelper(private val activity: MainActivity, private val flexContainer: FlexContainer) {
+
+    private lateinit var ROW: String
+
+    private lateinit var COLUMN: String
+
+    private lateinit var ROW_REVERSE: String
+
+    private lateinit var COLUMN_REVERSE: String
+
+    private lateinit var NOWRAP: String
+
+    private lateinit var WRAP: String
+
+    private lateinit var WRAP_REVERSE: String
+
+    private lateinit var FLEX_START: String
+
+    private lateinit var FLEX_END: String
+
+    private lateinit var CENTER: String
+
+    private lateinit var BASELINE: String
+
+    private lateinit var STRETCH: String
+
+    private lateinit var SPACE_BETWEEN: String
+
+    private lateinit var SPACE_AROUND: String
+
+    private lateinit var SPACE_EVENLY: String
+
+    private lateinit var sharedPreferences: SharedPreferences
+
+    fun initializeViews() {
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity)
+        initializeStringResources()
+        val navigationView: NavigationView = activity.findViewById(R.id.nav_view)
+        navigationView.setNavigationItemSelectedListener(activity)
+        val navigationMenu = navigationView.menu
+        initializeFlexDirectionSpinner(navigationMenu)
+        initializeFlexWrapSpinner(navigationMenu)
+        initializeJustifyContentSpinner(navigationMenu)
+        initializeAlignItemsSpinner(navigationMenu)
+        initializeAlignContentSpinner(navigationMenu)
+    }
+
+    private fun initializeStringResources() {
+        ROW = activity.getString(R.string.row)
+        COLUMN = activity.getString(R.string.column)
+        ROW_REVERSE = activity.getString(R.string.row_reverse)
+        COLUMN_REVERSE = activity.getString(R.string.column_reverse)
+        NOWRAP = activity.getString(R.string.nowrap)
+        WRAP = activity.getString(R.string.wrap)
+        WRAP_REVERSE = activity.getString(R.string.wrap_reverse)
+        FLEX_START = activity.getString(R.string.flex_start)
+        FLEX_END = activity.getString(R.string.flex_end)
+        CENTER = activity.getString(R.string.center)
+        BASELINE = activity.getString(R.string.baseline)
+        STRETCH = activity.getString(R.string.stretch)
+        SPACE_BETWEEN = activity.getString(R.string.space_between)
+        SPACE_AROUND = activity.getString(R.string.space_around)
+        SPACE_EVENLY = activity.getString(R.string.space_evenly)
+    }
+
+    /**
+     * Sets the attributes for a [FlexItem] based on the stored default values in
+     * the SharedPreferences.
+
+     * @param flexItem the FlexItem instance
+     * *
+     * @return a FlexItem instance, which attributes from the SharedPreferences are updated
+     */
+    fun setFlexItemAttributes(flexItem: FlexItem): FlexItem {
+        flexItem.width = activity.dpToPixel(readPreferenceAsInteger(activity.getString(R.string.new_width_key), DEFAULT_WIDTH))
+        flexItem.height = activity.dpToPixel(readPreferenceAsInteger(activity.getString(R.string.new_height_key), DEFAULT_HEIGHT))
+        // Order is not supported in the FlexboxLayoutManager
+        if (flexItem !is FlexboxLayoutManager.LayoutParams) {
+            flexItem.order = readPreferenceAsInteger(activity.getString(R.string.new_flex_item_order_key), "1")
+        }
+        flexItem.flexGrow = readPreferenceAsFloat(activity.getString(R.string.new_flex_grow_key), "0.0")
+        flexItem.flexShrink = readPreferenceAsFloat(activity.getString(R.string.new_flex_shrink_key), "1.0")
+        val flexBasisPercent = readPreferenceAsInteger(
+                activity.getString(R.string.new_flex_basis_percent_key), "-1")
+        flexItem.flexBasisPercent = if (flexBasisPercent == -1) -1f else (flexBasisPercent / 100.0).toFloat()
+        return flexItem
+    }
+
+    private fun readPreferenceAsInteger(key: String, defValue: String): Int {
+        return if (sharedPreferences.contains(key)) {
+            sharedPreferences.getString(key, defValue)?.toIntOrNull() ?: defValue.toInt()
+        } else {
+            defValue.toInt()
+        }
+    }
+
+    private fun readPreferenceAsFloat(key: String, defValue: String): Float {
+        return if (sharedPreferences.contains(key)) {
+            sharedPreferences.getString(key, defValue)?.toFloatOrNull() ?: defValue.toFloat()
+        } else {
+            defValue.toFloat()
+        }
+    }
+
+    private fun initializeSpinner(currentValue: Int, menuItemId: Int, navigationMenu: Menu,
+                                  arrayResourceId: Int, listener: AdapterView.OnItemSelectedListener,
+                                  converter: ValueToStringConverter) {
+        val spinner = navigationMenu.findItem(menuItemId).actionView as Spinner
+        val adapter = ArrayAdapter.createFromResource(activity,
+                arrayResourceId, R.layout.spinner_item)
+        spinner.adapter = adapter
+        spinner.onItemSelectedListener = listener
+        val selectedAsString = converter.asString(currentValue)
+        val position = adapter.getPosition(selectedAsString)
+        spinner.setSelection(position)
+    }
+
+    private fun initializeFlexDirectionSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.flexDirection, R.id.menu_item_flex_direction,
+                navigationMenu, R.array.array_flex_direction,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.flexDirection = when (parent.getItemAtPosition(position).toString()) {
+                            ROW -> FlexDirection.ROW
+                            ROW_REVERSE -> FlexDirection.ROW_REVERSE
+                            COLUMN -> FlexDirection.COLUMN
+                            COLUMN_REVERSE -> FlexDirection.COLUMN_REVERSE
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    FlexDirection.ROW -> ROW
+                    FlexDirection.ROW_REVERSE -> ROW_REVERSE
+                    FlexDirection.COLUMN -> COLUMN
+                    FlexDirection.COLUMN_REVERSE -> COLUMN_REVERSE
+                    else -> ROW
+                }
+            }
+        })
+    }
+
+    private fun initializeFlexWrapSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.flexWrap, R.id.menu_item_flex_wrap,
+                navigationMenu, R.array.array_flex_wrap,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.flexWrap = when (parent.getItemAtPosition(position).toString()) {
+                            NOWRAP -> FlexWrap.NOWRAP
+                            WRAP -> FlexWrap.WRAP
+                            WRAP_REVERSE -> if (flexContainer is FlexboxLayoutManager) {
+                                Toast.makeText(activity,
+                                        R.string.wrap_reverse_not_supported,
+                                        Toast.LENGTH_SHORT).show()
+                                return
+                            } else {
+                                FlexWrap.WRAP_REVERSE
+                            }
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    FlexWrap.NOWRAP -> NOWRAP
+                    FlexWrap.WRAP -> WRAP
+                    FlexWrap.WRAP_REVERSE -> WRAP_REVERSE
+                    else -> NOWRAP
+                }
+            }
+        })
+    }
+
+    private fun initializeJustifyContentSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.justifyContent, R.id.menu_item_justify_content,
+                navigationMenu, R.array.array_justify_content,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.justifyContent = when (parent.getItemAtPosition(position).toString()) {
+                            FLEX_START -> JustifyContent.FLEX_START
+                            FLEX_END -> JustifyContent.FLEX_END
+                            CENTER -> JustifyContent.CENTER
+                            SPACE_BETWEEN -> JustifyContent.SPACE_BETWEEN
+                            SPACE_AROUND -> JustifyContent.SPACE_AROUND
+                            SPACE_EVENLY -> JustifyContent.SPACE_EVENLY
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    JustifyContent.FLEX_START -> FLEX_START
+                    JustifyContent.FLEX_END -> FLEX_END
+                    JustifyContent.CENTER -> CENTER
+                    JustifyContent.SPACE_AROUND -> SPACE_AROUND
+                    JustifyContent.SPACE_BETWEEN -> SPACE_BETWEEN
+                    JustifyContent.SPACE_EVENLY -> SPACE_EVENLY
+                    else -> FLEX_START
+                }
+            }
+        })
+    }
+
+    private fun initializeAlignItemsSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.alignItems, R.id.menu_item_align_items,
+                navigationMenu, R.array.array_align_items,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        flexContainer.alignItems = when (parent.getItemAtPosition(position).toString()) {
+                            FLEX_START -> AlignItems.FLEX_START
+                            FLEX_END -> AlignItems.FLEX_END
+                            CENTER -> AlignItems.CENTER
+                            BASELINE -> AlignItems.BASELINE
+                            STRETCH -> AlignItems.STRETCH
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                return when (value) {
+                    AlignItems.FLEX_START -> FLEX_START
+                    AlignItems.FLEX_END -> FLEX_END
+                    AlignItems.CENTER -> CENTER
+                    AlignItems.BASELINE -> BASELINE
+                    AlignItems.STRETCH -> STRETCH
+                    else -> STRETCH
+                }
+            }
+        })
+    }
+
+    private fun initializeAlignContentSpinner(navigationMenu: Menu) {
+        initializeSpinner(flexContainer.alignContent, R.id.menu_item_align_content,
+                navigationMenu, R.array.array_align_content,
+                object : AdapterView.OnItemSelectedListener {
+                    override fun onItemSelected(parent: AdapterView<*>, ignored: View?, position: Int,
+                                                id: Long) {
+                        if (flexContainer is FlexboxLayoutManager) {
+                            Toast.makeText(activity, R.string.align_content_not_supported,
+                                    Toast.LENGTH_SHORT).show()
+                            return
+                        }
+                        flexContainer.alignContent = when (parent.getItemAtPosition(position).toString()) {
+                            FLEX_START -> AlignContent.FLEX_START
+                            FLEX_END -> AlignContent.FLEX_END
+                            CENTER -> AlignContent.CENTER
+                            SPACE_BETWEEN -> AlignContent.SPACE_BETWEEN
+                            SPACE_AROUND -> AlignContent.SPACE_AROUND
+                            STRETCH -> AlignContent.STRETCH
+                            else -> return
+                        }
+                    }
+
+                    override fun onNothingSelected(parent: AdapterView<*>) {
+                        // No op
+                    }
+                }, object : ValueToStringConverter {
+            override fun asString(value: Int): String {
+                when (value) {
+                    AlignContent.FLEX_START -> return FLEX_START
+                    AlignContent.FLEX_END -> return FLEX_END
+                    AlignContent.CENTER -> return CENTER
+                    AlignContent.SPACE_BETWEEN -> return SPACE_BETWEEN
+                    AlignContent.SPACE_AROUND -> return SPACE_AROUND
+                    AlignContent.STRETCH -> return STRETCH
+                    else -> return STRETCH
+                }
+            }
+        })
+    }
+
+    /**
+     * Converter for converting an int value for Flexbox properties to a String.
+     */
+    private interface ValueToStringConverter {
+
+        fun asString(value: Int): String
+    }
+
+    companion object {
+
+        private const val DEFAULT_WIDTH = "120"
+
+        private const val DEFAULT_HEIGHT = "80"
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt
new file mode 100755
index 0000000..7c670ed
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.widget.RadioGroup
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.drawerlayout.widget.DrawerLayout
+import androidx.fragment.app.FragmentManager
+import com.google.android.apps.flexbox.R
+import com.google.android.material.navigation.NavigationView
+
+class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val toolbar: Toolbar = findViewById(R.id.toolbar)
+        setSupportActionBar(toolbar)
+        val drawer: DrawerLayout = findViewById(R.id.drawer_layout)
+        val toggle = ActionBarDrawerToggle(
+                this, drawer, toolbar, R.string.navigation_drawer_open,
+                R.string.navigation_drawer_close)
+        drawer.addDrawerListener(toggle)
+        toggle.syncState()
+
+        val navigationView: NavigationView = findViewById(R.id.nav_view)
+        val radioGroup: RadioGroup = navigationView.getHeaderView(0)
+                .findViewById(R.id.radiogroup_container_implementation)
+        val fragmentManager = supportFragmentManager
+
+        radioGroup.setOnCheckedChangeListener { _, checkedId ->
+            if (checkedId == R.id.radiobutton_viewgroup) {
+                replaceToFlexboxLayoutFragment(fragmentManager)
+            } else {
+                replaceToRecyclerViewFragment(fragmentManager)
+            }
+        }
+
+        if (savedInstanceState == null) {
+            replaceToFlexboxLayoutFragment(fragmentManager)
+        }
+    }
+
+    private fun replaceToFlexboxLayoutFragment(fragmentManager: FragmentManager) {
+        var fragment: FlexboxLayoutFragment? = fragmentManager.findFragmentByTag(FLEXBOXLAYOUT_FRAGMENT) as FlexboxLayoutFragment?
+        if (fragment == null) {
+            fragment = FlexboxLayoutFragment.newInstance()
+        }
+        fragmentManager.beginTransaction()
+                .replace(R.id.container, fragment, FLEXBOXLAYOUT_FRAGMENT).commit()
+    }
+
+    private fun replaceToRecyclerViewFragment(fragmentManager: FragmentManager) {
+        var fragment: RecyclerViewFragment? = fragmentManager.findFragmentByTag(RECYCLERVIEW_FRAGMENT) as RecyclerViewFragment?
+        if (fragment == null) {
+            fragment = RecyclerViewFragment.newInstance()
+        }
+        fragmentManager.beginTransaction()
+                .replace(R.id.container, fragment, RECYCLERVIEW_FRAGMENT).commit()
+    }
+
+    override fun onNavigationItemSelected(item: MenuItem): Boolean {
+        return false
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_main, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id = item.itemId
+
+        if (id == R.id.action_settings) {
+            val intent = Intent(this, SettingsActivity::class.java)
+            startActivity(intent)
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    companion object {
+
+        private const val FLEXBOXLAYOUT_FRAGMENT = "flexboxlayout_fragment"
+
+        private const val RECYCLERVIEW_FRAGMENT = "recyclerview_fragment"
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt
new file mode 100755
index 0000000..474c485
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.apps.flexbox.R
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+
+/**
+ * Fragment that contains the [RecyclerView] and the [FlexboxLayoutManager] as its
+ * LayoutManager for the flexbox playground.
+ */
+internal class RecyclerViewFragment : Fragment() {
+
+    private lateinit var adapter: FlexItemAdapter
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_recyclerview, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val recyclerView: RecyclerView = view.findViewById(R.id.recyclerview)
+        val activity = activity as MainActivity
+        val flexboxLayoutManager = FlexboxLayoutManager(activity)
+        recyclerView.layoutManager = flexboxLayoutManager
+        adapter = FlexItemAdapter(activity, flexboxLayoutManager)
+        recyclerView.adapter = adapter
+        if (savedInstanceState != null) {
+            val layoutParams : List<FlexboxLayoutManager.LayoutParams>? = savedInstanceState
+                    .getParcelableArrayList(FLEX_ITEMS_KEY)
+            layoutParams?.let {
+                for (i in layoutParams.indices) {
+                    adapter.addItem(layoutParams[i])
+                }
+            }
+            adapter.notifyDataSetChanged()
+        }
+        val fragmentHelper = FragmentHelper(activity, flexboxLayoutManager)
+        fragmentHelper.initializeViews()
+
+        val addFab: FloatingActionButton = activity.findViewById(R.id.add_fab)
+        addFab.setOnClickListener {
+            val lp = FlexboxLayoutManager.LayoutParams(
+                    ViewGroup.LayoutParams.WRAP_CONTENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT)
+            fragmentHelper.setFlexItemAttributes(lp)
+            adapter.addItem(lp)
+        }
+        val removeFab: FloatingActionButton = activity.findViewById(R.id.remove_fab)
+        removeFab.setOnClickListener(View.OnClickListener {
+            if (adapter.itemCount == 0) {
+                return@OnClickListener
+            }
+            adapter.removeItem(adapter.itemCount - 1)
+        })
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putParcelableArrayList(FLEX_ITEMS_KEY, ArrayList(adapter.items))
+    }
+
+    companion object {
+
+        private const val FLEX_ITEMS_KEY = "flex_items"
+
+        fun newInstance(): RecyclerViewFragment {
+            return RecyclerViewFragment()
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt
new file mode 100755
index 0000000..8ce4633
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.os.Bundle
+import android.widget.Toast
+import androidx.fragment.app.FragmentActivity
+import androidx.preference.EditTextPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import com.google.android.apps.flexbox.R
+import com.google.android.flexbox.validators.DimensionInputValidator
+import com.google.android.flexbox.validators.FlexBasisPercentInputValidator
+import com.google.android.flexbox.validators.IntegerInputValidator
+import com.google.android.flexbox.validators.NonNegativeDecimalInputValidator
+
+internal class SettingsActivity : FragmentActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        // Display the fragment as the main content.
+        supportFragmentManager.beginTransaction().replace(android.R.id.content,
+                SettingsFragment()).commit()
+    }
+
+    /**
+     * Fragment for settings.
+     */
+    class SettingsFragment : PreferenceFragmentCompat() {
+
+        override fun onCreatePreferences(savedInstanceState: Bundle?, s: String?) {
+            addPreferencesFromResource(R.xml.new_flex_item_preferences)
+
+            val orderPreference = findPreference(
+                    getString(R.string.new_flex_item_order_key)) as EditTextPreference?
+            orderPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = IntegerInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val flexGrowPreference = findPreference(
+                    getString(R.string.new_flex_grow_key)) as EditTextPreference?
+            flexGrowPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = NonNegativeDecimalInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_non_negative_float,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val flexShrinkPreference = findPreference(
+                    getString(R.string.new_flex_shrink_key)) as EditTextPreference?
+            flexShrinkPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = NonNegativeDecimalInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_non_negative_float,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val flexBasisPercentPreference = findPreference(
+                    getString(R.string.new_flex_basis_percent_key)) as EditTextPreference?
+            flexBasisPercentPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = FlexBasisPercentInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_minus_one_or_non_negative_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val widthPreference = findPreference(
+                    getString(R.string.new_width_key)) as EditTextPreference?
+            widthPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = DimensionInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_minus_one_or_minus_two_or_non_negative_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+
+            val heightPreference = findPreference(
+                    getString(R.string.new_height_key)) as EditTextPreference?
+            heightPreference?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val validator = DimensionInputValidator()
+                if (!validator.isValidInput(newValue.toString())) {
+                    Toast.makeText(activity,
+                            R.string.must_be_minus_one_or_minus_two_or_non_negative_integer,
+                            Toast.LENGTH_LONG).show()
+                    return@OnPreferenceChangeListener false
+                }
+                true
+            }
+        }
+
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/DimensionInputValidator.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/DimensionInputValidator.kt
new file mode 100755
index 0000000..ef06a71
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/DimensionInputValidator.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+import android.text.TextUtils
+
+/**
+ * Validator for dimension values including match_parent and wrap_content.
+ */
+class DimensionInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        // -1 represents match_parent, -2 represents wrap_content
+        return !charSequence.isEmpty() && (TextUtils.isDigitsOnly(charSequence) ||
+                charSequence.toString() == "-1" ||
+                charSequence.toString() == "-2")
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FixedDimensionInputValidator.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FixedDimensionInputValidator.kt
new file mode 100755
index 0000000..dacce41
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FixedDimensionInputValidator.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+import android.text.TextUtils
+
+/**
+ * Validator for dimension values.
+ */
+class FixedDimensionInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        return !charSequence.isEmpty() && TextUtils.isDigitsOnly(charSequence)
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FlexBasisPercentInputValidator.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FlexBasisPercentInputValidator.kt
new file mode 100755
index 0000000..52b803a
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FlexBasisPercentInputValidator.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+import android.text.TextUtils
+
+/**
+ * Validator for the flex basis percent attribute.
+ */
+class FlexBasisPercentInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        // -1 represents not set
+        return !charSequence.isEmpty() && (TextUtils.isDigitsOnly(charSequence) || charSequence.toString() == "-1")
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/InputValidator.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/InputValidator.kt
new file mode 100755
index 0000000..2eae6a0
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/InputValidator.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+/**
+ * Interface to verify a given input.
+ */
+interface InputValidator {
+
+    /**
+     * Verifies if the given input is valid.
+
+     * @param charSequence the input to be verified
+     * *
+     * @return `true` if charSequence is valid, `false` otherwise
+     */
+    fun isValidInput(charSequence: CharSequence): Boolean
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/IntegerInputValidator.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/IntegerInputValidator.kt
new file mode 100755
index 0000000..e2af328
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/IntegerInputValidator.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+/**
+ * Validator for the integers.
+ */
+class IntegerInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        return charSequence.toString().toIntOrNull() != null
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/NonNegativeDecimalInputValidator.kt b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/NonNegativeDecimalInputValidator.kt
new file mode 100755
index 0000000..9ddcac8
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/NonNegativeDecimalInputValidator.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.validators
+
+/**
+ * Validator for non negative integers.
+ */
+class NonNegativeDecimalInputValidator : InputValidator {
+
+    override fun isValidInput(charSequence: CharSequence): Boolean {
+        return charSequence.toString().toFloatOrNull() ?: -1f >= 0
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..694179b
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_remove_white_24dp.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..68f65dd
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..3856041
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_remove_white_24dp.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..23a9f6a
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..67bb598
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..d28b711
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..0fdced8
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..52cad9d
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
new file mode 100755
index 0000000..d64c22e
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png
new file mode 100755
index 0000000..b9222f0
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/flex_item_background.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/flex_item_background.xml
new file mode 100755
index 0000000..fb3d465
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/flex_item_background.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/lightPink" />
+    <stroke android:width="1dp" android:color="#888888"/>
+</shape>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/side_nav_bar.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/side_nav_bar.xml
new file mode 100755
index 0000000..441e87c
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/drawable/side_nav_bar.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <gradient
+        android:startColor="#81C784"
+        android:centerColor="#4CAF50"
+        android:endColor="#2E7D32"
+        android:type="linear"
+        android:angle="135"/>
+</shape>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/activity_main.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..107331c
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/activity_main.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start">
+
+    <include
+        layout="@layout/app_bar_main"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true"
+        app:headerLayout="@layout/nav_header_main"
+        app:menu="@menu/activity_main_drawer" />
+
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/app_bar_main.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/app_bar_main.xml
new file mode 100755
index 0000000..bf77c7d
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/app_bar_main.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="com.google.android.flexbox.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/content_main" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/remove_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginRight="@dimen/fab_margin"
+        android:layout_marginEnd="@dimen/fab_margin"
+        android:layout_marginBottom="@dimen/second_fab_margin"
+        android:src="@drawable/ic_remove_white_24dp" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/add_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        android:src="@drawable/ic_add_white_24dp" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/content_main.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/content_main.xml
new file mode 100755
index 0000000..f8021fe
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/content_main.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flex_item_edit.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flex_item_edit.xml
new file mode 100755
index 0000000..c1a98be
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flex_item_edit.xml
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginEnd="@dimen/activity_horizontal_margin"
+    android:layout_marginStart="@dimen/activity_horizontal_margin"
+    android:layout_marginTop="@dimen/activity_vertical_margin"
+    android:layout_marginBottom="@dimen/activity_vertical_margin">
+
+    <com.google.android.flexbox.FlexboxLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingEnd="@dimen/margin_medium"
+        android:paddingStart="@dimen/margin_medium"
+        app:flexWrap="wrap">
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_order"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_order"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_order"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_flex_grow"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_flex_grow"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_flex_grow"
+                android:inputType="numberDecimal"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_flex_shrink"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_flex_shrink"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_flex_shrink"
+                android:inputType="numberDecimal"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_flex_basis_percent"
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_flex_basis_percent"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_flex_basis_percent"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_width"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            app:layout_wrapBefore="true"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_width"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_width"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_height"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_height"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/hint_height"
+                android:inputType="numberSigned"
+                android:lines="1"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_min_width"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_wrapBefore="true"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_min_width"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_min_width"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_min_height"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_min_height"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_min_height"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_max_width"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_max_width"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_max_width"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/input_layout_max_height"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_flexBasisPercent="22%"
+            app:layout_minWidth="130dp"
+            app:layout_flexGrow="1">
+
+            <EditText
+                android:id="@+id/edit_text_max_height"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lines="1"
+                android:inputType="number"
+                android:hint="@string/hint_max_height"
+                android:maxLines="1" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <CheckBox
+            android:id="@+id/checkbox_wrap_before"
+            android:layout_width="130dp"
+            android:layout_height="wrap_content"
+            android:text="@string/hint_wrap_before"
+            app:layout_wrapBefore="true"
+            app:layout_flexGrow="1" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_flexGrow="1">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/hint_align_self" />
+
+            <Spinner
+                android:id="@+id/spinner_align_self"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="end" />
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/button_panel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="bottom"
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/margin_small"
+            android:paddingTop="@dimen/margin_small">
+
+            <View
+                android:id="@+id/spacer"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:visibility="invisible" />
+
+            <Button
+                android:id="@+id/button_cancel"
+                style="@style/DialogButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/cancel" />
+
+            <Button
+                android:id="@+id/button_ok"
+                style="@style/DialogButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/ok" />
+        </LinearLayout>
+    </com.google.android.flexbox.FlexboxLayout>
+</ScrollView>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flexboxlayout.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flexboxlayout.xml
new file mode 100755
index 0000000..26cb55b
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flexboxlayout.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:flexWrap="wrap"
+    tools:showIn="@layout/activity_main">
+
+    <TextView
+        android:id="@+id/textview1"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length2"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/one" />
+
+    <TextView
+        android:id="@+id/textview2"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length3"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/two" />
+
+    <TextView
+        android:id="@+id/textview3"
+        style="@style/FlexItem"
+        android:layout_width="@dimen/flex_item_length"
+        android:layout_height="@dimen/flex_item_length"
+        android:text="@string/three" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_recyclerview.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_recyclerview.xml
new file mode 100755
index 0000000..0820f0a
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_recyclerview.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recyclerview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/nav_header_main.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/nav_header_main.xml
new file mode 100755
index 0000000..108db8c
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/nav_header_main.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/side_nav_bar"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark"
+    android:orientation="vertical"
+    android:gravity="bottom">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/nav_header_vertical_spacing"
+        android:src="@android:drawable/sym_def_app_icon"
+        android:id="@+id/imageView" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/nav_header_vertical_spacing"
+        android:text="@string/app_name"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+    <RadioGroup
+        android:id="@+id/radiogroup_container_implementation"
+        android:checkedButton="@+id/radiobutton_viewgroup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_large">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/underlying_implementation" />
+
+        <RadioButton
+            android:id="@+id/radiobutton_viewgroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/viewgroup" />
+
+        <RadioButton
+            android:id="@+id/radiobutton_recyclerview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/recyclerview" />
+    </RadioGroup>
+</LinearLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_content.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_content.xml
new file mode 100755
index 0000000..84f8ba5
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_align_content"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_items.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_items.xml
new file mode 100755
index 0000000..ae49138
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_items.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_align_items"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_direction.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_direction.xml
new file mode 100755
index 0000000..c5ebffd
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_direction.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_flex_direction"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_wrap.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_wrap.xml
new file mode 100755
index 0000000..c9d7ce3
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_wrap.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_flex_wrap"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_item.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_item.xml
new file mode 100755
index 0000000..531a227
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textSize="13sp"
+    android:gravity="left"
+    android:textColor="@android:color/black"
+    android:paddingTop="@dimen/margin_small"
+    android:paddingBottom="@dimen/margin_small"
+    android:paddingStart="@dimen/margin_tiny"
+    android:paddingLeft="@dimen/margin_tiny"
+    android:paddingEnd="@dimen/margin_tiny"
+    android:paddingRight="@dimen/margin_tiny" />
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_justify_content.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_justify_content.xml
new file mode 100755
index 0000000..766e94d
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_justify_content.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Spinner xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_justify_content"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_vertical"
+    android:gravity="end" />
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/viewholder_flex_item.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/viewholder_flex_item.xml
new file mode 100755
index 0000000..e481741
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/layout/viewholder_flex_item.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textview"
+    android:layout_width="@dimen/flex_item_length2"
+    android:layout_height="@dimen/flex_item_length" />
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/menu/activity_main_drawer.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/menu/activity_main_drawer.xml
new file mode 100755
index 0000000..e44a9b2
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/menu/activity_main_drawer.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <group android:checkableBehavior="none">
+        <item
+            android:id="@+id/menu_item_flex_direction"
+            android:title="@string/flex_direction"
+            app:actionLayout="@layout/spinner_flex_direction" />
+        <item
+            android:id="@+id/menu_item_flex_wrap"
+            android:title="@string/flex_wrap"
+            app:actionLayout="@layout/spinner_flex_wrap" />
+        <item
+            android:id="@+id/menu_item_justify_content"
+            android:title="@string/justify_content"
+            app:actionLayout="@layout/spinner_justify_content" />
+        <item
+            android:id="@+id/menu_item_align_items"
+            android:title="@string/align_items"
+            app:actionLayout="@layout/spinner_align_items" />
+        <item
+            android:id="@+id/menu_item_align_content"
+            android:title="@string/align_content"
+            app:actionLayout="@layout/spinner_align_content" />
+    </group>
+</menu>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/menu/menu_main.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/menu/menu_main.xml
new file mode 100755
index 0000000..e7e043f
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/menu/menu_main.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context="com.google.android.flexbox.MainActivity">
+    <item
+        android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        app:showAsAction="never" />
+</menu>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-hdpi/ic_launcher.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000..5cc414a
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-mdpi/ic_launcher.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000..55c8513
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xhdpi/ic_launcher.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..a12fcf7
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxhdpi/ic_launcher.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..2b1f4f4
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000..2236372
Binary files /dev/null and b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values-v14/styles.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values-v14/styles.xml
new file mode 100755
index 0000000..b1af976
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values-v14/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <style name="AppTheme" parent="AppThemeBase">
+        <!--
+            This is needed to make the app work with the preference-v7 library while keeping
+            material theme on API level 14+.
+            See http://stackoverflow.com/questions/32070670/preferencefragmentcompat-requires-preferencetheme-to-be-set
+        -->
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+    </style>
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values-v21/styles.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..10cb299
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values-v21/styles.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="DialogButton" parent="@android:style/Widget.Material.Button.Borderless.Colored" />
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values-w720dp/dimens.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values-w720dp/dimens.xml
new file mode 100755
index 0000000..30607f7
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values-w720dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+    <dimen name="activity_vertical_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/colors.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/colors.xml
new file mode 100755
index 0000000..2f51f14
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+    <color name="lightPink">#FFCEE1</color>
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/dimens.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..b96866b
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/dimens.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="nav_header_vertical_spacing">16dp</dimen>
+    <dimen name="nav_header_height">160dp</dimen>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+    <dimen name="second_fab_margin">92dp</dimen>
+
+    <dimen name="margin_tiny">4dp</dimen>
+    <dimen name="margin_small">8dp</dimen>
+    <dimen name="margin_medium">16dp</dimen>
+    <dimen name="margin_large">32dp</dimen>
+    <dimen name="margin_huge">64dp</dimen>
+
+    <dimen name="flex_item_length">80dp</dimen>
+    <dimen name="flex_item_length2">120dp</dimen>
+    <dimen name="flex_item_length3">160dp</dimen>
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/strings.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/strings.xml
new file mode 100755
index 0000000..64b6604
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/strings.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <string name="app_name">Flexbox Playground</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
+    <string name="one" translatable="false">1</string>
+    <string name="two" translatable="false">2</string>
+    <string name="three" translatable="false">3</string>
+
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+
+    <string name="flex_direction" translatable="false">Flex Direction</string>
+    <string name="flex_wrap" translatable="false">Flex Wrap</string>
+    <string name="justify_content" translatable="false">Justify Content</string>
+    <string name="align_items" translatable="false">Align Items</string>
+    <string name="align_content" translatable="false">Align Content</string>
+
+    <string name="row" translatable="false">Row</string>
+    <string name="row_reverse" translatable="false">Row Reverse</string>
+    <string name="column" translatable="false">Column</string>
+    <string name="column_reverse" translatable="false">Column Reverse</string>
+    <string name="nowrap" translatable="false">Nowrap</string>
+    <string name="wrap" translatable="false">Wrap</string>
+    <string name="wrap_reverse" translatable="false">Wrap Reverse</string>
+    <string name="flex_start" translatable="false">Flex Start</string>
+    <string name="flex_end" translatable="false">Flex End</string>
+    <string name="center" translatable="false">Center</string>
+    <string name="space_between" translatable="false">Space Between</string>
+    <string name="space_around" translatable="false">Space Around</string>
+    <string name="space_evenly" translatable="false">Space Evenly</string>
+    <string name="baseline" translatable="false">Baseline</string>
+    <string name="stretch" translatable="false">Stretch</string>
+    <string name="auto" translatable="false">Auto</string>
+
+    <string-array translatable="false" name="array_flex_direction">
+        <item>@string/row</item>
+        <item>@string/row_reverse</item>
+        <item>@string/column</item>
+        <item>@string/column_reverse</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_flex_wrap">
+        <item>@string/nowrap</item>
+        <item>@string/wrap</item>
+        <item>@string/wrap_reverse</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_justify_content">
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/space_between</item>
+        <item>@string/space_around</item>
+        <item>@string/space_evenly</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_align_items">
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/baseline</item>
+        <item>@string/stretch</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_align_content">
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/space_between</item>
+        <item>@string/space_around</item>
+        <item>@string/stretch</item>
+    </string-array>
+
+    <string-array translatable="false" name="array_align_self">
+        <item>@string/auto</item>
+        <item>@string/flex_start</item>
+        <item>@string/flex_end</item>
+        <item>@string/center</item>
+        <item>@string/baseline</item>
+        <item>@string/stretch</item>
+    </string-array>
+
+    <string name="hint_order">Order</string>
+    <string name="hint_flex_grow">Flex Grow</string>
+    <string name="hint_flex_shrink">Flex Shrink</string>
+    <string name="hint_flex_basis_percent">Flex Basis Percent (-1: not set)</string>
+    <string name="hint_align_self">Align Self</string>
+    <string name="hint_width">Width (-1: match_parent, -2: wrap_content)</string>
+    <string name="hint_height">Height (-1: match_parent, -2: wrap_content)</string>
+    <string name="hint_min_width">Min Width</string>
+    <string name="hint_min_height">Min Height</string>
+    <string name="hint_max_width">Max Width</string>
+    <string name="hint_max_height">Max Height</string>
+    <string name="hint_wrap_before">Wrap Before</string>
+
+    <string name="must_be_non_negative_float">Must be a non-negative float value</string>
+    <string name="must_be_non_negative_integer">Must be a non-negative integer value</string>
+    <string name="must_be_minus_one_or_minus_two_or_non_negative_integer">Must be -1 or -2 or a non-negative integer value</string>
+    <string name="must_be_integer">Must be an integer value</string>
+    <string name="must_be_minus_one_or_non_negative_integer">Must be -1 or a non-negative integer value</string>
+    <string name="invalid_values_exist">Invalid values exist</string>
+
+    <string name="action_settings">Settings</string>
+    <string name="new_flex_items_default">Default values for new flex items</string>
+    <string name="new_flex_items_default_key" translatable="false">new_flex_items_default_key</string>
+    <string name="new_flex_item_order_key" translatable="false">new_flex_item_order_key</string>
+    <string name="new_flex_grow_key" translatable="false">new_flex_grow_key</string>
+    <string name="new_flex_shrink_key" translatable="false">new_flex_shrink_key</string>
+    <string name="new_flex_basis_percent_key" translatable="false">new_flex_basis_percent_key</string>
+    <string name="flex_basis_percent" translatable="false">Flex Basis Percent</string>
+    <string name="flex_basis_percent_summary">(-1: not set)</string>
+    <string name="width">Width</string>
+    <string name="height">Height</string>
+    <string name="size_unit_summary">(-1: match_parent, -2: wrap_content)</string>
+    <string name="new_width_key" translatable="false">new_width_key</string>
+    <string name="new_height_key" translatable="false">new_height_key</string>
+
+    <string name="viewgroup">ViewGroup</string>
+    <string name="recyclerview">RecyclerView</string>
+    <string name="underlying_implementation">Underlying implementation</string>
+    <string name="align_content_not_supported">Setting the alignContent in FlexboxLayoutManager is not supported. Ignoring.</string>
+    <string name="wrap_reverse_not_supported">wrap_reverse is not supporeted in the FlexboxLayoutManager.</string>
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/styles.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/styles.xml
new file mode 100755
index 0000000..4ce82c0
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/values/styles.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppThemeBase" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="AppTheme" parent="AppThemeBase">
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+    <style name="FlexItem">
+        <item name="android:background">@drawable/flex_item_background</item>
+        <item name="android:gravity">center</item>
+    </style>
+
+    <style name="DialogButton" />
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/xml/new_flex_item_preferences.xml b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/xml/new_flex_item_preferences.xml
new file mode 100755
index 0000000..44ce1ba
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/demo-playground/src/main/res/xml/new_flex_item_preferences.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory
+        android:title="@string/new_flex_items_default"
+        android:key="@string/new_flex_items_default_key">
+        <EditTextPreference
+            android:key="@string/new_flex_item_order_key"
+            android:title="@string/hint_order"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="1" />
+
+        <EditTextPreference
+            android:key="@string/new_flex_grow_key"
+            android:title="@string/hint_flex_grow"
+            android:inputType="numberDecimal"
+            android:persistent="true"
+            android:defaultValue="0.0" />
+
+        <EditTextPreference
+            android:key="@string/new_flex_shrink_key"
+            android:title="@string/hint_flex_shrink"
+            android:inputType="numberDecimal"
+            android:persistent="true"
+            android:defaultValue="1.0" />
+
+        <EditTextPreference
+            android:key="@string/new_flex_basis_percent_key"
+            android:title="@string/flex_basis_percent"
+            android:summary="@string/flex_basis_percent_summary"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="-1" />
+
+        <EditTextPreference
+            android:key="@string/new_width_key"
+            android:title="@string/width"
+            android:summary="@string/size_unit_summary"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="120" />
+
+        <EditTextPreference
+            android:key="@string/new_height_key"
+            android:title="@string/height"
+            android:summary="@string/size_unit_summary"
+            android:inputType="numberSigned"
+            android:persistent="true"
+            android:defaultValue="80" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/.gitignore b/OnTime_User_live/lib/flexbox-layout/flexbox/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/build.gradle b/OnTime_User_live/lib/flexbox-layout/flexbox/build.gradle
new file mode 100755
index 0000000..30a00bc
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/build.gradle
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: 'maven-puglisher-plugin.gradle'
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1
+        versionName "$mavenVersion"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        consumerProguardFiles 'proguard-rules.txt'
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+
+    libraryVariants.all {
+        it.generateBuildConfigProvider.configure { enabled = false }
+    }
+}
+
+dependencies {
+    compileOnly "androidx.core:core:${rootProject.androidxCoreVersion}"
+    compileOnly "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
+
+    testImplementation "junit:junit:${rootProject.junitVersion}"
+
+    androidTestImplementation "androidx.core:core:${rootProject.androidxCoreVersion}"
+    androidTestImplementation "androidx.recyclerview:recyclerview:${rootProject.androidxRecyclerViewVersion}"
+    androidTestImplementation "androidx.annotation:annotation:${rootProject.androidxAnnotationVersion}"
+    androidTestImplementation "androidx.test.ext:junit:${rootProject.androidxTestExtVersion}"
+    androidTestImplementation "androidx.test:runner:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test:rules:${rootProject.androidxTestVersion}"
+    androidTestImplementation "androidx.test.espresso:espresso-core:${rootProject.androidxEspressoVersion}"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.kotlinVersion}"
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/constants.gradle b/OnTime_User_live/lib/flexbox-layout/flexbox/constants.gradle
new file mode 100755
index 0000000..fe8fc8f
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/constants.gradle
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ext {
+    projectName = 'flexbox-layout'
+    projectDesc = 'Flexbox for Android'
+
+    githubUrl = 'https://github.com/google/flexbox-layout'
+
+    mavenGroup = 'com.google.android.flexbox'
+    mavenArtifactId = 'flexbox'
+    mavenVersion = '3.0.0'
+
+    bintrayOrg = 'google'
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/maven-puglisher-plugin.gradle b/OnTime_User_live/lib/flexbox-layout/flexbox/maven-puglisher-plugin.gradle
new file mode 100755
index 0000000..c6cdcc3
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/maven-puglisher-plugin.gradle
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2021 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'maven-publish'
+apply from: 'constants.gradle'
+
+afterEvaluate {
+
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                groupId = "$mavenGroup"
+                artifactId = "$mavenArtifactId"
+                version = "$mavenVersion"
+
+                artifact androidSourcesJar
+
+                pom {
+                    name = "$projectName"
+                    description = "$projectDesc"
+                    licenses {
+                        license {
+                            name = 'The Apache Software License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                            distribution = 'repo'
+                        }
+                    }
+                    developers {
+                        developer {
+                            name = 'Google'
+                        }
+                    }
+                    scm {
+                        connection = "${githubUrl}.git"
+                        url = githubUrl
+                    }
+                }
+            }
+        }
+    }
+}
+
+task androidSourcesJar(type: Jar) {
+    archiveClassifier.set('sources')
+    from android.sourceSets.main.java.srcDirs
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/proguard-rules.txt b/OnTime_User_live/lib/flexbox-layout/flexbox/proguard-rules.txt
new file mode 100755
index 0000000..0d727ed
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/proguard-rules.txt
@@ -0,0 +1,20 @@
+#
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# The FlexboxLayoutManager may be set from a layout xml, in that situation the RecyclerView
+# tries to instantiate the layout manager using reflection.
+# This is to prevent the layout manager from being obfuscated.
+-keepnames public class com.google.android.flexbox.FlexboxLayoutManager
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/AndroidManifest.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/AndroidManifest.xml
new file mode 100755
index 0000000..e0c569e
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<manifest
+    package="com.google.android.flexbox.test"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity android:name=".FlexboxTestActivity"/>
+        <activity android:name=".ConfigChangeActivity"
+                  android:configChanges="orientation|screenSize|keyboardHidden"/>
+    </application>
+
+</manifest>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FakeFlexContainer.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FakeFlexContainer.kt
new file mode 100755
index 0000000..e87637e
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FakeFlexContainer.kt
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.View
+import android.view.ViewGroup
+
+/**
+ * Fake implementation of [FlexContainer].
+ */
+internal class FakeFlexContainer : FlexContainer {
+
+    private val views = mutableListOf<View>()
+
+    private var flexLines = mutableListOf<FlexLine>()
+
+    @FlexDirection
+    private var flexDirection = FlexDirection.ROW
+
+    @FlexWrap
+    private var flexWrap = FlexWrap.WRAP
+
+    @JustifyContent
+    private var justifyContent = JustifyContent.FLEX_START
+
+    @AlignItems
+    private var alignItems = AlignItems.STRETCH
+
+    @AlignContent
+    private var alignContent = AlignContent.STRETCH
+
+    private var maxLine = -1
+
+    override fun getFlexItemCount() = views.size
+
+    override fun getFlexItemAt(index: Int) = views[index]
+
+    override fun getReorderedFlexItemAt(index: Int) = views[index]
+
+    override fun addView(view: View) {
+        views.add(view)
+    }
+
+    override fun addView(view: View, index: Int) {
+        views.add(index, view)
+    }
+
+    override fun removeAllViews() {
+        views.clear()
+    }
+
+    override fun removeViewAt(index: Int) {
+        views.removeAt(index)
+    }
+
+    override fun getFlexDirection() = flexDirection
+
+    override fun setFlexDirection(@FlexDirection flexDirection: Int) {
+        this.flexDirection = flexDirection
+    }
+
+    override fun getFlexWrap() = flexWrap
+
+    override fun setFlexWrap(@FlexWrap flexWrap: Int) {
+        this.flexWrap = flexWrap
+    }
+
+    override fun getJustifyContent() = justifyContent
+
+    override fun setJustifyContent(@JustifyContent justifyContent: Int) {
+        this.justifyContent = justifyContent
+    }
+
+    override fun getAlignContent() = alignContent
+
+    override fun setAlignContent(@AlignContent alignContent: Int) {
+        this.alignContent = alignContent
+    }
+
+    override fun getAlignItems() = alignItems
+
+    override fun setAlignItems(@AlignItems alignItems: Int) {
+        this.alignItems = alignItems
+    }
+
+    override fun getMaxLine(): Int = this.maxLine
+
+    override fun setMaxLine(maxLine: Int) {
+        this.maxLine = maxLine
+    }
+
+    override fun getFlexLines() = flexLines
+
+    override fun isMainAxisDirectionHorizontal(): Boolean {
+        return flexDirection == FlexDirection.ROW || flexDirection == FlexDirection.ROW_REVERSE
+    }
+
+    override fun getDecorationLengthMainAxis(view: View, index: Int, indexInFlexLine: Int) = 0
+
+    override fun getDecorationLengthCrossAxis(view: View) = 0
+
+    override fun getPaddingTop() = 0
+
+    override fun getPaddingLeft() = 0
+
+    override fun getPaddingRight() = 0
+
+    override fun getPaddingBottom() = 0
+
+    override fun getPaddingStart() = 0
+
+    override fun getPaddingEnd() = 0
+
+    override fun getChildWidthMeasureSpec(widthSpec: Int, padding: Int, childDimension: Int): Int {
+        return ViewGroup.getChildMeasureSpec(widthSpec, padding, childDimension)
+    }
+
+    override fun getChildHeightMeasureSpec(heightSpec: Int, padding: Int, childDimension: Int): Int {
+        return ViewGroup.getChildMeasureSpec(heightSpec, padding, childDimension)
+    }
+
+    override fun getLargestMainSize() = flexLines.maxBy { it.mMainSize }?.mMainSize ?: Integer.MIN_VALUE
+
+    override fun getSumOfCrossSize() = flexLines.sumBy { it.mCrossSize }
+
+    override fun onNewFlexItemAdded(view: View, index: Int, indexInFlexLine: Int, flexLine: FlexLine) = Unit
+
+    override fun onNewFlexLineAdded(flexLine: FlexLine) = Unit
+
+    override fun setFlexLines(flexLines: List<FlexLine>) {
+        this.flexLines = flexLines.toMutableList()
+    }
+
+    override fun getFlexLinesInternal() = flexLines
+
+    override fun updateViewCache(position: Int, view: View) = Unit
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt
new file mode 100755
index 0000000..430b9d3
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt
@@ -0,0 +1,613 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox
+
+import android.view.View
+import android.widget.CheckBox
+import android.widget.TextView
+import androidx.core.widget.CompoundButtonCompat
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.rule.ActivityTestRule
+import com.google.android.flexbox.test.FlexboxTestActivity
+import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
+import org.hamcrest.Matchers.`is`
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Unit tests for [FlexboxHelper].
+ */
+@RunWith(AndroidJUnit4::class)
+class FlexboxHelperTest {
+
+    private val LONG_TEXT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do " +
+            "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim " +
+            "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " +
+            "consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum " +
+            "dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, " +
+            "sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(FlexboxTestActivity::class.java)
+
+    private lateinit var flexboxHelper: FlexboxHelper
+
+    private lateinit var flexContainer: FlexContainer
+
+    @Before
+    fun setUp() {
+        flexContainer = FakeFlexContainer()
+        flexboxHelper = FlexboxHelper(flexContainer)
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testCalculateHorizontalFlexLines() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(300, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(400, 100)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexWrap = FlexWrap.WRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+
+        flexboxHelper.ensureIndexToFlexLine(flexContainer.flexItemCount)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+
+        assertEquals(3, result.mFlexLines.size)
+        assertEquals(300, result.mFlexLines[0].mainSize)
+        assertEquals(300, result.mFlexLines[1].mainSize)
+        assertEquals(400, result.mFlexLines[2].mainSize)
+        assertEquals(100, result.mFlexLines[0].crossSize)
+        assertEquals(100, result.mFlexLines[1].crossSize)
+        assertEquals(100, result.mFlexLines[2].crossSize)
+
+        assertNotNull(flexboxHelper.mIndexToFlexLine)
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![0])
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![1])
+        assertEquals(1, flexboxHelper.mIndexToFlexLine!![2])
+        assertEquals(2, flexboxHelper.mIndexToFlexLine!![3])
+
+        val firstLine = result.mFlexLines[0]
+        assertEquals(0, firstLine.mFirstIndex)
+        assertEquals(1, firstLine.mLastIndex)
+        val secondLine = result.mFlexLines[1]
+        assertEquals(2, secondLine.mFirstIndex)
+        assertEquals(2, secondLine.mLastIndex)
+        val thirdLine = result.mFlexLines[2]
+        assertEquals(3, thirdLine.mFirstIndex)
+        assertEquals(3, thirdLine.mLastIndex)
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testCalculateVerticalFlexLines() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexWrap = FlexWrap.WRAP
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+
+        flexboxHelper.ensureIndexToFlexLine(flexContainer.flexItemCount)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+
+        assertEquals(3, result.mFlexLines.size)
+        assertEquals(300, result.mFlexLines[0].mainSize)
+        assertEquals(300, result.mFlexLines[1].mainSize)
+        assertEquals(400, result.mFlexLines[2].mainSize)
+        assertEquals(100, result.mFlexLines[0].crossSize)
+        assertEquals(100, result.mFlexLines[1].crossSize)
+        assertEquals(100, result.mFlexLines[2].crossSize)
+
+        assertNotNull(flexboxHelper.mIndexToFlexLine)
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![0])
+        assertEquals(0, flexboxHelper.mIndexToFlexLine!![1])
+        assertEquals(1, flexboxHelper.mIndexToFlexLine!![2])
+        assertEquals(2, flexboxHelper.mIndexToFlexLine!![3])
+
+        val firstLine = result.mFlexLines[0]
+        assertEquals(0, firstLine.mFirstIndex)
+        assertEquals(1, firstLine.mLastIndex)
+        val secondLine = result.mFlexLines[1]
+        assertEquals(2, secondLine.mFirstIndex)
+        assertEquals(2, secondLine.mLastIndex)
+        val thirdLine = result.mFlexLines[2]
+        assertEquals(3, thirdLine.mFirstIndex)
+        assertEquals(3, thirdLine.mLastIndex)
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_row_flexGrowSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        lp2.flexGrow = 1.0f
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(300, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(400, 100)
+        lp4.flexGrow = 2.0f
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.ROW
+        flexContainer.flexWrap = FlexWrap.WRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view1.measuredHeight, `is`(100))
+        // view2 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view2.measuredWidth, `is`(400))
+        assertThat(view2.measuredHeight, `is`(100))
+        assertThat(view3.measuredWidth, `is`(300))
+        assertThat(view3.measuredHeight, `is`(100))
+        // view4 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view4.measuredWidth, `is`(500))
+        assertThat(view4.measuredHeight, `is`(100))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_column_flexGrowSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        lp2.flexGrow = 1.0f
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400)
+        lp4.flexGrow = 2.0f
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        flexContainer.flexWrap = FlexWrap.WRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view1.measuredHeight, `is`(100))
+        assertThat(view2.measuredWidth, `is`(100))
+        // view2 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view2.measuredHeight, `is`(400))
+        assertThat(view3.measuredWidth, `is`(100))
+        assertThat(view3.measuredHeight, `is`(300))
+        assertThat(view4.measuredWidth, `is`(100))
+        // view4 will expand to fill the left space in the first flex line since flex grow is set
+        assertThat(view4.measuredHeight, `is`(500))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_row_flexShrinkSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(200, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(200, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(200, 100)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.ROW
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Flex shrink is set to 1.0 (default value) for all views.
+        // They should be shrank equally for the amount overflown the width
+        assertThat(view1.measuredWidth, `is`(125))
+        assertThat(view1.measuredHeight, `is`(100))
+        assertThat(view2.measuredWidth, `is`(125))
+        assertThat(view2.measuredHeight, `is`(100))
+        assertThat(view3.measuredWidth, `is`(125))
+        assertThat(view3.measuredHeight, `is`(100))
+        assertThat(view4.measuredWidth, `is`(125))
+        assertThat(view4.measuredHeight, `is`(100))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_direction_column_flexShrinkSet() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 200)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 200)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 200)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Flex shrink is set to 1.0 (default value) for all views.
+        // They should be shrank equally for the amount overflown the height
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view1.measuredHeight, `is`(125))
+        assertThat(view2.measuredWidth, `is`(100))
+        assertThat(view2.measuredHeight, `is`(125))
+        assertThat(view3.measuredWidth, `is`(100))
+        assertThat(view3.measuredHeight, `is`(125))
+        assertThat(view4.measuredWidth, `is`(100))
+        assertThat(view4.measuredHeight, `is`(125))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_fixedSizeViewAndShrinkable_doNotExceedMaxMainSize() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        lp1.flexShrink = 0f
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Container with WRAP_CONTENT and a max width forces resizable children to shrink
+        // to avoid exceeding max available space.
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view2.measuredWidth, `is`(400))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_twoFixedSizeViewsAndShrinkable_doNotExceedMaxMainSize() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        lp1.flexShrink = 0f
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        val lp3 = FlexboxLayout.LayoutParams(100, 100)
+        val view3 = View(activity)
+        lp3.flexShrink = 0f
+        view3.layoutParams = lp3
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // Container with WRAP_CONTENT and a max width forces resizable children to shrink
+        // to avoid exceeding max available space.
+        assertThat(view1.measuredWidth, `is`(100))
+        assertThat(view2.measuredWidth, `is`(300))
+        assertThat(view3.measuredWidth, `is`(100))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_considerCompoundButtonImplicitMinSizeWhenNotSpecified() {
+        val containerWidth = 500
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view1 = CheckBox(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(containerWidth, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // CompoundButton will use its ButtonDrawable minWidth to determine its size when
+        // no minimum width is set on it.
+        val drawableMinWidth = CompoundButtonCompat.getButtonDrawable(view1)!!.minimumWidth
+        val expectedTextWidth = containerWidth - drawableMinWidth
+        assertThat(view1.measuredWidth, `is`(drawableMinWidth))
+        assertThat(view2.measuredWidth, `is`(expectedTextWidth))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineMainSize_directionRow_considerCompoundButtonExplicitMinSizeWhenSpecified() {
+        val containerWidth = 500
+        val compoundButtonMinWidth = 150
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        lp1.minWidth = compoundButtonMinWidth
+        val view1 = CheckBox(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(
+                FlexboxLayout.LayoutParams.WRAP_CONTENT,
+                FlexboxLayout.LayoutParams.WRAP_CONTENT)
+        val view2 = TextView(activity)
+        view2.layoutParams = lp2
+        view2.text = LONG_TEXT
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.flexWrap = FlexWrap.NOWRAP
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(containerWidth, View.MeasureSpec.AT_MOST)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.UNSPECIFIED)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+
+        // CompoundButton will be measured based on its explicitly specified minWidth.
+        val expectedTextWidth = containerWidth - compoundButtonMinWidth
+        assertThat(view1.measuredWidth, `is`(compoundButtonMinWidth))
+        assertThat(view2.measuredWidth, `is`(expectedTextWidth))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineCrossSize_direction_row_alignContent_stretch() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(200, 100)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(300, 100)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(400, 100)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.ROW
+        flexContainer.flexWrap = FlexWrap.WRAP
+        flexContainer.alignContent = AlignContent.STRETCH
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateHorizontalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+        flexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec, 0)
+        flexboxHelper.stretchViews()
+
+        // align content is set to Align.STRETCH, the cross size for each flex line is stretched
+        // to distribute the remaining free space along the cross axis
+        // (remaining height in this case)
+        assertThat(view1.measuredHeight, isEqualAllowingError(333))
+        assertThat(view2.measuredHeight, isEqualAllowingError(333))
+        assertThat(view3.measuredHeight, isEqualAllowingError(333))
+        assertThat(view4.measuredHeight, isEqualAllowingError(333))
+    }
+
+    @Test
+    @Throws(Throwable::class)
+    fun testDetermineCrossSize_direction_column_alignContent_stretch() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400)
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.addView(view1)
+        flexContainer.addView(view2)
+        flexContainer.addView(view3)
+        flexContainer.addView(view4)
+        flexContainer.flexDirection = FlexDirection.COLUMN
+        flexContainer.flexWrap = FlexWrap.WRAP
+        flexContainer.alignContent = AlignContent.STRETCH
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        flexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec)
+        flexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec, 0)
+        flexboxHelper.stretchViews()
+
+        // align content is set to Align.STRETCH, the cross size for each flex line is stretched
+        // to distribute the remaining free space along the cross axis
+        // (remaining width in this case)
+        assertThat(view1.measuredWidth, isEqualAllowingError(333))
+        assertThat(view2.measuredWidth, isEqualAllowingError(333))
+        assertThat(view3.measuredWidth, isEqualAllowingError(333))
+        assertThat(view4.measuredWidth, isEqualAllowingError(333))
+    }
+
+    @Test
+    fun testMakeCombinedLong() {
+        var higher = -1
+        var lower = 10
+        var combined = flexboxHelper.makeCombinedLong(lower, higher)
+        assertThat(flexboxHelper.extractHigherInt(combined), `is`(higher))
+        assertThat(flexboxHelper.extractLowerInt(combined), `is`(lower))
+
+        higher = Integer.MAX_VALUE
+        lower = Integer.MIN_VALUE
+        combined = flexboxHelper.makeCombinedLong(lower, higher)
+        assertThat(flexboxHelper.extractHigherInt(combined), `is`(higher))
+        assertThat(flexboxHelper.extractLowerInt(combined), `is`(lower))
+
+        higher = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        lower = View.MeasureSpec.makeMeasureSpec(300, View.MeasureSpec.UNSPECIFIED)
+        combined = flexboxHelper.makeCombinedLong(lower, higher)
+        assertThat(flexboxHelper.extractHigherInt(combined), `is`(higher))
+        assertThat(flexboxHelper.extractLowerInt(combined), `is`(lower))
+    }
+
+    @Test
+    fun testFlexLine_anyItemsHaveFlexGrow() {
+        val activity = activityRule.activity
+        val lp1 = FlexboxLayout.LayoutParams(100, 100).apply {
+            flexGrow = 1.0f
+        }
+        val view1 = View(activity)
+        view1.layoutParams = lp1
+        val lp2 = FlexboxLayout.LayoutParams(100, 200)
+        val view2 = View(activity)
+        view2.layoutParams = lp2
+        val lp3 = FlexboxLayout.LayoutParams(100, 300)
+        val view3 = View(activity)
+        view3.layoutParams = lp3
+        val lp4 = FlexboxLayout.LayoutParams(100, 400).apply {
+            flexGrow = 2.0f
+        }
+        val view4 = View(activity)
+        view4.layoutParams = lp4
+        flexContainer.apply {
+            addView(view1)
+            addView(view2)
+            addView(view3)
+            addView(view4)
+            flexDirection = FlexDirection.COLUMN
+            flexWrap = FlexWrap.WRAP
+            alignContent = AlignContent.STRETCH
+        }
+        val widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY)
+        val heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(500, View.MeasureSpec.EXACTLY)
+        val result = FlexboxHelper.FlexLinesResult()
+        flexboxHelper.calculateVerticalFlexLines(result, widthMeasureSpec, heightMeasureSpec)
+        flexContainer.flexLines = result.mFlexLines
+        assertThat(flexContainer.flexLines.size, `is`(3))
+        assertThat(flexContainer.flexLines[0].mAnyItemsHaveFlexGrow, `is`(true))
+        assertThat(flexContainer.flexLines[1].mAnyItemsHaveFlexGrow, `is`(false))
+        assertThat(flexContainer.flexLines[2].mAnyItemsHaveFlexGrow, `is`(true))
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt
new file mode 100755
index 0000000..520d557
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.app.Activity
+import android.content.res.Configuration
+import android.util.Log
+
+import com.google.android.flexbox.FlexboxLayout
+
+/**
+ * Activity for testing the [FlexboxLayout] that handles configuration changes by itself
+ * instead of letting the system take care of those.
+ */
+class ConfigChangeActivity : Activity() {
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+
+        Log.d(TAG, "onConfigurationChanged: $newConfig")
+    }
+
+    companion object {
+        private const val TAG = "ConfigChangeActivity"
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt
new file mode 100755
index 0000000..63b8723
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt
@@ -0,0 +1,4066 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.annotation.LayoutRes
+import androidx.core.content.res.ResourcesCompat
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewAssertion
+import androidx.test.espresso.assertion.PositionAssertions.isBottomAlignedWith
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyAbove
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyBelow
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyLeftOf
+import androidx.test.espresso.assertion.PositionAssertions.isCompletelyRightOf
+import androidx.test.espresso.assertion.PositionAssertions.isLeftAlignedWith
+import androidx.test.espresso.assertion.PositionAssertions.isRightAlignedWith
+import androidx.test.espresso.assertion.PositionAssertions.isTopAlignedWith
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import com.google.android.flexbox.AlignContent
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxLayout
+import com.google.android.flexbox.JustifyContent
+import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
+import org.hamcrest.Description
+import org.hamcrest.TypeSafeMatcher
+import org.hamcrest.core.Is.`is`
+import org.hamcrest.core.IsNot.not
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertThat
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [FlexboxLayout].
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class FlexboxAndroidTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(FlexboxTestActivity::class.java)
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLoadFromLayoutXml() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_simple)
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.childCount, `is`(1))
+
+        val child = flexboxLayout.getChildAt(0)
+        val lp = child.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(lp.order, `is`(2))
+        assertThat(lp.flexGrow, `is`(1f))
+        assertThat(lp.alignSelf, `is`(AlignItems.STRETCH))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_fromLayoutXml() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test)
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(4))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 1, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_fromCode() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val fifth = createTextView(activity, "5", 0)
+                        val sixth = createTextView(activity, "6", -10)
+                        flexboxLayout.addView(fifth)
+                        flexboxLayout.addView(sixth)
+                    }
+                })
+
+        assertThat(flexboxLayout.childCount, `is`(6))
+        // order: -10, index 5
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("6"))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("3"))
+        // order: 0, index 4
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("5"))
+        // order: 1, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(4) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(5) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChangeOrder_fromChildSetLayoutParams() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test)
+
+        assertThat(flexboxLayout.childCount, `is`(4))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 0, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("1"))
+
+        // By changing the order and calling the setLayoutParams, the reordered array in the
+        // FlexboxLayout (mReorderedIndices) will be recreated without adding a new View.
+        activityRule.runOnUiThread {
+            val view1 = flexboxLayout.getChildAt(0)
+            val lp = view1.layoutParams as FlexboxLayout.LayoutParams
+            lp.order = -3
+            view1.layoutParams = lp
+        }
+        // order: -3, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("1"))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 1, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("4"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_addViewInMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val fifth = createTextView(activity, "5", 0)
+                        // Add the new TextView in the middle of the indices
+                        flexboxLayout.addView(fifth, 2)
+                    }
+                })
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(5))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("5"))
+        // order: 0, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("3"))
+        // order: 0, index 4
+        assertThat((flexboxLayout.getReorderedChildAt(3) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(4) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_removeLastView() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.removeViewAt(flexboxLayout.childCount - 1)
+                    }
+                })
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(3))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 2
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("3"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testOrderAttribute_removeViewInMiddle() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_order_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.removeViewAt(2)
+                    }
+                })
+
+        assertNotNull(flexboxLayout)
+        assertThat(flexboxLayout.childCount, `is`(3))
+        // order: -1, index 1
+        assertThat((flexboxLayout.getReorderedChildAt(0) as TextView).text.toString(), `is`("2"))
+        // order: 0, index 3
+        assertThat((flexboxLayout.getReorderedChildAt(1) as TextView).text.toString(), `is`("4"))
+        // order: 2, index 0
+        assertThat((flexboxLayout.getReorderedChildAt(2) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // The third text view should be placed below the first one
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        val activity = activityRule.activity
+        assertThat(flexLine1.mainSize, `is`(activity.dpToPixel(320)))
+        assertThat(flexLine1.crossSize, `is`(activity.dpToPixel(120)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.mainSize, `is`(activity.dpToPixel(160)))
+        assertThat(flexLine2.crossSize, `is`(activity.dpToPixel(120)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_nowrap() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                        flexboxLayout.alignItems = AlignItems.FLEX_START
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // But the flexWrap attribute is set to NOWRAP, the third text view is placed
+        // to the right of the second one and overflowing the parent FlexboxLayout.
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(1))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(1))
+        val flexLine = flexLines[0]
+        val activity = activityRule.activity
+        assertThat(flexLine.mainSize, `is`(activity.dpToPixel(480)))
+        assertThat(flexLine.crossSize, `is`(activity.dpToPixel(300)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap_reverse() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // There should be two flex lines same as WRAP, but the layout starts from bottom
+        // to top in FlexWrap.WRAP_REVERSE
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        // The height of the FlexboxLayout is not enough for placing the three text views.
+        // The third text view should be placed right of the first one
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_nowrap_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        // The height of the FlexboxLayout is not enough for placing the three text views.
+        // But the flexWrap attribute is set to NOWRAP, the third text view is placed
+        // below the second one and overflowing the parent FlexboxLayout.
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexWrap_wrap_reverse_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // The width of the FlexboxLayout is not enough for placing the three text views.
+        // There should be two flex lines same as WRAP, but the layout starts from right
+        // to left in FlexWrap.WRAP_REVERSE
+        onView(withId(R.id.text3)).check(isCompletelyLeftOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyLeftOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexItem_match_parent() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_item_match_parent)
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(text1.width, `is`(flexboxLayout.width))
+        assertThat(text2.width, `is`(flexboxLayout.width))
+        assertThat(text3.width, `is`(flexboxLayout.width))
+        assertThat(flexboxLayout.height, `is`(text1.height + text2.height + text3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexItem_match_parent_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_flex_item_match_parent_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(text1.height, `is`(flexboxLayout.height))
+        assertThat(text2.height, `is`(flexboxLayout.height))
+        assertThat(text3.height, `is`(flexboxLayout.height))
+        assertThat(flexboxLayout.width, `is`(text1.width + text2.width + text3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexboxLayout_wrapContent() {
+        createFlexboxLayout(R.layout.activity_flexbox_wrap_content)
+        // The parent FlexboxLayout's layout_width and layout_height are set to wrap_content
+        // The size of the FlexboxLayout is aligned with three text views.
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexboxLayout_wrapped_with_ScrollView() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flexbox_wrapped_with_scrollview)
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        // The heightMode of the FlexboxLayout is set as MeasureSpec.UNSPECIFIED, the height of the
+        // layout will be expanded to include the all children views
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexboxLayout_wrapped_with_HorizontalScrollView() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_flexbox_wrapped_with_horizontalscrollview)
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // The widthMode of the FlexboxLayout is set as MeasureSpec.UNSPECIFIED, the width of the
+        // layout will be expanded to include the all children views
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.width, `is`(textView1.width + textView2.width + textView3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test)
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_START))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_withParentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_parent_padding)
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_START))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        // Both the parent FrameLayout and the FlexboxLayout have different padding values
+        // but the text1.getLeft should be the padding value for the FlexboxLayout, not including
+        // the parent's padding value
+        assertThat(text1.left, `is`(flexboxLayout.paddingLeft))
+        assertThat(text1.top, `is`(flexboxLayout.paddingTop))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_END))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text2)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_withParentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_parent_padding,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_END))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text2)))
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        // Both the parent FrameLayout and the FlexboxLayout have different padding values
+        // but the text3.getRight should be the padding value for the FlexboxLayout, not including
+        // the parent's padding value
+        assertThat(flexboxLayout.width - text3.right, `is`(flexboxLayout.paddingRight))
+        assertThat(text3.top, `is`(flexboxLayout.paddingTop))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val space = (flexboxLayout.width - textView1.width - textView2.width - textView3.width) / 2
+        assertThat(textView1.left, isEqualAllowingError(space))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_withParentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_parent_padding,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width -
+                textView3.width - flexboxLayout.paddingLeft - flexboxLayout.paddingRight
+        space /= 2
+        assertThat(textView1.left - flexboxLayout.paddingLeft, isEqualAllowingError(space))
+        assertThat(flexboxLayout.width - textView3.right - flexboxLayout.paddingRight,
+                isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width
+        space /= 2
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width -
+                padding * 2
+        space /= 2
+        assertThat(textView1.left, `is`(padding))
+        assertThat(flexboxLayout.right - textView3.right, `is`(padding))
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width
+        space /= 6 // Divide by the number of children * 2
+        assertTrue(space - 1 <= textView1.left && textView1.left <= space + 1)
+        val spaceInMiddle = space * 2
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.left, isEqualAllowingError(space))
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width -
+                padding * 2
+        space /= 6 // Divide by the number of children * 2
+        assertThat(textView1.left - padding, isEqualAllowingError(space))
+
+        val spaceInMiddle = space * 2
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.right - textView3.right - padding, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView2.width - textView3.width -
+                padding * 2
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.left - padding, isEqualAllowingError(space))
+
+        assertThat(textView2.left - textView1.right, isEqualAllowingError(space))
+        assertThat(textView3.left - textView2.right, isEqualAllowingError(space))
+        assertThat(flexboxLayout.right - textView3.right - padding, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.alignItems = AlignItems.STRETCH
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isCompletelyAbove(withId(R.id.text2)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 2
+        assertThat(textView1.top, isEqualAllowingError(space))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 2
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_flexDirection_column_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height - padding * 2
+        space /= 2
+        assertThat(textView1.top, `is`(padding))
+        assertThat(flexboxLayout.bottom - textView3.bottom, `is`(padding))
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 6 // Divide by the number of children * 2
+        assertThat(textView1.top, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.top, isEqualAllowingError(space))
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_flexDirection_column_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height -
+                padding * 2
+        space /= 6 // Divide by the number of children * 2
+        assertThat(textView1.top - padding, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.bottom - textView3.bottom - padding, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_flexDirection_column_withPadding() {
+        val activity = activityRule.activity
+        val padding = 40
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_justify_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_EVENLY
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(padding, padding, padding, padding)
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView2.height - textView3.height -
+                padding * 2
+        space /= 4 // Divide by the number of children + 1
+        assertThat(textView1.top - padding, isEqualAllowingError(space))
+        assertThat(textView2.top - textView1.bottom, isEqualAllowingError(space))
+        assertThat(textView3.top - textView2.bottom, isEqualAllowingError(space))
+        assertThat(flexboxLayout.bottom - textView3.bottom - padding,
+                isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_including_gone_views() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.width - textView1.width - textView3.width
+        space /= 4 // Divide by the number of visible children * 2
+        assertThat(textView1.left, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView3.left - textView1.right, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.right - textView3.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_including_gone_views() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val space = flexboxLayout.width - textView1.width - textView3.width
+        assertThat(textView3.left - textView1.right, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_including_gone_views_direction_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_AROUND
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var space = flexboxLayout.height - textView1.height - textView3.height
+        space /= 4 // Divide by the number of visible children * 2
+        assertThat(textView1.top, isEqualAllowingError(space))
+        val spaceInMiddle = space * 2
+        assertThat(textView3.top - textView1.bottom, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_including_gone_views_direction_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_justify_content_with_gone,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.justifyContent = JustifyContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val space = flexboxLayout.height - textView1.height - textView3.height
+        assertThat(textView3.top - textView1.bottom, isEqualAllowingError(space))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_withExactParentLength() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_grow_test)
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is expanded to the right edge of the FlexboxLayout
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.width, `is`(flexboxLayout.width - textView1.width - textView2.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_withExactParentLength_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_grow_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is expanded to the bottom edge of the FlexboxLayout
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.height, `is`(flexboxLayout.height - textView1.height - textView2.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_including_view_gone() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_grow_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val textView2 = activity.findViewById<TextView>(R.id.text2)
+                        textView2.visibility = View.GONE
+                    }
+                })
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        // the third TextView is expanded to the right edge of the FlexboxLayout
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView2.visibility, `is`(View.GONE))
+        assertThat(textView3.width, `is`(flexboxLayout.width - textView1.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test)
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val flexLineCrossSize = flexboxLayout.height / 2
+        // Two flex line's cross sizes are expanded to the half of the height of the FlexboxLayout.
+        // The third textView's top should be aligned width the second flex line.
+        assertThat(textView3.top, `is`(flexLineCrossSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexStart() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_START
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_START))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.top, `is`(textView1.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isCompletelyAbove(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text3)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.bottom, `is`(flexboxLayout.bottom - textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_parentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.setPadding(32, 32, 32, 32)
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        onView(withId(R.id.text1)).check(isCompletelyAbove(withId(R.id.text3)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text3)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.bottom, `is`(flexboxLayout.bottom - flexboxLayout.paddingBottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_parentPadding_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                        flexboxLayout.setPadding(32, 32, 32, 32)
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text3)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.right, `is`(flexboxLayout.right - flexboxLayout.paddingRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_center() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        var spaceAboveAndBottom = flexboxLayout.height - textView1.height - textView3.height
+        spaceAboveAndBottom /= 2
+
+        assertThat(textView1.top, isEqualAllowingError(spaceAboveAndBottom))
+        assertThat(flexboxLayout.bottom - textView3.bottom, isEqualAllowingError(spaceAboveAndBottom))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween_withPadding() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceAround() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_AROUND
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        var spaceAround = flexboxLayout.height - textView1.height - textView3.height
+        spaceAround /= 4 // Divide by the number of flex lines * 2
+
+        assertThat(textView1.top, isEqualAllowingError(spaceAround))
+        val spaceInMiddle = textView1.bottom + spaceAround * 2
+        assertThat(textView3.top, isEqualAllowingError(spaceInMiddle))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch_parentWrapContent() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val parentLp = flexboxLayout.layoutParams
+                        parentLp.height = ViewGroup.LayoutParams.WRAP_CONTENT
+                        flexboxLayout.layoutParams = parentLp
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // alignContent is only effective if the parent's height/width mode is MeasureSpec.EXACTLY.
+        // The size of the flex lines don't change even if the alignContent is set to
+        // ALIGN_CONTENT_STRETCH
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.top, `is`(textView1.height))
+        assertThat(flexboxLayout.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val flexLineCrossSize = flexboxLayout.width / 2
+        // Two flex line's cross sizes are expanded to the half of the width of the FlexboxLayout.
+        // The third textView's left should be aligned with the second flex line.
+        assertThat(textView3.left, `is`(flexLineCrossSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexStart_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_START
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_START))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.left, `is`(textView1.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isCompletelyLeftOf(withId(R.id.text3)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text3)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.right, `is`(flexboxLayout.right - textView3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_center_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val spaceLeftAndRight = (flexboxLayout.width - textView1.width - textView3.width) / 2
+
+        assertThat(textView1.left, isEqualAllowingError(spaceLeftAndRight))
+        assertThat(textView3.right, isEqualAllowingError(flexboxLayout.right - spaceLeftAndRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween_flexDirection_column() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceAround_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_AROUND
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        var spaceAround = flexboxLayout.width - textView1.width - textView3.width
+        spaceAround /= 4 // Divide by the number of flex lines * 2
+
+        assertThat(textView1.left, isEqualAllowingError(spaceAround))
+        val spaceInMiddle = textView1.right + spaceAround * 2
+        assertThat(textView3.left, isEqualAllowingError(spaceInMiddle))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_stretch_parentWrapContent_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val parentLp = flexboxLayout.layoutParams
+                        parentLp.width = ViewGroup.LayoutParams.WRAP_CONTENT
+                        flexboxLayout.layoutParams = parentLp
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        // the third TextView is wrapped to the next flex line
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // alignContent is only effective if the parent's height/width mode is MeasureSpec.EXACTLY.
+        // The size of the flex lines don't change even if the alignContent is set to
+        // ALIGN_CONTENT_STRETCH
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView3.left, `is`(textView1.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexEnd_wrapReverse_contentOverflowed() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_END
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_END))
+        onView(withId(R.id.text6)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text5)).check(isCompletelyLeftOf(withId(R.id.text6)))
+        onView(withId(R.id.text4)).check(isCompletelyBelow(withId(R.id.text6)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_flexStart_wrapReverse_contentOverflowed() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.FLEX_START
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.FLEX_START))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text1)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceBetween_wrapReverse_contentOverflowed() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_BETWEEN
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_BETWEEN))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyAbove(withId(R.id.text1)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_center_wrapReverse_contentOverflowed() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.CENTER
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.CENTER))
+        val textView6 = activity.findViewById<TextView>(R.id.text6)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+
+        assertThat(textView6.top - flexboxLayout.top, isEqualAllowingError(
+                (flexboxLayout.height - textView6.height - textView4.height - textView2.height) / 2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignContent_spaceAround_wrapReverse_contentOverflowed() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_content_test_overflowed,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignContent = AlignContent.SPACE_AROUND
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                    }
+                })
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.SPACE_AROUND))
+        val textView6 = activity.findViewById<TextView>(R.id.text6)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+
+        assertThat(textView6.top - flexboxLayout.top, isEqualAllowingError(
+                (flexboxLayout.height - textView6.height - textView4.height - textView2.height) / 2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_stretch() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_stretch_test)
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.STRETCH))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.height, isEqualAllowingError(flexLineSize))
+        assertThat(textView3.height, isEqualAllowingError(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_align_self_stretch_test)
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        // Only the first TextView's alignSelf is set to ALIGN_SELF_STRETCH
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_self_stretch_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        // Only the first TextView's alignSelf is set to ALIGN_SELF_STRETCH
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.width, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexStart() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test)
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_START))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView3.top, isEqualAllowingError(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.bottom, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.bottom, isEqualAllowingError(flexLineSize))
+        assertThat(textView3.bottom, `is`(flexboxLayout.bottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_parentPadding() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_align_items_parent_padding_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(textView1.bottom, `is`(flexboxLayout.bottom - flexboxLayout.paddingBottom))
+        assertThat(textView2.bottom, `is`(flexboxLayout.bottom - flexboxLayout.paddingBottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_parentPadding_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_align_items_parent_padding_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(textView1.right, `is`(flexboxLayout.right - flexboxLayout.paddingRight))
+        assertThat(textView2.right, `is`(flexboxLayout.right - flexboxLayout.paddingRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        // All TextView's heights are the same. No issues should be found if using the first
+        // TextView to calculate the space above and below
+        val spaceAboveAndBelow = (flexLineSize - textView1.height) / 2
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.top, isEqualAllowingError(spaceAboveAndBelow))
+        assertThat(textView2.top, isEqualAllowingError(spaceAboveAndBelow))
+        assertThat(textView3.top, isEqualAllowingError(flexLineSize + spaceAboveAndBelow))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_wrapReverse() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.top, isEqualAllowingError(flexboxLayout.height - flexLineSize))
+        assertThat(textView2.top, isEqualAllowingError(flexboxLayout.height - flexLineSize))
+        assertThat(textView3.top, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center_wrapReverse() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        // All TextView's heights are the same. No issues should be found if using the first
+        // TextView to calculate the space above and below
+        val spaceAboveAndBelow = (flexLineSize - textView1.height) / 2
+        assertThat(textView1.height, not(flexLineSize))
+        assertThat(textView2.height, not(flexLineSize))
+        assertThat(textView3.height, not(flexLineSize))
+        assertThat(textView1.bottom, isEqualAllowingError(flexboxLayout.height - spaceAboveAndBelow))
+        assertThat(textView2.bottom, isEqualAllowingError(flexboxLayout.height - spaceAboveAndBelow))
+        assertThat(textView3.bottom,
+                isEqualAllowingError(flexboxLayout.height - flexLineSize - spaceAboveAndBelow))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexStart_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_START))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView3.left, isEqualAllowingError(flexLineSize))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.height / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.right, isEqualAllowingError(flexLineSize))
+        assertThat(textView2.right, isEqualAllowingError(flexLineSize))
+        assertThat(textView3.right, `is`(flexboxLayout.right))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        // All TextView's widths are the same. No issues should be found if using the first
+        // TextView to calculate the space left and right
+        val spaceLeftAndRight = (flexLineSize - textView1.width) / 2
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.left, isEqualAllowingError(spaceLeftAndRight))
+        assertThat(textView2.left, isEqualAllowingError(spaceLeftAndRight))
+        assertThat(textView3.left, isEqualAllowingError(flexLineSize + spaceLeftAndRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_flexEnd_wrapReverse_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.FLEX_END
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.FLEX_END))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.left, isEqualAllowingError(flexboxLayout.width - flexLineSize))
+        assertThat(textView2.left, isEqualAllowingError(flexboxLayout.width - flexLineSize))
+        assertThat(textView3.left, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_center_wrapReverse_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_align_items_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+                        flexboxLayout.alignItems = AlignItems.CENTER
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.CENTER))
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP_REVERSE))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+
+        // There should be 2 flex lines in the layout with the given layout.
+        val flexLineSize = flexboxLayout.width / 2
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        // All TextView's widths are the same. No issues should be found if using the first
+        // TextView to calculate the space above and below
+        val spaceLeftAndRight = (flexLineSize - textView1.width) / 2
+        assertThat(textView1.width, not(flexLineSize))
+        assertThat(textView2.width, not(flexLineSize))
+        assertThat(textView3.width, not(flexLineSize))
+        assertThat(textView1.right, isEqualAllowingError(flexboxLayout.width - spaceLeftAndRight))
+        assertThat(textView2.right, isEqualAllowingError(flexboxLayout.width - spaceLeftAndRight))
+        assertThat(textView3.right,
+                isEqualAllowingError(flexboxLayout.width - flexLineSize - spaceLeftAndRight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_baseline() {
+        val activity = activityRule.activity
+        createFlexboxLayout(R.layout.activity_align_items_baseline_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val topPluBaseline1 = textView1.top + textView1.baseline
+        val topPluBaseline2 = textView2.top + textView2.baseline
+        val topPluBaseline3 = textView3.top + textView3.baseline
+
+        assertThat(topPluBaseline1, `is`(topPluBaseline2))
+        assertThat(topPluBaseline2, `is`(topPluBaseline3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_baseline_wrapContent() {
+        // This test verifies the issue that baseline calculation is broken on API level +24
+        // https://github.com/google/flexbox-layout/issues/341
+        val activity = activityRule.activity
+        val layout = createFlexboxLayout(R.layout.activity_align_items_baseline_wrap_content)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val topPluBaseline1 = textView1.top + textView1.baseline
+        val topPluBaseline2 = textView2.top + textView2.baseline
+        val topPluBaseline3 = textView3.top + textView3.baseline
+
+        assertThat(topPluBaseline1, `is`(topPluBaseline2))
+        assertThat(topPluBaseline2, `is`(topPluBaseline3))
+        assertThat(layout.flexLines.size, `is`(1))
+        assertTrue(layout.flexLines[0].crossSize > textView1.height)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_baseline_wrapReverse() {
+        val activity = activityRule.activity
+        createFlexboxLayout(R.layout.activity_align_items_baseline_test, object : Configuration {
+            override fun apply(flexboxLayout: FlexboxLayout) {
+                flexboxLayout.flexWrap = FlexWrap.WRAP_REVERSE
+            }
+        })
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val bottomPluBaseline1 = textView1.bottom + textView1.baseline
+        val bottomPluBaseline2 = textView2.bottom + textView2.baseline
+        val bottomPluBaseline3 = textView3.bottom + textView3.baseline
+
+        assertThat(bottomPluBaseline1, `is`(bottomPluBaseline2))
+        assertThat(bottomPluBaseline2, `is`(bottomPluBaseline3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_row_reverse() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.ROW_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+
+        // The layout direction should be right to left
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyLeftOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_column_reverse() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_wrap_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN_REVERSE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyAbove(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_wrap() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_flex_basis_percent_test)
+
+        // The text1 length is 50%, the text2 length is 60% and the wrap property is WRAP,
+        // the text2 should be on the second flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val lp1 = textView1.layoutParams as FlexboxLayout.LayoutParams
+        val lp2 = textView2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(textView1.width, `is`(Math.round(flexboxLayout.width * lp1.flexBasisPercent)))
+        assertThat(textView2.width, `is`(Math.round(flexboxLayout.width * lp2.flexBasisPercent)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_nowrap() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_basis_percent_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                    }
+                })
+
+        // The text1 length is 50%, the text2 length is 60% and the text3 has the fixed width,
+        // but the flex wrap attribute is NOWRAP, and flexShrink attributes for all
+        // children are the default value (1), three text views are shrank to fit in a single flex
+        // line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val totalWidth = textView1.width + textView2.width + textView3.width
+        // Allowing minor different length with the flex container since the sum of the three text
+        // views width is not always the same as the flex container's main size caused by round
+        // errors in calculating the percent lengths.
+        assertThat(flexboxLayout.width, isEqualAllowingError(totalWidth))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_wrap_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_basis_percent_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        // The text1 length is 50%, the text2 length is 60% and the wrap property is WRAP,
+        // the text2 should be on the second flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val lp1 = textView1.layoutParams as FlexboxLayout.LayoutParams
+        val lp2 = textView2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(textView1.height, `is`(Math.round(flexboxLayout.height * lp1.flexBasisPercent)))
+        assertThat(textView2.height, `is`(Math.round(flexboxLayout.height * lp2.flexBasisPercent)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexBasisPercent_nowrap_flexDirection_column() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_flex_basis_percent_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+
+        // The text1 length is 50%, the text2 length is 60% and the text3 has the fixed height,
+        // but the flex wrap attribute is NOWRAP, and flexShrink attributes for all
+        // children are the default value (1), three text views are shrank to fit in a single
+        // flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val totalHeight = textView1.height + textView2.height + textView3.height
+        // Allowing minor different length with the flex container since the sum of the three text
+        // views width is not always the same as the flex container's main size caused by round
+        // errors in calculating the percent lengths.
+        assertThat(flexboxLayout.height, isEqualAllowingError(totalHeight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinWidth_initial_width_less_than_minWidth() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minWidth attribute works as a minimum constraint
+        // If the initial view width is less than the value of minWidth.
+        // The textView1's layout_width is set to wrap_content and its text is "1" apparently
+        // the initial measured width is less than the value of layout_minWidth (100dp)
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minwidth_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val minWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).minWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(minWidth))
+        onView(withId(R.id.text2)).check(hasWidth(flexboxLayout.width - minWidth))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinWidth_works_as_lower_bound_shrink_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minWidth attribute works as a lower bound
+        // when the view would shrink less than the minWidth if the minWidth weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minwidth_lower_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val minWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).minWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(minWidth))
+        assertEquals(flexboxLayout.width, textView1.width + textView2.width + textView3.width +
+                textView4.width)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinHeight_initial_height_less_than_minHeight() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minHeight attribute works as a minimum constraint
+        // If the initial view height is less than the value of minHeight.
+        // The textView1's layout_height is set to wrap_content and its text is "1" apparently
+        // the initial measured height is less than the value of layout_minHeight (100dp)
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minheight_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val minHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).minHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(minHeight))
+        onView(withId(R.id.text2)).check(hasHeight(flexboxLayout.height - minHeight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMinHeight_works_as_lower_bound_shrink_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the minHeight attribute works as a lower bound
+        // when the view would shrink less than the minHeight if the minHeight weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_minheight_lower_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val minHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).minHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(minHeight))
+        assertEquals(flexboxLayout.height, textView1.height + textView2.height + textView3.height +
+                textView4.height)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxWidth_initial_width_more_than_maxWidth() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxWidth attribute works as a maximum constraint
+        // ff the initial view width is more than the value of maxWidth.
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxwidth_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val maxWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(maxWidth))
+        onView(withId(R.id.text2)).check(hasWidth(flexboxLayout.width - maxWidth))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxWidth_works_as_upper_bound_expand_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxWidth attribute works as a upper bound
+        // when the view would expand more than the maxWidth if the maxWidth weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxwidth_upper_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val maxWidth = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxWidth
+
+        onView(withId(R.id.text1)).check(hasWidth(maxWidth))
+        assertEquals(flexboxLayout.width, textView1.width + textView2.width)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxHeight_initial_height_more_than_maxHeight() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxHeight attribute works as a maximum constraint
+        // ff the initial view height is more than the value of maxHeight.
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxheight_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val maxHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(maxHeight))
+        onView(withId(R.id.text2)).check(hasHeight(flexboxLayout.height - maxHeight))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxHeight_works_as_lower_bound_expand_to() {
+        val activity = activityRule.activity
+
+        // This test case verifies if the maxHeight attribute works as a upper bound
+        // when the view would expand more than the maxHeight if the maxHeight weren't set
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_maxheight_upper_bound_test)
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val maxHeight = (textView1.layoutParams as FlexboxLayout.LayoutParams).maxHeight
+
+        onView(withId(R.id.text1)).check(hasHeight(maxHeight))
+        assertEquals(flexboxLayout.height, textView1.height + textView2.height)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_gone() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_views_visibility_gone)
+
+        // The text1 and text2's visibility are gone, so the visible view starts from text3
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text4)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text4)).check(isCompletelyRightOf(withId(R.id.text3)))
+        onView(withId(R.id.text5)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text5)).check(isCompletelyBelow(withId(R.id.text3)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        val textView4 = activity.findViewById<TextView>(R.id.text4)
+        val textView5 = activity.findViewById<TextView>(R.id.text5)
+        assertThat(textView1.visibility, `is`(View.GONE))
+        assertThat(textView2.visibility, `is`(View.GONE))
+        assertThat(textView4.left, `is`(textView3.right))
+        assertThat(textView5.top, `is`(textView3.bottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_gone_first_item_in_flex_line_horizontal() {
+        // This test verifies if the FlexboxLayout is visible when the visibility of the first
+        // flex item in the second flex line (or arbitrary flex lines other than the first flex
+        // line) is set to "gone"
+        // There was an issue reported for that
+        // https://github.com/google/flexbox-layout/issues/47
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_visibility_gone_first_item_in_flex_line_row)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertTrue(flexboxLayout.height > 0)
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_gone_first_item_in_flex_line_vertical() {
+        // This test verifies if the FlexboxLayout is visible when the visibility of the first
+        // flex item in the second flex line (or arbitrary flex lines other than the first flex
+        // line) is set to "gone"
+        // There was an issue reported for that
+        // https://github.com/google/flexbox-layout/issues/47
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_visibility_gone_first_item_in_flex_line_column)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+
+        assertTrue(flexboxLayout.width > 0)
+        assertThat(flexboxLayout.width, `is`(textView1.width + textView3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testView_visibility_invisible() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_views_visibility_invisible)
+
+        // The text1 and text2's visibility are invisible, these views take space like visible views
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(textView1.visibility, `is`(View.INVISIBLE))
+        assertThat(textView2.visibility, `is`(View.INVISIBLE))
+        assertThat(textView3.top, `is`(textView1.bottom))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrapBefore() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_before_test)
+
+        // layout_wrapBefore for the text2 and text3 are set to true, the text2 and text3 should
+        // be the first item for each flex line.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        val textView1 = activity.findViewById<TextView>(R.id.text1)
+        val textView2 = activity.findViewById<TextView>(R.id.text2)
+        val textView3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView2.height + textView3.height))
+
+        activityRule.runOnUiThread {
+            val lp2 = textView2.layoutParams as FlexboxLayout.LayoutParams
+            lp2.isWrapBefore = false
+            textView2.layoutParams = lp2
+        }
+
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+        assertThat(flexboxLayout.height, `is`(textView1.height + textView3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrapBefore_nowrap() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_before_test,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexWrap = FlexWrap.NOWRAP
+                    }
+                })
+
+        // layout_wrapBefore for the text2 and text3 are set to true, but the flexWrap is set to
+        // NOWRAP, three text views should not be wrapped.
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_parentPadding_horizontal() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_parent_padding_horizontal_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // parent padding, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(flexboxLayout.height, `is`(flexboxLayout.paddingTop + flexboxLayout.paddingBottom +
+                text1.height + text2.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_parentPadding_vertical() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_parent_padding_vertical_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        // The sum of height of TextView1 and TextView2 is not enough for wrapping, but considering
+        // parent padding, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(flexboxLayout.width, `is`(flexboxLayout.paddingLeft + flexboxLayout.paddingRight +
+                text1.width + text2.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_childMargin_horizontal() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_wrap_child_margin_horizontal_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin for the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyBelow(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyRightOf(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val lp2 = text2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(flexboxLayout.height, `is`(text1.height + text2.height + lp2.topMargin +
+                lp2.bottomMargin))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstItemLarge_horizontal() {
+        // This test verifies a empty flex line is not added when the first flex item is large
+        // and judged wrapping is required with the first item.
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_first_item_large_horizontal_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin for the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.height, `is`(text1.height + text2.height + text3.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstItemLarge_vertical() {
+        // This test verifies a empty flex line is not added when the first flex item is large
+        // and judged wrapping is required with the first item.
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_first_item_large_vertical_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(flexboxLayout.alignContent, `is`(AlignContent.STRETCH))
+        // The sum of width of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin for the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        assertThat(flexboxLayout.width, `is`(text1.width + text2.width + text3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testWrap_childMargin_vertical() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_child_margin_vertical_test)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        // The sum of height of TextView1 and TextView2 is not enough for wrapping, but considering
+        // the margin of the TextView2, the second TextView should be wrapped
+        onView(withId(R.id.text2)).check(isCompletelyRightOf(withId(R.id.text1)))
+        onView(withId(R.id.text3)).check(isCompletelyBelow(withId(R.id.text2)))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val lp2 = text2.layoutParams as FlexboxLayout.LayoutParams
+        assertThat(flexboxLayout.width,
+                `is`(text1.width + text2.width + lp2.leftMargin + lp2.rightMargin))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testEmptyChildren() {
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children)
+
+        assertThat(flexboxLayout.childCount, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalBeginning() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_divider_test_direction_row)
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth
+        assertThat(text3.right, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 (divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                    }
+                }
+        )
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        // Three text views are placed in the first row, thus two vertical middle dividers should
+        // be placed
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth * 2
+        assertThat(text3.right, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 * 2(divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        // Three text views are placed in the first row, thus two vertical middle dividers should
+        // be placed
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth
+        assertThat(text3.right + divider.intrinsicWidth, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 (divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(290)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_verticalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        // Three text views are placed in the first row, thus two vertical middle dividers should
+        // be placed
+        val widthSumFirstRow = text1.width + text2.width + text3.width + divider!!.intrinsicWidth * 4
+        assertThat(text3.right + divider.intrinsicWidth, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3 + 10 * 4 (divider)
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(310)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        // The right should be 140 * 2 + 10 * 3 (divider)
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(310)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalBeginning() {
+        val activity = activityRule.activity
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight
+        assertThat(text4.bottom, `is`(heightSum))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // There is a horizontal divider at the beginning. Top and bottom coordinates are shifted
+        // by the amount of 15
+        // The right should be 90 * 3
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight
+        assertThat(text4.bottom, `is`(heightSum))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // There is a horizontal divider at the middle. Top and bottom coordinates are shifted
+        // by the amount of 15
+        val flexLine2 = flexLines[1]
+        // The right should be 140
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight
+        assertThat(text4.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        // The right should be 90 * 3
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // There is a horizontal divider at the middle. Top and bottom coordinates are shifted
+        // by the amount of 15
+        val flexLine2 = flexLines[1]
+        // The right should be 140
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(280)))
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_horizontalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text4.height + divider!!.intrinsicHeight * 3
+        assertThat(text4.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionRow_all_thickDivider() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_row,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val thickDivider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider_thick, null)
+                        flexboxLayout.dividerDrawableVertical = thickDivider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider_thick, null)
+        // The sum of three text views and the sum of thick dividers don't fit in one line.
+        // The last text view should be placed to the next line.
+        assertNotNull(divider)
+        val widthSumFirstRow = text1.width + text2.width + divider!!.intrinsicWidth * 3
+        assertThat(text2.right + divider.intrinsicWidth, `is`(widthSumFirstRow))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        assertThat(text3.bottom, `is`(text1.height + text2.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalBeginning() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_divider_test_direction_column)
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight
+        assertThat(text3.bottom, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(285)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(295)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight * 2
+        assertThat(text3.bottom, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15 * 2
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(300)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(295)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight
+        assertThat(text3.bottom + divider.intrinsicHeight, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(flexboxLayout.top))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(285)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(295)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_horizontalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                }
+        )
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSumFirstRow = text1.height + text2.height + text3.height + divider!!.intrinsicHeight * 4
+        assertThat(text3.bottom + divider.intrinsicHeight, `is`(heightSumFirstRow))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        val flexLines = flexboxLayout.flexLines
+        assertThat(flexLines.size, `is`(2))
+        val flexLine1 = flexLines[0]
+        assertThat(flexLine1.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 90 * 3 + 15 * 4
+        assertThat(flexLine1.mainSize, isEqualAllowingError(activity.dpToPixel(330)))
+        val flexLine2 = flexLines[1]
+        assertThat(flexLine2.crossSize, isEqualAllowingError(activity.dpToPixel(80)))
+        // The bottom should be 140 * 2 + 15 * 3
+        assertThat(flexLine2.mainSize, isEqualAllowingError(activity.dpToPixel(325)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalBeginning() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableVertical = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth
+        assertThat(text4.right, `is`(widthSum))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalMiddle() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableVertical = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_MIDDLE
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_MIDDLE))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth
+        assertThat(text4.right, `is`(widthSum))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalEnd() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableHorizontal = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical, `is`(FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerHorizontal, `is`(FlexboxLayout.SHOW_DIVIDER_NONE))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth
+        assertThat(text4.right + divider.intrinsicWidth, `is`(widthSum))
+        assertThat(text1.left, `is`(flexboxLayout.left))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_verticalAll() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.dividerDrawableVertical = divider
+                        flexboxLayout.showDividerVertical = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_NONE
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val widthSum = text1.width + text4.width + divider!!.intrinsicWidth * 3
+        assertThat(text4.right + divider.intrinsicWidth, `is`(widthSum))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_vertical_horizontal_All() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val divider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider, null)
+                        flexboxLayout.setDividerDrawable(divider)
+                        flexboxLayout.setShowDivider(
+                                FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END)
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerVertical,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val text4 = activity.findViewById<TextView>(R.id.text4)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        assertNotNull(divider)
+        val heightSum = text1.height + text2.height + text3.height + divider!!.intrinsicHeight * 4
+        val widthSum = text1.width + text4.width + divider.intrinsicWidth * 3
+        assertThat(text3.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text4.right + divider.intrinsicWidth, `is`(widthSum))
+        assertThat(text1.left, `is`(not(flexboxLayout.left)))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDivider_directionColumn_all_thickDivider() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_divider_test_direction_column,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        val thickDivider = ResourcesCompat
+                                .getDrawable(activity.resources, R.drawable.divider_thick, null)
+                        flexboxLayout.dividerDrawableHorizontal = thickDivider
+                        flexboxLayout.showDividerHorizontal = FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or FlexboxLayout.SHOW_DIVIDER_END
+                    }
+                })
+
+        assertThat(flexboxLayout.flexWrap, `is`(FlexWrap.WRAP))
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayout.showDividerHorizontal,
+                `is`(FlexboxLayout.SHOW_DIVIDER_BEGINNING or FlexboxLayout.SHOW_DIVIDER_MIDDLE or
+                        FlexboxLayout.SHOW_DIVIDER_END))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        val text3 = activity.findViewById<TextView>(R.id.text3)
+        val divider = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider_thick, null)
+        // The sum of three text views and the sum of thick dividers don't fit in one line.
+        // The last text view should be placed to the next line.
+        assertNotNull(divider)
+        val heightSum = text1.height + text2.height + divider!!.intrinsicHeight * 3
+        assertThat(text2.bottom + divider.intrinsicHeight, `is`(heightSum))
+        assertThat(text1.top, `is`(not(flexboxLayout.top)))
+        assertThat(text3.right, `is`(text1.width + text3.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testZeroWidth_wrapContentHeight_positiveFlexGrow() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_zero_width_positive_flexgrow)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        // Both text view's layout_width is set to 0dp, layout_height is set to wrap_content and
+        // layout_flexGrow is set to 1. And the text2 has a longer text than the text1.
+        // So if the cross size calculation (height) is wrong, the height of two text view do not
+        // match because text2 is trying to expand vertically.
+        // This assertion verifies that isn't happening. Finally both text views expand horizontally
+        // enough to contain their texts in one line.
+        assertThat(text1.height, `is`(text2.height))
+        assertThat(text1.width + text2.width, isEqualAllowingError(flexboxLayout.width))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testZeroHeight_wrapContentWidth_positiveFlexGrow() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_zero_height_positive_flexgrow)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        val text2 = activity.findViewById<TextView>(R.id.text2)
+        assertThat(text1.width, `is`(not(text2.width)))
+        assertThat(text1.height + text2.height, isEqualAllowingError(flexboxLayout.height))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_row_alignItems_center_margin_oneSide() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_direction_row_align_items_center_margin_oneside)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.ROW))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        assertThat(text1.top, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(flexboxLayout.bottom - text1.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexDirection_column_alignItems_center_margin_oneSide() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_direction_column_align_items_center_margin_oneside)
+
+        assertThat(flexboxLayout.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val text1 = activity.findViewById<TextView>(R.id.text1)
+        assertThat(text1.left, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(flexboxLayout.right - text1.right, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildBottomMarginIncluded_flexContainerWrapContent_directionRow_flexGrow() {
+        // This test is to verify the case where:
+        //   - layout_height is set to wrap_content for the FlexboxLayout
+        //   - Bottom (or top) margin is set to a child
+        //   - The child which the has the bottom (top) margin has the largest height in the
+        //     same flex line (or only a single child exists)
+        //   - The child has a positive layout_flexGrow attribute set
+        //  If these conditions were met, the height of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_row_grow)
+
+        // layout_height for text1: 24dp, layout_marginBottom: 12dp
+        assertThat(flexboxLayout.height, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildEndMarginIncluded_flexContainerWrapContent_directionColumn_flexGrow() {
+        // This test is to verify the case where:
+        //   - layout_width is set to wrap_content for the FlexboxLayout
+        //   - End (or start) margin is set to a child
+        //   - The child which the has the end (start) margin has the largest width in the
+        //     same flex line (or only a single child exists)
+        //   - The child has a positive layout_flexGrow attribute set
+        //  If these conditions were met, the width of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_column_grow)
+
+        // layout_width for text1: 24dp, layout_marginEnd: 12dp
+        assertThat(flexboxLayout.width, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildBottomMarginIncluded_flexContainerWrapContent_directionRow_flexShrink() {
+        // This test is to verify the case where:
+        //   - layout_height is set to wrap_content for the FlexboxLayout
+        //   - flex_wrap is set to nowrap for the FlexboxLayout
+        //   - Bottom (or top) margin is set to a child
+        //   - The child which the has the bottom (top) margin has the largest height in the
+        //     same flex line
+        //   - The child has a positive layout_flexShrink attribute set
+        //   - The sum of children width overflows parent's width (shrink will happen)
+        //  If these conditions were met, the height of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_row_shrink)
+
+        // layout_height for text1: 24dp, layout_marginBottom: 12dp
+        assertThat(flexboxLayout.height, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildBottomMarginIncluded_flexContainerWrapContent_directionColumn_flexShrink() {
+        // This test is to verify the case where:
+        //   - layout_width is set to wrap_content for the FlexboxLayout
+        //   - flex_wrap is set to nowrap for the FlexboxLayout
+        //   - End (or start) margin is set to a child
+        //   - The child which the has the end (start) margin has the largest width in the
+        //     same flex line
+        //   - The child has a positive layout_flexShrink attribute set
+        //   - The sum of children height overflows parent's height (shrink will happen)
+        //  If these conditions were met, the height of the FlexboxLayout didn't take the bottom
+        //  margin on the child into account
+        //  See https://github.com/google/flexbox-layout/issues/154
+        val flexboxLayout = createFlexboxLayout(
+                R.layout.activity_wrap_content_child_bottom_margin_column_shrink)
+
+        // layout_width for text1: 24dp, layout_marginEnd: 12dp
+        assertThat(flexboxLayout.width, isEqualAllowingError(activityRule.activity.dpToPixel(36)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildNeedsRemeasure_row() {
+        createFlexboxLayout(R.layout.activity_child_needs_remeasure_row)
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildNeedsRemeasure_column() {
+        createFlexboxLayout(R.layout.activity_child_needs_remeasure_column)
+        onView(withId(R.id.text1)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text1)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_firstLineSingleItem_row() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view is in the next flex line. In that case, the second view's position is misplaced.
+        // https://github.com/google/flexbox-layout/issues/283
+        createFlexboxLayout(R.layout.activity_first_view_gone_first_line_single_item)
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_firstLineSingleItem_column() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view is in the next flex line. In that case, the second view's position is misplaced.
+        // https://github.com/google/flexbox-layout/issues/283
+        createFlexboxLayout(R.layout.activity_first_view_gone_first_line_single_item,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexGrowSetForRestOfItems_row() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view and third view have the layout_flexGrow attribute set. In that case, the second
+        // view's position is misplaced and the third view becomes invisible .
+        // https://github.com/google/flexbox-layout/issues/303
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_grow_set_for_rest)
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isRightAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexGrowSetForRestOfItems_column() {
+        // This test verifies the case where the first view's visibility is gone and the second
+        // view and third view have the layout_flexGrow attribute set. In that case, the second
+        // view's position is misplaced and the third view becomes invisible .
+        // https://github.com/google/flexbox-layout/issues/303
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_grow_set_for_rest,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isBottomAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexShrinkSetForRestOfItems_row() {
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_shrink_set_for_rest)
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstViewGone_flexShrinkSetForRestOfItems_column() {
+        createFlexboxLayout(R.layout.activity_first_view_gone_layout_shrink_set_for_rest,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.flexDirection = FlexDirection.COLUMN
+                    }
+                })
+        onView(withId(R.id.text2)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text2)).check(isLeftAlignedWith(withId(R.id.flexbox_layout)))
+        onView(withId(R.id.text3)).check(isTopAlignedWith(withId(R.id.flexbox_layout)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddItemProgrammatically_withMarginLayoutParams() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children,
+        object : Configuration {
+            override fun apply(flexboxLayout: FlexboxLayout) {
+                flexboxLayout.alignItems = AlignItems.FLEX_START
+                val first = createTextView(activity, "1", 0)
+                val second = createTextView(activity, "2", 0)
+                val lp1 = ViewGroup.MarginLayoutParams(100, 100)
+                lp1.setMargins(10, 10, 10, 10)
+                val lp2 = ViewGroup.MarginLayoutParams(100, 100)
+                lp2.setMargins(20, 20, 20, 20)
+                first.layoutParams = lp1
+                second.layoutParams = lp2
+                flexboxLayout.addView(first)
+                flexboxLayout.addView(second)
+            }
+        })
+
+        assertThat(flexboxLayout.childCount, `is`(2))
+        val view1 = flexboxLayout.getChildAt(0)
+        val view2 = flexboxLayout.getChildAt(1)
+        // Assert the coordinates of the views added programmatically with margins
+        assertThat(view1.left, `is`(10))
+        assertThat(view1.top, `is`(10))
+        assertThat(view1.bottom, `is`(110))
+        assertThat(view1.right, `is`(110))
+        assertThat(view2.left, `is`(140))
+        assertThat(view2.top, `is`(20))
+        assertThat(view2.bottom, `is`(120))
+        assertThat(view2.right, `is`(240))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddItemProgrammatically_withFlexboxLayoutLayoutParams() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.alignItems = AlignItems.FLEX_START
+                        val first = createTextView(activity, "1", 0)
+                        val second = createTextView(activity, "2", 0)
+                        val lp1 = FlexboxLayout.LayoutParams(100, 100)
+                        lp1.setMargins(10, 10, 10, 10)
+                        val lp2 = FlexboxLayout.LayoutParams(100, 100)
+                        lp2.setMargins(20, 20, 20, 20)
+                        first.layoutParams = lp1
+                        second.layoutParams = lp2
+                        flexboxLayout.addView(first)
+                        flexboxLayout.addView(second)
+                    }
+                })
+
+        assertThat(flexboxLayout.childCount, `is`(2))
+        val view1 = flexboxLayout.getChildAt(0)
+        val view2 = flexboxLayout.getChildAt(1)
+        // Assert the coordinates of the views added programmatically with margins
+        assertThat(view1.left, `is`(10))
+        assertThat(view1.top, `is`(10))
+        assertThat(view1.bottom, `is`(110))
+        assertThat(view1.right, `is`(110))
+        assertThat(view2.left, `is`(140))
+        assertThat(view2.top, `is`(20))
+        assertThat(view2.bottom, `is`(120))
+        assertThat(view2.right, `is`(240))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxLines() {
+        val activity = activityRule.activity
+        val flexboxLayout = createFlexboxLayout(R.layout.activity_empty_children,
+                object : Configuration {
+                    override fun apply(flexboxLayout: FlexboxLayout) {
+                        flexboxLayout.maxLine = 3
+                        for (i in 1..50) {
+                            val textView = createTextView(activity, i.toString(), 0)
+                            val lp = FlexboxLayout.LayoutParams(100, 100)
+                            lp.flexShrink = 0f
+                            textView.layoutParams = lp
+                            flexboxLayout.addView(textView)
+                        }
+                    }
+                })
+        assertThat(flexboxLayout.childCount, `is`(50))
+        assertThat(flexboxLayout.flexLines.size, `is`(3))
+    }
+
+    @Throws(Throwable::class)
+    private fun createFlexboxLayout(@LayoutRes activityLayoutResId: Int,
+                                    configuration: Configuration = Configuration.EMPTY): FlexboxLayout {
+        val activity = activityRule.activity
+        activityRule.runOnUiThread {
+            activity.setContentView(activityLayoutResId)
+            val flexboxLayout = activity.findViewById<FlexboxLayout>(R.id.flexbox_layout)
+            configuration.apply(flexboxLayout)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        return activity.findViewById<View>(R.id.flexbox_layout) as FlexboxLayout
+    }
+
+    private fun createTextView(context: Context, text: String, order: Int): TextView {
+        val textView = TextView(context)
+        textView.text = text
+        val lp = FlexboxLayout.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        lp.order = order
+        textView.layoutParams = lp
+        return textView
+    }
+
+    private fun hasWidth(width: Int): ViewAssertion {
+        return matches(object : TypeSafeMatcher<View>() {
+            override fun describeTo(description: Description) {
+                description.appendText("expected width: $width")
+            }
+
+            override fun describeMismatchSafely(item: View, mismatchDescription: Description) {
+                mismatchDescription.appendText("actual width: " + item.width)
+            }
+
+            override fun matchesSafely(item: View) = item.width == width
+        })
+    }
+
+    private fun hasHeight(height: Int): ViewAssertion {
+        return matches(object : TypeSafeMatcher<View>() {
+            override fun describeTo(description: Description) {
+                description.appendText("expected height: $height")
+            }
+
+            override fun describeMismatchSafely(item: View, mismatchDescription: Description) {
+                mismatchDescription.appendText("actual height: " + item.height)
+            }
+
+            override fun matchesSafely(item: View) = item.height == height
+        })
+    }
+
+    private interface Configuration {
+
+        fun apply(flexboxLayout: FlexboxLayout)
+
+        companion object {
+            val EMPTY: Configuration = object : Configuration {
+                override fun apply(flexboxLayout: FlexboxLayout) = Unit
+            }
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerConfigChangeTest.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerConfigChangeTest.kt
new file mode 100755
index 0000000..e21a458
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerConfigChangeTest.kt
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+import android.content.pm.ActivityInfo
+import android.content.res.Configuration
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.*
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexboxLayoutManager
+import org.hamcrest.Matchers.`is`
+import org.hamcrest.core.IsNot.not
+import org.junit.Assert.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [FlexboxLayoutManager] with the Activity that handles configuration
+ * changes manually.
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class FlexboxLayoutManagerConfigChangeTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(ConfigChangeActivity::class.java)
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexLinesDiscardedOnOrientationChange_direction_row() {
+        // Verifies the case that the calculated Flex lines are correctly discarded when a
+        // orientation happens with an Activity that handles configuration changes manually
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            // This test assumes that the screen width and the height are different.
+            recyclerView.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            recyclerView.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..99) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstLine = layoutManager.flexLines[0]
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(0) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val firstLineAfterRotation = layoutManager.flexLines[0]
+        assertThat(firstLine.mainSize, `is`(not(firstLineAfterRotation.mainSize)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexLinesDiscardedOnOrientationChange_direction_column() {
+        // Verifies the case that the calculated Flex lines are correctly discarded when a
+        // orientation happens with an Activity that handles configuration changes manually
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            // This test assumes that the screen width and the height are different.
+            recyclerView.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            recyclerView.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..99) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstLine = layoutManager.flexLines[0]
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(0) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val firstLineAfterRotation = layoutManager.flexLines[0]
+        assertThat(firstLine.mainSize, `is`(not(firstLineAfterRotation.mainSize)))
+    }
+
+    /**
+     * Creates a new flex item.
+     *
+     * @param context the context
+     * @param width   in DP
+     * @param height  in DP
+     * @return the created [FlexboxLayoutManager.LayoutParams] instance
+     */
+    private fun createLayoutParams(context: Context, width: Int,
+                                   height: Int): FlexboxLayoutManager.LayoutParams {
+        return FlexboxLayoutManager.LayoutParams(context.dpToPixel(width), context.dpToPixel(height))
+    }
+
+    private fun swipe(from: CoordinatesProvider, to: CoordinatesProvider): ViewAction {
+        return GeneralSwipeAction(Swipe.FAST, from, to, Press.FINGER)
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt
new file mode 100755
index 0000000..26e6da6
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt
@@ -0,0 +1,3503 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+import android.content.pm.ActivityInfo
+import android.content.res.Configuration
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.CoordinatesProvider
+import androidx.test.espresso.action.GeneralLocation
+import androidx.test.espresso.action.GeneralSwipeAction
+import androidx.test.espresso.action.Press
+import androidx.test.espresso.action.Swipe
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
+import androidx.test.filters.MediumTest
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
+import com.google.android.flexbox.AlignItems
+import com.google.android.flexbox.AlignSelf
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxItemDecoration
+import com.google.android.flexbox.FlexboxItemDecoration.HORIZONTAL
+import com.google.android.flexbox.FlexboxItemDecoration.VERTICAL
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.google.android.flexbox.JustifyContent
+import com.google.android.flexbox.test.IsEqualAllowingError.Companion.isEqualAllowingError
+import org.hamcrest.Matchers.`is`
+import org.hamcrest.Matchers.instanceOf
+import org.hamcrest.Matchers.lessThan
+import org.hamcrest.Matchers.notNullValue
+import org.hamcrest.core.IsNot.not
+import org.junit.Assert.assertThat
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Integration tests for [FlexboxLayoutManager].
+ */
+@RunWith(AndroidJUnit4::class)
+@MediumTest
+class FlexboxLayoutManagerTest {
+
+    @JvmField
+    @Rule
+    var activityRule = ActivityTestRule(FlexboxTestActivity::class.java)
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLoadFromXml() {
+        val activity = activityRule.activity
+        activityRule.runOnUiThread { activity.setContentView(R.layout.recyclerview_reverse) }
+        val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        val layoutManager = recyclerView.layoutManager
+        assertThat(recyclerView, `is`(notNullValue()))
+        assertThat(layoutManager, `is`(instanceOf<Any>(FlexboxLayoutManager::class.java)))
+        val flexboxLayoutManager = layoutManager as FlexboxLayoutManager
+        assertThat(flexboxLayoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(flexboxLayoutManager.flexWrap, `is`(FlexWrap.WRAP))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChangeAttributesFromCode() {
+        val activity = activityRule.activity
+        activityRule.runOnUiThread { activity.setContentView(R.layout.recyclerview_reverse) }
+        val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        val layoutManager = recyclerView.layoutManager
+        assertThat(recyclerView, `is`(notNullValue()))
+        assertThat(layoutManager, `is`(instanceOf<Any>(FlexboxLayoutManager::class.java)))
+        val flexboxLayoutManager = layoutManager as FlexboxLayoutManager
+        assertThat(flexboxLayoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(flexboxLayoutManager.flexWrap, `is`(FlexWrap.WRAP))
+
+        flexboxLayoutManager.flexDirection = FlexDirection.COLUMN
+        flexboxLayoutManager.flexWrap = FlexWrap.NOWRAP
+        flexboxLayoutManager.justifyContent = JustifyContent.CENTER
+        flexboxLayoutManager.alignItems = AlignItems.FLEX_END
+        assertThat(flexboxLayoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(flexboxLayoutManager.flexWrap, `is`(FlexWrap.NOWRAP))
+        assertThat(flexboxLayoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(flexboxLayoutManager.alignItems, `is`(AlignItems.FLEX_END))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_not_wrapped() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.flexWrap, `is`(FlexWrap.WRAP))
+        // Only 2 items are added and all items should be attached (visible). So both
+        // getChildCount and getFlexItemCount(including detached items) should return the same value
+        assertThat(layoutManager.flexItemCount, `is`(2))
+        assertThat(layoutManager.childCount, `is`(2))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_wrapped() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+            adapter.addItem(createLayoutParams(activity, 120, 80))
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // 4 items are added and all items should be attached (visible). So both
+        // getChildCount and getFlexItemCount(including detached items) should return the same value
+        assertThat(layoutManager.flexItemCount, `is`(4))
+        assertThat(layoutManager.childCount, `is`(4))
+        assertThat(layoutManager.flexLines.size, `is`(2))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_partOfItems_detached() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 320, height: 450
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items follow aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_row_scrollVertically() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            adapter.addItem(createLayoutParams(activity, 150, 90))
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 320, height: 450
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items follow aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        // The RecyclerView is swiped to top until it reaches the bottom of the view.
+        // The number of the visible views should be 5
+        assertThat(layoutManager.childCount, `is`(5))
+        // Since the RecyclerView is swiped to the bottom, all flex lines should be calculated
+        // by now
+        assertThat(layoutManager.flexLines.size, `is`(5))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 150, 130)
+            lp1.flexGrow = 1.0f
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 150, 130)
+            lp2.flexGrow = 1.0f
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 150, 130)
+            lp3.flexGrow = 1.0f
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // The flexGrow parameters for all LayoutParams are set to 1.0, expecting each child to
+        // fill the horizontal remaining space
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(2))
+        assertThat(layoutManager.getChildAt(0)!!.width, isEqualAllowingError(activity.dpToPixel(160)))
+        assertThat(layoutManager.getChildAt(1)!!.width, isEqualAllowingError(activity.dpToPixel(160)))
+        assertThat(layoutManager.getChildAt(2)!!.width, isEqualAllowingError(activity.dpToPixel(320)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_column_partOfItems_detached() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 450, height: 240
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items after aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAddViewHolders_direction_column_scrollHorizontally() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+            adapter.addItem(createLayoutParams(activity, 120, 100))
+
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            // RecyclerView width: 320, height: 240.
+            // Computed FlexContainer width: 500, height: 240
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // In total 9 items are added but the seventh item and the items follow aren't attached
+        // (invisible) so are not included in the count of of the getChildCount.
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        assertThat(layoutManager.childCount, `is`(6))
+        // At first only the visible area of the flex lines are calculated
+        assertThat(layoutManager.flexLines.size, `is`(3))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        assertThat(layoutManager.flexItemCount, `is`(9))
+        // The RecyclerView is swiped to top until it reaches the right edge of the view.
+        // The number of the visible views should be 5
+        assertThat(layoutManager.childCount, `is`(5))
+        // Since the RecyclerView is swiped to the bottom, all flex lines should be calculated
+        // by now
+        assertThat(layoutManager.flexLines.size, `is`(5))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(150)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(170)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(220)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(220)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(320)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(85)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(235)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(28)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(78)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(242)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(292)))
+    }
+
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(43)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(93)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(228)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(278)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(320)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(320)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(220)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(170)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(220)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(150)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(235)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(85)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(135)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(242)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(292)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(28)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(78)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(228)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(278)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(43)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(93)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 50, 100)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.left, isEqualAllowingError(activity.dpToPixel(270)))
+        assertThat(view0.right, isEqualAllowingError(activity.dpToPixel(320)))
+        assertThat(view1.left, isEqualAllowingError(activity.dpToPixel(135)))
+        assertThat(view1.right, isEqualAllowingError(activity.dpToPixel(185)))
+        assertThat(view2.left, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.right, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(150)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(90)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(140)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(140)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(45)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(195)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(15)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(65)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(175)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(225)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(23)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(73)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(167)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(217)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexStart_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_START
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(140)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(90)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(140)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_flexEnd_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.FLEX_END
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.FLEX_END))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(150)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_center_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.CENTER
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.CENTER))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(195)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(45)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(95)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceAround_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_AROUND
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_AROUND))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(175)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(225)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(15)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(65)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceEvenly_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_EVENLY
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_EVENLY))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(167)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(217)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(23)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(73)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testJustifyContent_spaceBetween_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 50)
+            adapter.addItem(lp3)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            layoutManager.justifyContent = JustifyContent.SPACE_BETWEEN
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        assertThat(layoutManager.justifyContent, `is`(JustifyContent.SPACE_BETWEEN))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        val view0 = layoutManager.getChildAt(0)!!
+        val view1 = layoutManager.getChildAt(1)!!
+        val view2 = layoutManager.getChildAt(2)!!
+        assertThat(view0.top, isEqualAllowingError(activity.dpToPixel(190)))
+        assertThat(view0.bottom, isEqualAllowingError(activity.dpToPixel(240)))
+        assertThat(view1.top, isEqualAllowingError(activity.dpToPixel(95)))
+        assertThat(view1.bottom, isEqualAllowingError(activity.dpToPixel(145)))
+        assertThat(view2.top, isEqualAllowingError(activity.dpToPixel(0)))
+        assertThat(view2.bottom, isEqualAllowingError(activity.dpToPixel(50)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLargeItem_scrollFast_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..199) {
+                val lp = createLayoutParams(activity, 100, 50)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // Should be scrolled to the bottom by now
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        // Should be scrolled to the top
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLargeItem_scrollFast_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..199) {
+                val lp = createLayoutParams(activity, 70, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+
+        // Should be scrolled to the right edge by now
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        // Should be scrolled to the left edge by now
+        assertThat(layoutManager.flexItemCount, `is`(200))
+        // Only the visible items
+        assertThat(layoutManager.childCount, `is`(not(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_stretch_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 70, 80)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 70, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 70, 30)
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify all items heights are stretched
+        assertThat(layoutManager.getChildAt(0)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(2)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignItems_stretch_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 80, 70)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 70)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 30, 70)
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify all items widths are stretched
+        assertThat(layoutManager.getChildAt(0)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(2)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 70, 80)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 70, 50)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 70, 30)
+            lp3.alignSelf = AlignSelf.STRETCH
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify the item whose align self is set to stretch is stretched
+        assertThat(layoutManager.getChildAt(0)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.height, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(layoutManager.getChildAt(2)!!.height, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testAlignSelf_stretch_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 80, 70)
+            adapter.addItem(lp1)
+            val lp2 = createLayoutParams(activity, 50, 70)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 30, 70)
+            lp3.alignSelf = AlignSelf.STRETCH
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.FLEX_START))
+        assertThat(layoutManager.flexItemCount, `is`(3))
+        assertThat(layoutManager.flexLines.size, `is`(1))
+        // Verify the item whose align self is set to stretch is stretched
+        assertThat(layoutManager.getChildAt(0)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+        assertThat(layoutManager.getChildAt(1)!!.width, isEqualAllowingError(activity.dpToPixel(50)))
+        assertThat(layoutManager.getChildAt(2)!!.width, isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testStretchViews_from_middle_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        activityRule.runOnUiThread {
+            layoutManager.alignItems = AlignItems.STRETCH
+            val lp = createLayoutParams(activity, 70, 20)
+            // Add an item whose height is less than the other items.
+            // But with alignItems set to stretch, the height of the item should be stretched
+            adapter.addItem(lp)
+            adapter.notifyDataSetChanged()
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.getChildAt(layoutManager.childCount - 1)!!.height,
+                isEqualAllowingError(activity.dpToPixel(80)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testStretchViews_from_middle_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 50)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.alignItems, `is`(AlignItems.STRETCH))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_RIGHT,
+                GeneralLocation.TOP_LEFT))
+        activityRule.runOnUiThread {
+            layoutManager.alignItems = AlignItems.STRETCH
+            val lp = createLayoutParams(activity, 20, 50)
+            // Add an item whose width is less than the other items.
+            // But with alignItems set to stretch, the width of the item should be stretched
+            adapter.addItem(lp)
+            adapter.notifyDataSetChanged()
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.getChildAt(layoutManager.childCount - 1)!!.width,
+                isEqualAllowingError(activity.dpToPixel(70)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToTop_middleItem_as_anchorPosition() {
+        // There was an issue that the anchor position was based on the first item in the first
+        // visible flex line when scrolling to top. But the anchor position should be based on the
+        // flex line position (view which has the minimum top position in the same flex line)
+        // This test verifies the issue is fixed.
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val positionInSecondLine = 6
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                var lp = createLayoutParams(activity, 70, 80)
+                if (i == positionInSecondLine) {
+                    // Change the height from other items in the second line, not the first item
+                    // in the second line
+                    lp = createLayoutParams(activity, 70, 130)
+                }
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (320 / 70) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // Now scrolling to the top to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        assertThat(layoutManager.getChildAt(positionInSecondLine)!!.bottom,
+                isEqualAllowingError(activity.dpToPixel(210))) // 80 + 130
+        // Verify that the view in the same line's cross axis position is correct
+        assertThat(layoutManager.getChildAt(positionInSecondLine - 1)!!.bottom,
+                isEqualAllowingError(activity.dpToPixel(160))) // 80 + 80
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToLeft_middleItem_as_anchorPosition() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val positionInSecondLine = 6
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                var lp = createLayoutParams(activity, 80, 50)
+                if (i == positionInSecondLine) {
+                    // Change the width from other items in the second line, not the first item
+                    // in the second line
+                    lp = createLayoutParams(activity, 130, 50)
+                }
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (240 / 50) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        // By this moment reached to the right edge
+
+        // Now scrolling to the left to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+
+        assertThat(layoutManager.getChildAt(positionInSecondLine)!!.right,
+                isEqualAllowingError(activity.dpToPixel(210))) // 80 + 130
+        // Verify that the view in the same line's cross axis position is correct
+        assertThat(layoutManager.getChildAt(positionInSecondLine - 1)!!.right,
+                isEqualAllowingError(activity.dpToPixel(160))) // 80 + 80
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToBottom_middleItem_as_anchorPosition() {
+        // There was an issue that the anchor position was based on the last item in the last
+        // visible flex line when scrolling to bottom. But the anchor position should be based on
+        // the flex line position (view which has the maximum bottom position in the same flex line)
+        // This test verifies the issue is fixed.
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val positionInSecondBottomLine = 45
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                var lp = createLayoutParams(activity, 70, 80)
+                if (i == positionInSecondBottomLine) {
+                    // Change the height from other items in the second bottom line
+                    lp = createLayoutParams(activity, 70, 130)
+                }
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (320 / 70) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // 4 comes from the number of flex items - positionInSecondBottomLine
+        val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        val anchorView = layoutManager.getChildAt(layoutManager.childCount - 4)
+        assertThat(recyclerView.bottom - anchorView!!.top,
+                isEqualAllowingError(activity.dpToPixel(210))) // 80 + 130
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToTop_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Each line has 4 (320 / 70) flex items and 12 (50 / 4) lines in total
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // Now scrolling to the top to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        assertThat((layoutManager.getChildAt(0) as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_only_oneItem_has_positive_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..3) {
+                val lp = createLayoutParams(activity, 100, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 1 item
+            // Give the second item in the first line a positive flex grow
+            adapter.getItemAt(0).setHeight(activity.dpToPixel(140))
+            adapter.getItemAt(1).flexGrow = 1.0f
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        // Verify the vertical position (cross size) of the second line is correctly positioned
+        assertThat(layoutManager.getChildAt(3)!!.top, isEqualAllowingError(activity.dpToPixel(140)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFlexGrow_only_oneItem_has_positive_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..3) {
+                val lp = createLayoutParams(activity, 70, 70)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 1 item
+            // Give the second item in the first line a positive flex grow
+            adapter.getItemAt(0).setWidth(activity.dpToPixel(120))
+            adapter.getItemAt(1).flexGrow = 1.0f
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        // Verify the horizontal position (cross size) of the second line is correctly positioned
+        assertThat(layoutManager.getChildAt(3)!!.left, isEqualAllowingError(activity.dpToPixel(120)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFirstReferenceView_middleOf_line_used_as_anchor() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_END
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp1 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp1)
+            // The second view in the first line has the maximum height in the same line
+            val lp2 = createLayoutParams(activity, 100, 180)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp3)
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 80)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        // Now scrolling to the top to see if the views in the first flex line is correctly placed
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        // The top coordinate of the first view should be the height of the second view minus the
+        // height of the first view (180 - 80)
+        assertThat(layoutManager.getChildAt(0)!!.top, isEqualAllowingError(activity.dpToPixel(100)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testLastReferenceView_middleOf_line_used_as_anchor() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.FLEX_START
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 80)
+                adapter.addItem(lp)
+            }
+            val lp1 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp1)
+            // The second view in the last line has the maximum height in the same line
+            val lp2 = createLayoutParams(activity, 100, 180)
+            adapter.addItem(lp2)
+            val lp3 = createLayoutParams(activity, 100, 80)
+            adapter.addItem(lp3)
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // By this moment reached to the bottom
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        // The bottom coordinate of the first view in the last line should be the height of the
+        // second view in the last line minus the height of the first view in the last line
+        // (180 - 80)
+        assertThat(layoutManager.getChildAt(layoutManager.childCount - 2)!!.bottom
+                - layoutManager.getChildAt(layoutManager.childCount - 3)!!.bottom,
+                isEqualAllowingError(activity.dpToPixel(100)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testRotateScreen_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.CENTER))
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        val anchorView = layoutManager.getChildAt(0)
+        val offset = anchorView!!.top
+        assertTrue(offset < 0)
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Verify that offset position is preserved for the first visible view after the rotation
+        val anchorAfterRotate = layoutManager.getChildAt(0)
+        assertTrue(anchorAfterRotate!!.top < 0)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testRotateScreen_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.alignItems = AlignItems.STRETCH
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER))
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        val anchorView = layoutManager.getChildAt(0)
+        val offset = anchorView!!.left
+        assertTrue(offset < 0)
+
+        activityRule.runOnUiThread {
+            val orientation = activity.resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+            } else {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Verify that offset position is preserved for the first visible view after the rotation
+        val anchorAfterRotate = layoutManager.getChildAt(0)
+        assertTrue(anchorAfterRotate!!.left < 0)
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        var view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view2!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        var view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view3!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+        var view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        var view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width)
+        assertThat(view2!!.left, isEqualAllowingError(activity.dpToPixel(90)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 90(view width)
+        assertThat(view3!!.left, isEqualAllowingError(activity.dpToPixel(180)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view2!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view3!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 100 (view height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_rowReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW_REVERSE
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 100)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW_REVERSE))
+        var view1 = layoutManager.getChildAt(0)
+        var view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view1!!.right - view2!!.right, isEqualAllowingError(activity.dpToPixel(100)))
+        var view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view1.right - view3!!.right, isEqualAllowingError(activity.dpToPixel(200)))
+        var view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        var view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width)
+        assertThat(view1!!.right - view2!!.right, isEqualAllowingError(activity.dpToPixel(90)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 90(view width)
+        assertThat(view1.right - view3!!.right, isEqualAllowingError(activity.dpToPixel(180)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height) + 15 (divider height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(115)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 15 (divider height) + 100 (view height) + 15 (divider height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(230)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view1!!.right - view2!!.right,
+                isEqualAllowingError(activity.dpToPixel(100)))
+        view3 = layoutManager.getChildAt(2)
+        // 90 (view width) + 10 (divider width) + 90(view width) + 10 (divider width)
+        assertThat(view1.right - view3!!.right,
+                isEqualAllowingError(activity.dpToPixel(200)))
+        view4 = layoutManager.getChildAt(3)
+        // 100 (view height)
+        assertThat(view4!!.top, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 100 (view height) + 100 (view height)
+        assertThat(view7!!.top, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        var view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        var view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        var view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        var view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(90)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 90 (view width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(180)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height)
+        assertThat(view2!!.top, isEqualAllowingError(activity.dpToPixel(65)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 65 (view height)
+        assertThat(view3!!.top, isEqualAllowingError(activity.dpToPixel(130)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDecoration_direction_columnReverse() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val drawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        val itemDecoration = FlexboxItemDecoration(activity)
+        itemDecoration.setDrawable(drawable)
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN_REVERSE
+            recyclerView.layoutManager = layoutManager
+            recyclerView.addItemDecoration(itemDecoration)
+            recyclerView.adapter = adapter
+
+            for (i in 0..9) {
+                val lp = createLayoutParams(activity, 90, 65)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN_REVERSE))
+        var view1 = layoutManager.getChildAt(0)
+        var view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view1!!.top - view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        var view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view1.top - view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        var view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        var view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(HORIZONTAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height) + 15 (divider height)
+        assertThat(view1!!.top - view2!!.top, isEqualAllowingError(activity.dpToPixel(80)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 15 (divider height) + 65 (view height) + 15 (divider height)
+        assertThat(view1.top - view3!!.top, isEqualAllowingError(activity.dpToPixel(160)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(90)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 90 (view width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(180)))
+
+        activityRule.runOnUiThread {
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.removeItemDecoration(itemDecoration)
+            itemDecoration.setOrientation(VERTICAL)
+            recyclerView.addItemDecoration(itemDecoration)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        view1 = layoutManager.getChildAt(0)
+        view2 = layoutManager.getChildAt(1)
+        // 65 (view height)
+        assertThat(view1!!.top - view2!!.top, isEqualAllowingError(activity.dpToPixel(65)))
+        view3 = layoutManager.getChildAt(2)
+        // 65 (view height) + 65 (view height)
+        assertThat(view1.top - view3!!.top, isEqualAllowingError(activity.dpToPixel(130)))
+        view4 = layoutManager.getChildAt(3)
+        // 90 (view width) + 10 (divider width)
+        assertThat(view4!!.left, isEqualAllowingError(activity.dpToPixel(100)))
+        view7 = layoutManager.getChildAt(6)
+        // 90 (view width) + 10 (divider width) + 90 (view width) + 10 (divider width)
+        assertThat(view7!!.left, isEqualAllowingError(activity.dpToPixel(200)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..149) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+            // ....
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        val scrollTo = 42
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Each flex line should have 3 items in this test's configuration.
+        // After scrolling to the position of 42 (% 3 == 0), the first visible item should
+        // be the 42'th item
+        assertThat((layoutManager.getChildAt(0) as TextView).text.toString(),
+                `is`((scrollTo + 1).toString()))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // Scroll enough that 42'th item becomes off screen to the top
+
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // The 42'th item should be at the bottom of the screen.
+        // The last visible item should be 42 + 3 since the last visible item is at the last
+        // of the bottom flex line
+        assertThat((layoutManager.getChildAt(layoutManager.childCount - 1) as TextView).text.toString(),
+                `is`((scrollTo + 3).toString()))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..149) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+            // ....
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+
+        val scrollTo = 42
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Each flex line should have 3 items in this test's configuration.
+        // After scrolling to the position of 42 (% 3 == 0), the first visible item should
+        // be the 42'th item
+        assertThat((layoutManager.getChildAt(0) as TextView).text.toString(),
+                `is`((scrollTo + 1).toString()))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        // Scroll enough that 42'th item becomes off screen to the left
+
+        activityRule.runOnUiThread { layoutManager.scrollToPosition(scrollTo) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // The 42'th item should be at the bottom of the screen.
+        // The last item should be the (42 + 3)'th item since it should be also the last item in the
+        // bottom flex line
+        assertThat((layoutManager.getChildAt(layoutManager.childCount - 1) as TextView).text.toString(),
+                `is`((scrollTo + 3).toString()))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_scrollToNewItem_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..5) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // There should be 2 lines
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 100, 70)
+            adapter.addItem(lp)
+            layoutManager.scrollToPosition(adapter.itemCount - 1)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // ChildCount (visible views) should be 6 + 1,
+        // which before fixing https://github.com/google/flexbox-layout/issues/206, only the new
+        // item was visible
+        assertThat(layoutManager.childCount, `is`(7))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToPosition_scrollToNewItem_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..5) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // There should be 2 lines
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 3 items
+            // Flex line 2: 3 items
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 100, 70)
+            adapter.addItem(lp)
+            layoutManager.scrollToPosition(adapter.itemCount - 1)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // ChildCount (visible views) should be 6 + 1,
+        // which before fixing https://github.com/google/flexbox-layout/issues/206, only the new
+        // item was visible
+        assertThat(layoutManager.childCount, `is`(7))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollToStart_secondLineHasMoreItemThanFirst() {
+        // This test verifies the case that the first line disappears as the user first scrolls to
+        // the bottom enough that the first line becomes invisible then the user scrolls toward
+        // start on the condition that the second line has more items than the first line
+        // https://github.com/google/flexbox-layout/issues/228
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val first = FlexboxLayoutManager.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, activity.dpToPixel(70))
+            adapter.addItem(first)
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // The first line has 1 item, the following lines have more than 1 items
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 1 items
+            // Flex line 2: 3 items
+            // Flex line 3: 3 items
+            // ...
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        // At this moment, the first item should become invisible
+        var firstView = layoutManager.getChildAt(0)
+        assertThat((firstView as TextView).text.toString(), `is`(not("1")))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        // The first visible item should be "1", which before fixing the issue
+        // https://github.com/google/flexbox-layout/issues/228, the first line disappeared.
+        firstView = layoutManager.getChildAt(0)
+        assertThat((firstView as TextView).text.toString(), `is`("1"))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNestedRecyclerViews_direction_row() {
+        // This test verifies the nested RecyclerViews.
+        // The outer RecyclerView scrolls vertical using LinearLayoutManager.
+        // The inner RecyclerViews use FlexboxLayoutManager with flexDirection == ROW and
+        // height of the RecyclerView is set to "wrap_content", which before fixing
+        // https://github.com/google/flexbox-layout/issues/208, the height of the inner
+        // RecyclerViews were set to 0.
+        val activity = activityRule.activity
+        val outerLayoutManager = LinearLayoutManager(activity)
+
+        // Give the inner adapter item count enough so that inner RecyclerView with
+        // FlexboxLayoutManager wraps its items
+        val innerAdapterItemCount = 20
+        val adapter = NestedOuterAdapter(FlexDirection.ROW,
+                innerAdapterItemCount, R.layout.viewholder_inner_recyclerview)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            outerLayoutManager.orientation = LinearLayoutManager.VERTICAL
+            recyclerView.layoutManager = outerLayoutManager
+            recyclerView.adapter = adapter
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val viewHolder = adapter.getViewHolder(0)
+        val innerRecyclerView = viewHolder.innerRecyclerView
+        assertThat(innerRecyclerView.height, `is`(not(0)))
+
+        // This assertion verifies that inner RecyclerView displays the entire items including
+        // wrapped lines to verify the issue that nested RecyclerView with FlexboxLayoutManager
+        // only displayed one line https://github.com/google/flexbox-layout/issues/290
+        assertThat((innerRecyclerView.layoutManager as FlexboxLayoutManager).findLastVisibleItemPosition(),
+                `is`(innerAdapterItemCount - 1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNestedRecyclerViews_direction_column() {
+        // This test verifies the nested RecyclerViews.
+        // The outer RecyclerView scrolls horizontally using LinearLayoutManager.
+        // The inner RecyclerViews use FlexboxLayoutManager with flexDirection == COLUMN and
+        // width of the RecyclerView is set to "wrap_content", which before fixing
+        // https://github.com/google/flexbox-layout/issues/208, the width of the inner
+        // RecyclerViews were set to 0.
+        val activity = activityRule.activity
+        val outerLayoutManager = LinearLayoutManager(activity)
+
+        // Give the inner adapter item count enough so that inner RecyclerView with
+        // FlexboxLayoutManager wraps its items
+        val innerAdapterItemCount = 20
+        val adapter = NestedOuterAdapter(FlexDirection.COLUMN,
+                innerAdapterItemCount, R.layout.viewholder_inner_recyclerview_wrap_horizontally)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            outerLayoutManager.orientation = LinearLayoutManager.HORIZONTAL
+            recyclerView.layoutManager = outerLayoutManager
+            recyclerView.adapter = adapter
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val viewHolder = adapter.getViewHolder(0)
+        val innerRecyclerView = viewHolder.innerRecyclerView
+        assertThat(innerRecyclerView.width, `is`(not(0)))
+
+        // This assertion verifies that inner RecyclerView displays the entire items including
+        // wrapped lines to verify the issue that nested RecyclerView with FlexboxLayoutManager
+        // only displayed one line https://github.com/google/flexbox-layout/issues/290
+        assertThat((innerRecyclerView.layoutManager as FlexboxLayoutManager).findLastVisibleItemPosition(),
+                `is`(innerAdapterItemCount - 1))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFindVisibleChild_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // At first three completely visible lines.
+            // Flex line 1, item count 3 (0, 1, 2)
+            // Flex line 2, item count 3 (3, 4, 5)
+            // Flex line 3, item count 3 (6, 7, 8)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(8))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(11))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(42))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(39))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(49))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(49))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testFindVisibleChild_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+            // RecyclerView width: 320, height: 240.
+            // At first three completely visible lines.
+            // Flex line 1, item count 3 (0, 1, 2)
+            // Flex line 2, item count 3 (3, 4, 5)
+            // Flex line 3, item count 3 (6, 7, 8)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(0))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(8))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(11))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(layoutManager.findFirstCompletelyVisibleItemPosition(), `is`(42))
+        assertThat(layoutManager.findFirstVisibleItemPosition(), `is`(39))
+        assertThat(layoutManager.findLastCompletelyVisibleItemPosition(), `is`(49))
+        assertThat(layoutManager.findLastVisibleItemPosition(), `is`(49))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDrawDirtyFlexLine_direction_row() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // First scroll to the bottom, then add a new item that isn't visible at this moment.
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 40, 75)
+            adapter.addItem(0, lp)
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstVisible = layoutManager.getChildAt(0)
+        assertThat(firstVisible!!.width, isEqualAllowingError(activity.dpToPixel(40)))
+        assertThat(firstVisible.height, isEqualAllowingError(activity.dpToPixel(75)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDrawDirtyFlexLine_direction_column() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+
+            for (i in 0..29) {
+                val lp = createLayoutParams(activity, 100, 75)
+                adapter.addItem(lp)
+            }
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // First scroll to the bottom, then add a new item that isn't visible at this moment.
+        activityRule.runOnUiThread {
+            val lp = createLayoutParams(activity, 100, 120)
+            adapter.addItem(0, lp)
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        val firstVisible = layoutManager.getChildAt(0)
+        assertThat(firstVisible!!.width, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(firstVisible.height, isEqualAllowingError(activity.dpToPixel(120)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testDrawDirtyFlexLine_multi_viewTypes_direction_row() {
+        // This test verifies https://github.com/google/flexbox-layout/issues/280
+        // the position of the view type is shifted if a new item is inserted before the
+        // view which has the special viewType and that view isn't visible at the time the item
+        // was inserted.
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapterMultiViewTypes()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val parent = activity.findViewById<RecyclerView>(R.id.recyclerview)
+        var matchParentText = layoutManager
+                .getChildAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT) as TextView
+        assertThat(matchParentText.width, `is`(parent.width))
+        assertThat(matchParentText.text.toString(),
+                `is`<String>((TestAdapterMultiViewTypes.POSITION_MATCH_PARENT + 1).toString()))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+
+        val insertedValue = 10
+        activityRule.runOnUiThread {
+            val item = TestAdapterMultiViewTypes.Item()
+            item.value = insertedValue
+            // Insert an item before the position that has a special viewType
+            adapter.addItemAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT - 1, item)
+        }
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        // Since a new item is inserted before the position, the index at the view who has the
+        // special viewType should be shifted.
+        matchParentText = layoutManager
+                .getChildAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT + 1) as TextView
+        assertThat(matchParentText.width, `is`(parent.width))
+        assertThat(matchParentText.text.toString(),
+                `is`<String>((TestAdapterMultiViewTypes.POSITION_MATCH_PARENT + 1).toString()))
+
+        // The position of this view is the old position who had the special viewType, but
+        // now the viewType should be a normal one
+        val textView = layoutManager
+                .getChildAt(TestAdapterMultiViewTypes.POSITION_MATCH_PARENT - 1) as TextView
+        assertThat(textView.width, lessThan(parent.width))
+        assertThat(textView.text.toString(), `is`(insertedValue.toString()))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testChildrenSizeWithMargin() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp = createLayoutParams(activity, 100, 30)
+            lp.setMargins(10, 30, 20, 40)
+            adapter.addItem(lp)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val text = layoutManager.getChildAt(0) as TextView
+        val lp = text.layoutParams as FlexboxLayoutManager.LayoutParams
+        assertThat(text.height, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(text.width, isEqualAllowingError(activity.dpToPixel(100)))
+        assertThat(lp.marginLeft, isEqualAllowingError(10))
+        assertThat(lp.marginRight, isEqualAllowingError(20))
+        assertThat(lp.marginTop, isEqualAllowingError(30))
+        assertThat(lp.marginBottom, isEqualAllowingError(40))
+        activityRule.runOnUiThread { layoutManager.flexDirection = FlexDirection.COLUMN }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val text2 = layoutManager.getChildAt(0) as TextView
+        assertThat(text2.height, isEqualAllowingError(activity.dpToPixel(30)))
+        assertThat(text2.width, isEqualAllowingError(activity.dpToPixel(100)))
+
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testItemDecoration_withScrolling_direction_row() {
+        // This test verifies the case that the item decoration set through FlexboxItemDecoration
+        // is misplaced after the user scrolls the RecyclerView
+        // https://github.com/google/flexbox-layout/issues/285
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val decorationDrawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val decoration = FlexboxItemDecoration(activity)
+            decoration.setDrawable(decorationDrawable)
+            recyclerView.addItemDecoration(decoration)
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // The first line has 1 item, the following lines have more than 1 items
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 1 items
+            // Flex line 2: 3 items
+            // Flex line 3: 3 items
+            // ...
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.ROW))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getLeftDecorationWidth(it), `is`(0)) }
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+
+        // Verify even after the scrolling, decoration values are set correctly
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getTopDecorationHeight(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getLeftDecorationWidth(it), `is`(0)) }
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testItemDecoration_withScrolling_direction_column() {
+        // This test verifies the case that the item decoration set through FlexboxItemDecoration
+        // is misplaced after the user scrolls the RecyclerView
+        // https://github.com/google/flexbox-layout/issues/285
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val decorationDrawable = ResourcesCompat.getDrawable(activity.resources, R.drawable.divider, null)
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val decoration = FlexboxItemDecoration(activity)
+            decoration.setDrawable(decorationDrawable)
+            recyclerView.addItemDecoration(decoration)
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+            // The first line has 1 item, the following lines have more than 1 items
+            // RecyclerView width: 320, height: 240.
+            // Flex line 1: 1 items
+            // Flex line 2: 3 items
+            // Flex line 3: 3 items
+            // ...
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexDirection, `is`(FlexDirection.COLUMN))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getTopDecorationHeight(it), `is`(0)) }
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.recyclerview)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+
+        // Verify even after the scrolling, decoration values are set correctly
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(0)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(1)!!), `is`(0))
+        assertThat(layoutManager.getLeftDecorationWidth(layoutManager.getChildAt(2)!!), `is`(0))
+        layoutManager.flexLines
+                .mapNotNull { layoutManager.getChildAt(it.firstIndex) }
+                .forEach { assertThat(layoutManager.getTopDecorationHeight(it), `is`(0)) }
+    }
+
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNotifyItemChange_withPayload() {
+        // This test verifies the payload is correctly passed to the Adapter in the case
+        // that notifying an item with payload
+        // https://github.com/google/flexbox-layout/issues/297
+
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            val lp = createLayoutParams(activity, 100, 70)
+            adapter.addItem(lp)
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(adapter.payloads.size, `is`(0))
+
+        val payload = "payload"
+        activityRule.runOnUiThread { adapter.changeItemWithPayload(0, payload) }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+        assertThat(adapter.payloads.size, `is`(1))
+        assertThat(adapter.payloads[0] as String, `is`(payload))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollAlongManAxis_direction_row() {
+        // This test verifies the scroll along the main axis if the width of the RecyclerView is
+        // larger than its parent when the main axis direction is horizontal (row)
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.wrapped_recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 100, 70)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view = layoutManager.getChildAt(0)!!
+        assertThat(view.left, `is`(0))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_RIGHT,
+                GeneralLocation.CENTER_LEFT))
+        assertThat(view.left, `is`(not(0)))
+
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.CENTER_LEFT,
+                GeneralLocation.CENTER_RIGHT))
+        assertThat(view.left, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testScrollAlongManAxis_direction_column() {
+        // This test verifies the scroll along the main axis if the height of the RecyclerView is
+        // larger than its parent when the main axis direction is vertical (column).
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.wrapped_recyclerview_scroll_vertical)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 0..49) {
+                val lp = createLayoutParams(activity, 70, 100)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view = layoutManager.getChildAt(0)!!
+        assertThat(view.top, `is`(0))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.BOTTOM_CENTER,
+                GeneralLocation.TOP_CENTER))
+        assertThat(view.top, `is`(not(0)))
+
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        onView(withId(R.id.container)).perform(swipe(GeneralLocation.TOP_CENTER,
+                GeneralLocation.BOTTOM_CENTER))
+        assertThat(view.top, `is`(0))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testMaxLine() {
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.maxLine = 3
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 1..50) {
+                val lp = createLayoutParams(activity, 100, 70)
+                lp.flexShrink = 0f
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        assertThat(layoutManager.flexLines.size, `is`(3))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNowrap_justifyContentCenter_directionRow() {
+        // This is to fix https://github.com/google/flexbox-layout/issues/469
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val height = 70
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.ROW
+            layoutManager.flexWrap = FlexWrap.NOWRAP
+            layoutManager.justifyContent = JustifyContent.CENTER
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 1..3) {
+                val lp = createLayoutParams(activity, 100, height)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view1Bottom= layoutManager.getChildAt(0)!!.bottom
+        val view2Bottom = layoutManager.getChildAt(1)!!.bottom
+        val view3Bottom = layoutManager.getChildAt(2)!!.bottom
+        assertThat(view1Bottom, `is`(activity.dpToPixel(height)))
+        assertThat(view2Bottom, `is`(activity.dpToPixel(height)))
+        assertThat(view3Bottom, `is`(activity.dpToPixel(height)))
+    }
+
+    @Test
+    @FlakyTest
+    @Throws(Throwable::class)
+    fun testNowrap_justifyContentCenter_directionColumn() {
+        // This is to fix https://github.com/google/flexbox-layout/issues/469
+        val activity = activityRule.activity
+        val layoutManager = FlexboxLayoutManager(activity)
+        val adapter = TestAdapter()
+        val width = 100
+        activityRule.runOnUiThread {
+            activity.setContentView(R.layout.recyclerview)
+            val recyclerView = activity.findViewById<RecyclerView>(R.id.recyclerview)
+            layoutManager.flexDirection = FlexDirection.COLUMN
+            layoutManager.flexWrap = FlexWrap.NOWRAP
+            layoutManager.justifyContent = JustifyContent.CENTER
+            recyclerView.layoutManager = layoutManager
+            recyclerView.adapter = adapter
+            for (i in 1..3) {
+                val lp = createLayoutParams(activity, width, 70)
+                adapter.addItem(lp)
+            }
+        }
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+        val view1Right= layoutManager.getChildAt(0)!!.right
+        val view2Right = layoutManager.getChildAt(1)!!.right
+        val view3Right = layoutManager.getChildAt(2)!!.right
+        assertThat(view1Right, `is`(activity.dpToPixel(width)))
+        assertThat(view2Right, `is`(activity.dpToPixel(width)))
+        assertThat(view3Right, `is`(activity.dpToPixel(width)))
+    }
+
+    /**
+     * Creates a new flex item.
+     *
+     * @param context the context
+     * @param width   in DP
+     * @param height  in DP
+     * @return the created [FlexboxLayoutManager.LayoutParams] instance
+     */
+    private fun createLayoutParams(context: Context, width: Int,
+                                   height: Int): FlexboxLayoutManager.LayoutParams {
+        return FlexboxLayoutManager.LayoutParams(context.dpToPixel(width), context.dpToPixel(height))
+    }
+
+    private fun swipe(from: CoordinatesProvider, to: CoordinatesProvider): ViewAction {
+        return GeneralSwipeAction(Swipe.FAST, from, to, Press.FINGER)
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxTestActivity.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxTestActivity.kt
new file mode 100755
index 0000000..b7b81f0
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxTestActivity.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.app.Activity
+import com.google.android.flexbox.FlexboxLayout
+
+/**
+ * Activity for testing the [FlexboxLayout].
+ */
+class FlexboxTestActivity : Activity()
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/IsEqualAllowingError.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/IsEqualAllowingError.kt
new file mode 100755
index 0000000..68c74e8
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/IsEqualAllowingError.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import org.hamcrest.BaseMatcher
+import org.hamcrest.Description
+import org.hamcrest.Factory
+import org.hamcrest.Matcher
+import java.util.*
+
+/**
+ * Custom [BaseMatcher] that expects [Number] value allowing some errors to allow
+ * such as rounding errors.
+ */
+class IsEqualAllowingError<T : Number> private constructor(private val expected: Number, private val errorAllowed: Int) : BaseMatcher<T>() {
+
+    override fun matches(item: Any): Boolean {
+        if (item !is Number) {
+            return false
+        }
+        return expected.toInt() - errorAllowed <= item.toInt() && item.toInt() <= expected.toInt() + errorAllowed
+    }
+
+    override fun describeTo(description: Description) {
+        description.appendText(
+                String.format(Locale.US, "expected value is <%s> allowing error of <%s>.", expected,
+                        errorAllowed))
+    }
+
+    companion object {
+
+        @Factory
+        fun <T : Number> isEqualAllowingError(expected: T): Matcher<T> {
+            return IsEqualAllowingError(expected, 2)
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedInnerAdapter.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedInnerAdapter.kt
new file mode 100755
index 0000000..ea673cb
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedInnerAdapter.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * Adapter for the tests for nested RecyclerViews.
+ * This Adapter is used for the inner RecyclerView.
+ */
+internal class NestedInnerAdapter(private val innerPosition: Int, private val itemCount: Int)
+    : RecyclerView.Adapter<NestedInnerAdapter.InnerViewHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NestedInnerAdapter.InnerViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(R.layout.viewholder_textview, parent, false)
+        return InnerViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: InnerViewHolder, position: Int) {
+        holder.textView.text = holder.textView.resources.getString(R.string.item_description, innerPosition, position)
+    }
+
+    override fun getItemCount() = itemCount
+
+    internal class InnerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        val textView: TextView = itemView.findViewById(R.id.textview)
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedOuterAdapter.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedOuterAdapter.kt
new file mode 100755
index 0000000..72e3cc8
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedOuterAdapter.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * Adapter for the tests for nested RecyclerViews.
+ * This Adapter is used for the outer RecyclerView.
+ */
+internal class NestedOuterAdapter(
+        @param:FlexDirection private val flexDirection: Int, private val innerAdapterItemCount: Int,
+        @param:LayoutRes private val viewHolderResId: Int
+) : RecyclerView.Adapter<NestedOuterAdapter.OuterViewHolder>() {
+
+    private val viewHolderList = mutableListOf<OuterViewHolder>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OuterViewHolder {
+        val view = LayoutInflater.from(parent.context).inflate(viewHolderResId, parent, false)
+        val holder = OuterViewHolder(view)
+        viewHolderList.add(holder)
+        return holder
+    }
+
+    override fun onBindViewHolder(holder: OuterViewHolder, position: Int) {
+        val layoutManager = FlexboxLayoutManager(holder.itemView.context)
+        layoutManager.flexDirection = flexDirection
+        holder.innerRecyclerView.layoutManager = layoutManager
+        holder.innerRecyclerView.adapter = NestedInnerAdapter(position, innerAdapterItemCount)
+    }
+
+    fun getViewHolder(position: Int) = viewHolderList[position]
+
+    override fun getItemCount() = ITEM_COUNT
+
+    internal class OuterViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        val innerRecyclerView: RecyclerView = itemView.findViewById(R.id.recyclerview_inner)
+    }
+
+    companion object {
+        private const val ITEM_COUNT = 4
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt
new file mode 100755
index 0000000..361463e
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * [RecyclerView.Adapter] implementation for [TestViewHolder].
+ */
+internal class TestAdapter private constructor(
+        private val layoutParams: MutableList<FlexboxLayoutManager.LayoutParams>)
+    : RecyclerView.Adapter<TestViewHolder>() {
+
+    private val receivedPayloads = mutableListOf<Any>()
+
+    constructor() : this(mutableListOf<FlexboxLayoutManager.LayoutParams>())
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TestViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.recyclerview_viewholder, parent, false)
+        return TestViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: TestViewHolder, position: Int) {
+        holder.textView.text = (position + 1).toString()
+        holder.textView.setBackgroundResource(R.drawable.flex_item_background)
+        holder.textView.gravity = Gravity.CENTER
+        holder.textView.layoutParams = layoutParams[position]
+    }
+
+    override fun onBindViewHolder(holder: TestViewHolder, position: Int, payloads: List<Any>) {
+        receivedPayloads.addAll(payloads)
+        onBindViewHolder(holder, position)
+    }
+
+    fun addItem(position: Int, flexItem: FlexboxLayoutManager.LayoutParams) {
+        layoutParams.add(position, flexItem)
+        notifyItemInserted(position)
+    }
+
+    fun addItem(flexItem: FlexboxLayoutManager.LayoutParams) {
+        layoutParams.add(flexItem)
+        notifyItemInserted(layoutParams.size - 1)
+    }
+
+    fun changeItemWithPayload(position: Int, payload: Any) {
+        notifyItemChanged(position, payload)
+    }
+
+    val payloads get() = receivedPayloads.toList()
+
+    fun getItemAt(index: Int) = layoutParams[index]
+
+    override fun getItemCount() = layoutParams.size
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapterMultiViewTypes.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapterMultiViewTypes.kt
new file mode 100755
index 0000000..aa2cb13
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapterMultiViewTypes.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.flexbox.FlexboxLayoutManager
+
+/**
+ * [RecyclerView.Adapter] implementation for [TestViewHolder], which has multiple
+ * view types.
+ */
+internal class TestAdapterMultiViewTypes : RecyclerView.Adapter<TestViewHolder>() {
+
+    private val items = mutableListOf<Item>()
+
+    init {
+        for (i in 0 until ITEMS) {
+            val item = Item()
+            if (i == POSITION_MATCH_PARENT) {
+                item.viewType = VIEW_TYPE_MATCH_PARENT
+            }
+            item.value = i + 1
+            items.add(item)
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TestViewHolder {
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.recyclerview_viewholder, parent, false)
+        if (viewType == VIEW_TYPE_MATCH_PARENT) {
+            val flexboxLp = view.layoutParams as FlexboxLayoutManager.LayoutParams
+            flexboxLp.flexBasisPercent = 90f
+            flexboxLp.flexGrow = 1f
+        }
+        return TestViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: TestViewHolder, position: Int) {
+        holder.textView.text = items[position].value.toString()
+        holder.textView.setBackgroundResource(R.drawable.flex_item_background)
+        holder.textView.gravity = Gravity.CENTER
+    }
+
+    override fun getItemViewType(position: Int) = items[position].viewType
+
+    fun addItemAt(position: Int, item: Item) {
+        items.add(position, item)
+        notifyItemInserted(position)
+    }
+
+    override fun getItemCount() = items.size
+
+    internal class Item {
+        internal var viewType = VIEW_TYPE_NORMAL
+        internal var value = 0
+    }
+
+    companion object {
+
+        internal const val POSITION_MATCH_PARENT = 3
+        private const val ITEMS = 50
+
+        private const val VIEW_TYPE_NORMAL = 0
+        private const val VIEW_TYPE_MATCH_PARENT = 1
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestUtil.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestUtil.kt
new file mode 100755
index 0000000..92c3c43
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestUtil.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.content.Context
+
+internal fun Context.dpToPixel(dp: Int): Int {
+    val displayMetrics = this.resources.displayMetrics
+    return if (dp < 0) dp else Math.round(dp * displayMetrics.density)
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestViewHolder.kt b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestViewHolder.kt
new file mode 100755
index 0000000..ded6c44
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestViewHolder.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox.test
+
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+/**
+ * ViewHolder implementation for a flex item for testing.
+ */
+internal class TestViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    val textView: TextView = itemView.findViewById(R.id.textview)
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider.xml
new file mode 100755
index 0000000..ec793d2
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size
+        android:width="10dp"
+        android:height="15dp" />
+    <solid android:color="#44A444" />
+</shape>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider_thick.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider_thick.xml
new file mode 100755
index 0000000..8148332
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider_thick.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <size
+        android:width="40dp"
+        android:height="42dp" />
+    <solid android:color="#44A444" />
+</shape>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/flex_item_background.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/flex_item_background.xml
new file mode 100755
index 0000000..e743ee1
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/flex_item_background.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="#11aabb" />
+    <stroke android:width="1dp" android:color="#888888"/>
+</shape>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test.xml
new file mode 100755
index 0000000..83103c5
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test_overflowed.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test_overflowed.xml
new file mode 100755
index 0000000..585c6f9
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test_overflowed.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap_reverse"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="5" />
+
+    <TextView
+        android:id="@+id/text6"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="6" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_test.xml
new file mode 100755
index 0000000..032f71c
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_test.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="baseline">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="1"
+        android:gravity="bottom" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="2"
+        android:gravity="top" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="3"
+        android:paddingTop="20dp"
+        android:gravity="center" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_wrap_content.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_wrap_content.xml
new file mode 100755
index 0000000..486b41d
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_wrap_content.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="baseline">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="1"
+        android:gravity="bottom" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="2"
+        android:gravity="top" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="3"
+        android:paddingTop="20dp"
+        android:gravity="center" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_parent_padding_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_parent_padding_test.xml
new file mode 100755
index 0000000..fca45a4
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_parent_padding_test.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    android:padding="16dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_end">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_test.xml
new file mode 100755
index 0000000..3b056b0
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="stretch"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_self_stretch_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_self_stretch_test.xml
new file mode 100755
index 0000000..097230b
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_self_stretch_test.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="1"
+        app:layout_alignSelf="stretch" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_column.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_column.xml
new file mode 100755
index 0000000..7c44604
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_column.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_flexGrow="1.0" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_wrapBefore="true" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_row.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_row.xml
new file mode 100755
index 0000000..3e4903b
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_row.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        android:text="1"
+        app:layout_flexGrow="1.0" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:text="2"
+        app:layout_wrapBefore="true" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_column_align_items_center_margin_oneside.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_column_align_items_center_margin_oneside.xml
new file mode 100755
index 0000000..8cf9e46
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_column_align_items_center_margin_oneside.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="100dp"
+    android:layout_height="20dp"
+    app:flexDirection="column">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="20dp"
+        android:layout_height="match_parent"
+        android:layout_marginRight="20dp"
+        android:text="1"
+        app:layout_alignSelf="center" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_row_align_items_center_margin_oneside.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_row_align_items_center_margin_oneside.xml
new file mode 100755
index 0000000..f6d560c
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_row_align_items_center_margin_oneside.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="20dp"
+    android:layout_height="100dp"
+    app:flexDirection="row">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="20dp"
+        android:layout_marginBottom="20dp"
+        android:text="1"
+        app:layout_alignSelf="center" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_column.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_column.xml
new file mode 100755
index 0000000..840521b
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_column.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:dividerDrawableHorizontal="@drawable/divider"
+    app:showDividerHorizontal="beginning">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="80dp"
+        android:layout_height="90dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="80dp"
+        android:layout_height="90dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="80dp"
+        android:layout_height="90dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="80dp"
+        android:layout_height="140dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="80dp"
+        android:layout_height="140dp"
+        android:text="5" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_row.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_row.xml
new file mode 100755
index 0000000..652ff7d
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_row.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignContent="flex_start"
+    app:alignItems="flex_start"
+    app:dividerDrawableVertical="@drawable/divider"
+    app:showDividerVertical="beginning">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="90dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="90dp"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="90dp"
+        android:layout_height="80dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="5" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_empty_children.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_empty_children.xml
new file mode 100755
index 0000000..55ae135
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_empty_children.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexWrap="wrap">
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_horizontal_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_horizontal_test.xml
new file mode 100755
index 0000000..0777747
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_horizontal_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="500dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="300dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_vertical_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_vertical_test.xml
new file mode 100755
index 0000000..7f3938c
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_vertical_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="500dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="120dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="6dp"
+        android:layout_height="300dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_first_line_single_item.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_first_line_single_item.xml
new file mode 100755
index 0000000..6de3ed9
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_first_line_single_item.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!--
+This layout verifies the case where the first view's visibility is gone and the second view is
+in the next flex line by setting the layout_wrapBefore="true"
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2"
+        app:layout_wrapBefore="true"
+    />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_wrapBefore="true"
+    />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_grow_set_for_rest.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_grow_set_for_rest.xml
new file mode 100755
index 0000000..228c916
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_grow_set_for_rest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!--
+This layout verifies the case where the first view's visibility is gone and the second view is
+in the next flex line by setting the layout_wrapBefore="true"
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2"
+        app:layout_wrapBefore="true"
+        app:layout_flexGrow="1" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_flexGrow="1"
+        app:layout_wrapBefore="true" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_shrink_set_for_rest.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_shrink_set_for_rest.xml
new file mode 100755
index 0000000..423614b
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_shrink_set_for_rest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2017 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!--
+This layout verifies the case where the first view's visibility is gone and the second view is
+in the next flex line by setting the layout_wrapBefore="true"
+-->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="320dp"
+    android:layout_height="320dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="120dp"
+        android:layout_height="60dp"
+        android:text="2"
+        app:layout_wrapBefore="true"
+        app:layout_flexShrink="1" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_flexShrink="1"
+        app:layout_wrapBefore="true" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_basis_percent_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_basis_percent_test.xml
new file mode 100755
index 0000000..d75a1eb
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_basis_percent_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_flexBasisPercent="50%"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_flexBasisPercent="60%"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_grow_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_grow_test.xml
new file mode 100755
index 0000000..0616b39
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_grow_test.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent.xml
new file mode 100755
index 0000000..877fa74
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent_direction_column.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent_direction_column.xml
new file mode 100755
index 0000000..edcfc02
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent_direction_column.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_wrap_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_wrap_test.xml
new file mode 100755
index 0000000..a10ce38
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_wrap_test.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="300dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start"
+    app:alignContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="1"
+        app:layout_flexShrink="0" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="2"
+        app:layout_flexShrink="0" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="3"
+        app:layout_flexShrink="0" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrap_content.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrap_content.xml
new file mode 100755
index 0000000..a2abbbb
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrap_content.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  --><!-- Set the layout_width and layout_height as wrap_content to test the behavior of
+     the situation MeasureSpec.AT_MOST is set as width/height mode -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_horizontalscrollview.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_horizontalscrollview.xml
new file mode 100755
index 0000000..137e6fd
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_horizontalscrollview.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!-- Wrap the FlexboxLayout with a Scrollview to test
+     the situation MeasureSpec.UNSPECIFIED is set as height mode -->
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.flexbox.FlexboxLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/flexbox_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="400dp"
+        app:flexDirection="column"
+        app:flexWrap="wrap">
+
+        <TextView
+            android:id="@+id/text1"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:text="1" />
+
+        <TextView
+            android:id="@+id/text2"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:text="2" />
+
+        <TextView
+            android:id="@+id/text3"
+            android:layout_width="300dp"
+            android:layout_height="match_parent"
+            android:text="3" />
+    </com.google.android.flexbox.FlexboxLayout>
+</HorizontalScrollView>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_scrollview.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_scrollview.xml
new file mode 100755
index 0000000..0d5d2f0
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_scrollview.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<!-- Wrap the FlexboxLayout with a Scrollview to test
+     the situation MeasureSpec.UNSPECIFIED is set as height mode -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.flexbox.FlexboxLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/flexbox_layout"
+        android:layout_width="360dp"
+        android:layout_height="wrap_content"
+        app:flexDirection="row"
+        app:flexWrap="wrap">
+
+        <TextView
+            android:id="@+id/text1"
+            android:layout_width="140dp"
+            android:layout_height="500dp"
+            android:text="1" />
+
+        <TextView
+            android:id="@+id/text2"
+            android:layout_width="140dp"
+            android:layout_height="500dp"
+            android:text="2" />
+
+        <TextView
+            android:id="@+id/text3"
+            android:layout_width="140dp"
+            android:layout_height="500dp"
+            android:text="3" />
+    </com.google.android.flexbox.FlexboxLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_test.xml
new file mode 100755
index 0000000..4e72278
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_test.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:justifyContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_gone.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_gone.xml
new file mode 100755
index 0000000..e90f2e5
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_gone.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row"
+    app:justifyContent="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="2"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_parent_padding.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_parent_padding.xml
new file mode 100755
index 0000000..102f352
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_parent_padding.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/frame_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="24dp">
+
+    <com.google.android.flexbox.FlexboxLayout
+        android:id="@+id/flexbox_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="8dp"
+        app:flexDirection="row"
+        app:justifyContent="flex_start">
+
+        <TextView
+            android:id="@+id/text1"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:text="1" />
+
+        <TextView
+            android:id="@+id/text2"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:text="2" />
+
+        <TextView
+            android:id="@+id/text3"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:text="3" />
+    </com.google.android.flexbox.FlexboxLayout>
+</FrameLayout>
+
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_test.xml
new file mode 100755
index 0000000..031d2ae
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_test.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="150dp"
+        android:text="1"
+        app:layout_maxHeight="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_upper_bound_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_upper_bound_test.xml
new file mode 100755
index 0000000..a31320a
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_upper_bound_test.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        android:text="1"
+        app:layout_flexGrow="1"
+        app:layout_maxHeight="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        app:layout_flexGrow="1"
+        android:text="2" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_test.xml
new file mode 100755
index 0000000..949697b
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_maxWidth="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_upper_bound_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_upper_bound_test.xml
new file mode 100755
index 0000000..bb12f5b
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_upper_bound_test.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_flexGrow="1"
+        app:layout_maxWidth="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        app:layout_flexGrow="1"
+        android:text="2" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_lower_bound_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_lower_bound_test.xml
new file mode 100755
index 0000000..f42af2f
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_lower_bound_test.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="1"
+        app:layout_minHeight="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="wrap_content"
+        android:layout_height="200dp"
+        android:text="4" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_test.xml
new file mode 100755
index 0000000..da613e4
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_test.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexDirection="column">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_minHeight="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_lower_bound_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_lower_bound_test.xml
new file mode 100755
index 0000000..c6e21ad
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_lower_bound_test.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp"
+    app:flexWrap="nowrap" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_minWidth="150dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:text="4" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_test.xml
new file mode 100755
index 0000000..405144a
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_test.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout android:id="@+id/flexbox_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="400dp">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_minWidth="100dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_flexGrow="1" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_order_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_order_test.xml
new file mode 100755
index 0000000..a5b6977
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_order_test.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_order="2" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="2"
+        app:layout_order="-1" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="3"
+        app:layout_order="0" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="4" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_simple.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_simple.xml
new file mode 100755
index 0000000..b88e0c5
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_simple.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:flexDirection="row_reverse"
+    app:justifyContent="center"
+    app:alignContent="center"
+    app:alignItems="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_order="2"
+        app:layout_flexGrow="1"
+        app:layout_alignSelf="stretch" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_stretch_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_stretch_test.xml
new file mode 100755
index 0000000..78496cf
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_stretch_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="360dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="stretch"
+    app:alignContent="stretch" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="140dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_gone.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_gone.xml
new file mode 100755
index 0000000..ac02713
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_gone.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="300dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="1"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="2"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="3" />
+
+    <TextView
+        android:id="@+id/text4"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="4" />
+
+    <TextView
+        android:id="@+id/text5"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="5" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_invisible.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_invisible.xml
new file mode 100755
index 0000000..a5e2151
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_invisible.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="300dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="1"
+        android:visibility="invisible" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="2"
+        android:visibility="invisible" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="120dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_column.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_column.xml
new file mode 100755
index 0000000..011294c
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_column.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="360dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="160dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="160dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="wrap_content"
+        android:layout_height="160dp"
+        android:visibility="gone"
+        android:text="3" />
+
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_row.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_row.xml
new file mode 100755
index 0000000..84f50e7
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_row.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="160dp"
+        android:layout_height="wrap_content"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="160dp"
+        android:layout_height="wrap_content"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="160dp"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:text="3" />
+
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_before_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_before_test.xml
new file mode 100755
index 0000000..0df906c
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_before_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="2"
+        app:layout_wrapBefore="true" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="3"
+        app:layout_wrapBefore="true" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_horizontal_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_horizontal_test.xml
new file mode 100755
index 0000000..d95ab70
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_horizontal_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="280dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:layout_margin="32dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_vertical_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_vertical_test.xml
new file mode 100755
index 0000000..5e26469
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_vertical_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="360dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="80dp"
+        android:layout_height="280dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="80dp"
+        android:layout_height="30dp"
+        android:layout_margin="32dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_grow.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_grow.xml
new file mode 100755
index 0000000..e25531c
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_grow.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="24dp"
+        android:layout_height="0dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginRight="12dp"
+        android:text="1"
+        app:layout_flexBasisPercent="50%"
+        app:layout_flexGrow="1"
+        app:layout_flexShrink="0" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_shrink.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_shrink.xml
new file mode 100755
index 0000000..4cc389b
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_shrink.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="200dp"
+    app:flexDirection="column"
+    app:flexWrap="nowrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="24dp"
+        android:layout_height="150dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginRight="12dp"
+        android:text="1"
+        app:layout_flexShrink="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="12dp"
+        android:layout_height="100dp"
+        android:text="2"
+        app:layout_flexShrink="1" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_grow.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_grow.xml
new file mode 100755
index 0000000..5207d6a
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_grow.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:flexWrap="wrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="0dp"
+        android:layout_height="24dp"
+        android:layout_marginBottom="12dp"
+        android:text="test"
+        app:layout_flexBasisPercent="50%"
+        app:layout_flexGrow="1"
+        app:layout_flexShrink="0" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_shrink.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_shrink.xml
new file mode 100755
index 0000000..05be02a
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_shrink.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="200dp"
+    android:layout_height="wrap_content"
+    app:flexWrap="nowrap"
+    app:justifyContent="flex_end" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="150dp"
+        android:layout_height="24dp"
+        android:layout_marginBottom="12dp"
+        android:text="test1"
+        app:layout_flexShrink="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="100dp"
+        android:layout_height="12dp"
+        android:text="test2"
+        app:layout_flexShrink="1" />
+</com.google.android.flexbox.FlexboxLayout>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_horizontal_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_horizontal_test.xml
new file mode 100755
index 0000000..c4ac440
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_horizontal_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="360dp"
+    android:layout_height="wrap_content"
+    android:padding="32dp"
+    app:flexDirection="row"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="280dp"
+        android:layout_height="80dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="30dp"
+        android:layout_height="80dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="100dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_vertical_test.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_vertical_test.xml
new file mode 100755
index 0000000..69641cb
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_vertical_test.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright 2016 Google Inc. All rights reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="360dp"
+    android:padding="32dp"
+    app:flexDirection="column"
+    app:flexWrap="wrap"
+    app:alignItems="flex_start">
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="80dp"
+        android:layout_height="280dp"
+        android:text="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="80dp"
+        android:layout_height="30dp"
+        android:text="2" />
+
+    <TextView
+        android:id="@+id/text3"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:text="3" />
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_height_positive_flexgrow.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_height_positive_flexgrow.xml
new file mode 100755
index 0000000..4caeef7
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_height_positive_flexgrow.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:flexDirection="column"
+    app:alignItems="flex_start" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="1"
+        app:layout_flexGrow="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:text="2-some long text"
+        app:layout_flexGrow="1" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_width_positive_flexgrow.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_width_positive_flexgrow.xml
new file mode 100755
index 0000000..cd420b7
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_width_positive_flexgrow.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/flexbox_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:alignItems="flex_start" >
+
+    <TextView
+        android:id="@+id/text1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="1"
+        app:layout_flexGrow="1" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="2-some long text"
+        app:layout_flexGrow="1" />
+
+</com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview.xml
new file mode 100755
index 0000000..1db3834
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- Some APIs in espresso requires the view being performed is at least 90% visible to the
+     user, using the small width so that low resolution devices are covered-->
+<androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="320dp"
+    android:layout_height="240dp" />
+
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_reverse.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_reverse.xml
new file mode 100755
index 0000000..9f5ba82
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_reverse.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="400dp"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    app:reverseLayout="true"
+    app:stackFromEnd="true"
+    app:layoutManager="com.google.android.flexbox.FlexboxLayoutManager" />
+
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_viewholder.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_viewholder.xml
new file mode 100755
index 0000000..f0f1f77
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_viewholder.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2016 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textview"
+    android:layout_width="120dp"
+    android:layout_height="80dp" />
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview.xml
new file mode 100755
index 0000000..48b633e
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- The nested RecyclerViews tests verify the wrap_content behavior -->
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recyclerview_inner"
+    android:layout_width="200dp"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="8dp" />
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview_wrap_horizontally.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview_wrap_horizontally.xml
new file mode 100755
index 0000000..294028c
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview_wrap_horizontally.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- The nested RecyclerViews tests verify the wrap_content behavior -->
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recyclerview_inner"
+    android:layout_width="wrap_content"
+    android:layout_height="200dp"
+    android:layout_marginBottom="8dp" />
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_textview.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_textview.xml
new file mode 100755
index 0000000..213409d
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_textview.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/textview"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="4dp" />
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview.xml
new file mode 100755
index 0000000..3522d99
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- Some APIs in espresso requires the view being performed is at least 90% visible to the
+     user, using the small width so that low resolution devices are covered-->
+<FrameLayout android:id="@+id/container"
+             xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="320dp"
+             android:layout_height="240dp">
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+                                            android:layout_width="600dp"
+                                            android:layout_height="match_parent"/>
+</FrameLayout>
+
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview_scroll_vertical.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview_scroll_vertical.xml
new file mode 100755
index 0000000..797fdf2
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview_scroll_vertical.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google Inc. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- Some APIs in espresso requires the view being performed is at least 90% visible to the
+     user, using the small width so that low resolution devices are covered-->
+<FrameLayout android:id="@+id/container"
+             xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="320dp"
+             android:layout_height="240dp">
+    <androidx.recyclerview.widget.RecyclerView android:id="@+id/recyclerview"
+                                            android:layout_width="match_parent"
+                                            android:layout_height="600dp"/>
+</FrameLayout>
+
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/values/strings.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/values/strings.xml
new file mode 100755
index 0000000..706faa4
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/androidTest/res/values/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2017 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <string name="item_description">%1$s - %2$s</string>
+</resources>
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/AndroidManifest.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..beebcea
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<manifest package="com.google.android.flexbox" />
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignContent.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignContent.java
new file mode 100755
index 0000000..ac5e199
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignContent.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/** This attribute controls the alignment of the flex lines in the flex container. */
+@IntDef({AlignContent.FLEX_START, AlignContent.FLEX_END, AlignContent.CENTER,
+        AlignContent.SPACE_BETWEEN, AlignContent.SPACE_AROUND, AlignContent.STRETCH})
+@Retention(RetentionPolicy.SOURCE)
+public @interface AlignContent {
+
+    /** Flex lines are packed to the start of the flex container. */
+    int FLEX_START = 0;
+
+    /** Flex lines are packed to the end of the flex container. */
+    int FLEX_END = 1;
+
+    /** Flex lines are centered in the flex container. */
+    int CENTER = 2;
+
+    /**
+     * Flex lines are evenly distributed in the flex container. The first flex line is
+     * placed at the start of the flex container, the last flex line is placed at the
+     * end of the flex container.
+     */
+    int SPACE_BETWEEN = 3;
+
+    /**
+     * Flex lines are evenly distributed in the flex container with the same amount of spaces
+     * between the flex lines.
+     */
+    int SPACE_AROUND = 4;
+
+    /**
+     * Flex lines are stretched to fill the remaining space along the cross axis.
+     */
+    int STRETCH = 5;
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignItems.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignItems.java
new file mode 100755
index 0000000..8392ed1
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignItems.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/** This attribute controls the alignment along the cross axis. */
+@IntDef({AlignItems.FLEX_START, AlignItems.FLEX_END, AlignItems.CENTER,
+        AlignItems.BASELINE, AlignItems.STRETCH})
+@Retention(RetentionPolicy.SOURCE)
+public @interface AlignItems {
+
+    /** Flex item's edge is placed on the cross start line. */
+    int FLEX_START = 0;
+
+    /** Flex item's edge is placed on the cross end line. */
+    int FLEX_END = 1;
+
+    /** Flex item's edge is centered along the cross axis. */
+    int CENTER = 2;
+
+    /** Flex items are aligned based on their text's baselines. */
+    int BASELINE = 3;
+
+    /** Flex items are stretched to fill the flex line's cross size. */
+    int STRETCH = 4;
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignSelf.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignSelf.java
new file mode 100755
index 0000000..dff3fde
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignSelf.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/**
+ * This attribute controls the alignment along the cross axis.
+ * The alignment in the same direction can be determined by the {@link AlignItems} attribute in the
+ * parent, but if this is set to other than {@link AlignSelf#AUTO},
+ * the cross axis alignment is overridden for this child.
+ */
+@IntDef({AlignItems.FLEX_START, AlignItems.FLEX_END, AlignItems.CENTER,
+        AlignItems.BASELINE, AlignItems.STRETCH, AlignSelf.AUTO})
+@Retention(RetentionPolicy.SOURCE)
+public @interface AlignSelf {
+
+    /**
+     * The default value for the AlignSelf attribute, which means use the inherit
+     * the {@link AlignItems} attribute from its parent.
+     */
+    int AUTO = -1;
+
+    /** This item's edge is placed on the cross start line. */
+    int FLEX_START = AlignItems.FLEX_START;
+
+    /** This item's edge is placed on the cross end line. */
+    int FLEX_END = AlignItems.FLEX_END;
+
+    /** This item's edge is centered along the cross axis. */
+    int CENTER = AlignItems.CENTER;
+
+    /** This items is aligned based on their text's baselines. */
+    int BASELINE = AlignItems.BASELINE;
+
+    /** This item is stretched to fill the flex line's cross size. */
+    int STRETCH = AlignItems.STRETCH;
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexContainer.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexContainer.java
new file mode 100755
index 0000000..3421119
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexContainer.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.view.View;
+
+import java.util.List;
+
+/**
+ * An interface that has the common behavior as the flex container such as {@link FlexboxLayout}
+ * and {@link FlexboxLayoutManager}.
+ */
+interface FlexContainer {
+
+    int NOT_SET = -1;
+
+    /**
+     * @return the number of flex items contained in the flex container.
+     */
+    int getFlexItemCount();
+
+    /**
+     * Returns a flex item as a View at the given index.
+     *
+     * @param index the index
+     * @return the view at the index
+     */
+    View getFlexItemAt(int index);
+
+    /**
+     * Returns a flex item as a View, which is reordered by taking the order attribute into
+     * account.
+     *
+     * @param index the index of the view
+     * @return the reordered view, which order attribute is taken into account.
+     * If the index is negative or out of bounds of the number of contained views,
+     * returns {@code null}.
+     * @see FlexItem#getOrder()
+     */
+    View getReorderedFlexItemAt(int index);
+
+    /**
+     * Adds the view to the flex container as a flex item.
+     *
+     * @param view the view to be added
+     */
+    void addView(View view);
+
+    /**
+     * Adds the view to the specified index of the flex container.
+     *
+     * @param view  the view to be added
+     * @param index the index for the view to be added
+     */
+    void addView(View view, int index);
+
+    /**
+     * Removes all the views contained in the flex container.
+     */
+    void removeAllViews();
+
+    /**
+     * Removes the view at the specified index.
+     *
+     * @param index the index from which the view is removed.
+     */
+    void removeViewAt(int index);
+
+    /**
+     * @return the flex direction attribute of the flex container.
+     * @see FlexDirection
+     */
+    @FlexDirection
+    int getFlexDirection();
+
+    /**
+     * Sets the given flex direction attribute to the flex container.
+     *
+     * @param flexDirection the flex direction value
+     * @see FlexDirection
+     */
+    void setFlexDirection(@FlexDirection int flexDirection);
+
+    /**
+     * @return the flex wrap attribute of the flex container.
+     * @see FlexWrap
+     */
+    @FlexWrap
+    int getFlexWrap();
+
+    /**
+     * Sets the given flex wrap attribute to the flex container.
+     *
+     * @param flexWrap the flex wrap value
+     * @see FlexWrap
+     */
+    void setFlexWrap(@FlexWrap int flexWrap);
+
+    /**
+     * @return the justify content attribute of the flex container.
+     * @see JustifyContent
+     */
+    @JustifyContent
+    int getJustifyContent();
+
+    /**
+     * Sets the given justify content attribute to the flex container.
+     *
+     * @param justifyContent the justify content value
+     * @see JustifyContent
+     */
+    void setJustifyContent(@JustifyContent int justifyContent);
+
+    /**
+     * @return the align content attribute of the flex container.
+     * @see AlignContent
+     */
+    @AlignContent
+    int getAlignContent();
+
+    /**
+     * Sets the given align content attribute to the flex container.
+     *
+     * @param alignContent the align content value
+     */
+    void setAlignContent(@AlignContent int alignContent);
+
+    /**
+     * @return the align items attribute of the flex container.
+     * @see AlignItems
+     */
+    @AlignItems
+    int getAlignItems();
+
+    /**
+     * Sets the given align items attribute to the flex container.
+     *
+     * @param alignItems the align items value
+     * @see AlignItems
+     */
+    void setAlignItems(@AlignItems int alignItems);
+
+    /**
+     * @return the flex lines composing this flex container. The overridden method should return a
+     * copy of the original list excluding a dummy flex line (flex line that doesn't have any flex
+     * items in it but used for the alignment along the cross axis) so that any changes of the
+     * returned list are not reflected to the original list.
+     */
+    List<FlexLine> getFlexLines();
+
+    /**
+     * Returns true if the main axis is horizontal, false otherwise.
+     *
+     * @return true if the main axis is horizontal, false otherwise
+     */
+    boolean isMainAxisDirectionHorizontal();
+
+    /**
+     * Returns the length of decoration (such as dividers) of the flex item along the main axis.
+     *
+     * @param view            the view from which the length of the decoration is retrieved
+     * @param index           the absolute index of the flex item within the flex container
+     * @param indexInFlexLine the relative index of the flex item within the flex line
+     * @return the length of the decoration. Note that the length of the flex item itself is not
+     * included in the result.
+     */
+    int getDecorationLengthMainAxis(View view, int index, int indexInFlexLine);
+
+    /**
+     * Returns the length of decoration (such as dividers) of the flex item along the cross axis.
+     *
+     * @param view the view from which the length of the decoration is retrieved
+     * @return the length of the decoration. Note that the length of the flex item itself is not
+     * included in the result.
+     */
+    int getDecorationLengthCrossAxis(View view);
+
+    /**
+     * @return the top padding of the flex container.
+     */
+    int getPaddingTop();
+
+    /**
+     * @return the left padding of the flex container.
+     */
+    int getPaddingLeft();
+
+    /**
+     * @return the right padding of the flex container.
+     */
+    int getPaddingRight();
+
+    /**
+     * @return the bottom padding of the flex container.
+     */
+    int getPaddingBottom();
+
+    /**
+     * @return the start padding of this view depending on its resolved layout direction.
+     */
+    int getPaddingStart();
+
+    /**
+     * @return the end padding of this view depending on its resolved layout direction.
+     */
+    int getPaddingEnd();
+
+    /**
+     * Returns the child measure spec for its width.
+     *
+     * @param widthSpec      the measure spec for the width imposed by the parent
+     * @param padding        the padding along the width for the parent
+     * @param childDimension the value of the child dimension
+     */
+    int getChildWidthMeasureSpec(int widthSpec, int padding, int childDimension);
+
+    /**
+     * Returns the child measure spec for its height.
+     *
+     * @param heightSpec     the measure spec for the height imposed by the parent
+     * @param padding        the padding along the height for the parent
+     * @param childDimension the value of the child dimension
+     */
+    int getChildHeightMeasureSpec(int heightSpec, int padding, int childDimension);
+
+    /**
+     * @return the largest main size of all flex lines including decorator lengths.
+     */
+    int getLargestMainSize();
+
+    /**
+     * @return the sum of the cross sizes of all flex lines including decorator lengths.
+     */
+    int getSumOfCrossSize();
+
+    /**
+     * Callback when a new flex item is added to the current container
+     *
+     * @param view            the view as a flex item which is added
+     * @param index           the absolute index of the flex item added
+     * @param indexInFlexLine the relative index of the flex item added within the flex line
+     * @param flexLine        the flex line where the new flex item is added
+     */
+    void onNewFlexItemAdded(View view, int index, int indexInFlexLine, FlexLine flexLine);
+
+    /**
+     * Callback when a new flex line is added to the current container
+     *
+     * @param flexLine the new added flex line
+     */
+    void onNewFlexLineAdded(FlexLine flexLine);
+
+    /**
+     * Sets the list of the flex lines that compose the flex container to the one received as an
+     * argument.
+     *
+     * @param flexLines the list of flex lines
+     */
+    void setFlexLines(List<FlexLine> flexLines);
+
+    /**
+     * @return the current value of the maximum number of flex lines. If not set, {@link #NOT_SET}
+     * is returned.
+     */
+    int getMaxLine();
+
+    /**
+     *
+     * @param maxLine the int value, which specifies the maximum number of flex lines
+     */
+    void setMaxLine(int maxLine);
+
+    /**
+     * @return the list of the flex lines including dummy flex lines (flex line that doesn't have
+     * any flex items in it but used for the alignment along the cross axis), which aren't included
+     * in the {@link FlexContainer#getFlexLines()}.
+     */
+    List<FlexLine> getFlexLinesInternal();
+
+    /**
+     * Update the view cache in the flex container.
+     *
+     * @param position the position of the view to be updated
+     * @param view     the view instance
+     */
+    void updateViewCache(int position, View view);
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexDirection.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexDirection.java
new file mode 100755
index 0000000..a7b94d2
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexDirection.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/**
+ * The direction children items are placed inside the flex container, it determines the
+ * direction of the main axis (and the cross axis, perpendicular to the main axis).
+ */
+@IntDef({FlexDirection.ROW, FlexDirection.ROW_REVERSE, FlexDirection.COLUMN,
+        FlexDirection.COLUMN_REVERSE})
+@Retention(RetentionPolicy.SOURCE)
+public @interface FlexDirection {
+
+    /**
+     * Main axis direction -> horizontal. Main start to
+     * main end -> Left to right (in LTR languages).
+     * Cross start to cross end -> Top to bottom
+     */
+    int ROW = 0;
+
+    /**
+     * Main axis direction -> horizontal. Main start
+     * to main end -> Right to left (in LTR languages). Cross start to cross end ->
+     * Top to bottom.
+     */
+    int ROW_REVERSE = 1;
+
+    /**
+     * Main axis direction -> vertical. Main start
+     * to main end -> Top to bottom. Cross start to cross end ->
+     * Left to right (In LTR languages).
+     */
+    int COLUMN = 2;
+
+    /**
+     * Main axis direction -> vertical. Main start
+     * to main end -> Bottom to top. Cross start to cross end -> Left to right
+     * (In LTR languages)
+     */
+    int COLUMN_REVERSE = 3;
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexItem.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexItem.java
new file mode 100755
index 0000000..6258c9f
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexItem.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.os.Parcelable;
+import android.view.View;
+
+/**
+ * An interface that has the common behavior as a flex item contained in a flex container.
+ * Known classes that implement this interface are {@link FlexboxLayout.LayoutParams} and
+ * {@link FlexboxLayoutManager.LayoutParams}.
+ */
+interface FlexItem extends Parcelable {
+
+    /** The default value for the order attribute */
+    int ORDER_DEFAULT = 1;
+
+    /** The default value for the flex grow attribute */
+    float FLEX_GROW_DEFAULT = 0f;
+
+    /** The default value for the flex shrink attribute */
+    float FLEX_SHRINK_DEFAULT = 1f;
+
+    /** The value representing the flex shrink attribute is not set  */
+    float FLEX_SHRINK_NOT_SET = 0f;
+
+    /** The default value for the flex basis percent attribute */
+    float FLEX_BASIS_PERCENT_DEFAULT = -1f;
+
+    /** The maximum size of the max width and max height attributes */
+    int MAX_SIZE = Integer.MAX_VALUE & View.MEASURED_SIZE_MASK;
+
+    /**
+     * @return the width attribute of the flex item.
+     *
+     * The attribute is about how wide the view wants to be. Can be one of the
+     * constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    int getWidth();
+
+    /**
+     * Sets the width attribute of the flex item.
+     *
+     * @param width the width attribute. Can be one of the
+     *              constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    void setWidth(int width);
+
+    /**
+     * @return the height attribute of the flex item.
+     *
+     * The attribute is about how wide the view wants to be. Can be one of the
+     * constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    int getHeight();
+
+    /**
+     * Sets the height attribute of the flex item.
+     *
+     * @param height the height attribute. Can be one of the
+     *               constants MATCH_PARENT(-1) or WRAP_CONTENT(-2), or an exact size.
+     */
+    void setHeight(int height);
+
+    /**
+     * @return the order attribute of the flex item.
+     *
+     * The attribute can change the ordering of the children views are laid out.
+     * By default, children are displayed and laid out in the same order as they appear in the
+     * layout XML. If not specified, {@link #ORDER_DEFAULT} is set as a default value.
+     */
+    int getOrder();
+
+    /**
+     * Sets the order attribute to the flex item
+     *
+     * @param order the order attribute
+     */
+    void setOrder(int order);
+
+    /**
+     * @return the flex grow attribute of the flex item
+     *
+     * The attribute determines how much this child will grow if positive free space is
+     * distributed relative to the rest of other flex items included in the same flex line.
+     * If not specified, {@link #FLEX_GROW_DEFAULT} is set as a default value.
+     */
+    float getFlexGrow();
+
+    /**
+     * Sets the flex grow attribute to the flex item
+     *
+     * @param flexGrow the flex grow attribute
+     */
+    void setFlexGrow(float flexGrow);
+
+    /**
+     * @return the flex shrink attribute of the flex item
+     *
+     * The attribute determines how much this child will shrink if negative free space is
+     * distributed relative to the rest of other flex items included in the same flex line.
+     * If not specified, {@link #FLEX_SHRINK_DEFAULT} is set as a default value.
+     */
+    float getFlexShrink();
+
+    /**
+     * Sets the flex shrink attribute to the flex item
+     *
+     * @param flexShrink the flex shrink attribute
+     */
+    void setFlexShrink(float flexShrink);
+
+    /**
+     * @return the align self attribute of the flex item
+     *
+     * The attribute determines the alignment along the cross axis (perpendicular to the
+     * main axis). The alignment in the same direction can be determined by the
+     * align items attribute in the parent, but if this is set to other than
+     * {@link AlignSelf#AUTO}, the cross axis alignment is overridden for this child.
+     * The value needs to be one of the values in ({@link AlignSelf#AUTO},
+     * {@link AlignItems#STRETCH}, {@link AlignItems#FLEX_START}, {@link
+     * AlignItems#FLEX_END}, {@link AlignItems#CENTER}, or {@link AlignItems#BASELINE}).
+     * If not specified, {@link AlignSelf#AUTO} is set as a default value.
+     */
+    @AlignSelf
+    int getAlignSelf();
+
+    /**
+     * Sets the align self attribute to the flex item
+     *
+     * @param alignSelf the order attribute
+     */
+    void setAlignSelf(@AlignSelf int alignSelf);
+
+    /**
+     * @return the minimum width attribute of the flex item
+     *
+     * The attribute determines the minimum width the child can shrink to.
+     */
+    int getMinWidth();
+
+    /**
+     * Sets the minimum width attribute to the flex item
+     *
+     * @param minWidth the order attribute
+     */
+    void setMinWidth(int minWidth);
+
+    /**
+     * @return the minimum height attribute of the flex item
+     *
+     * The attribute determines the minimum height the child can shrink to.
+     */
+    int getMinHeight();
+
+    /**
+     * Sets the minimum height attribute to the flex item
+     *
+     * @param minHeight the order attribute
+     */
+    void setMinHeight(int minHeight);
+
+    /**
+     * @return the maximum width attribute of the flex item
+     *
+     * The attribute determines the maximum width the child can expand to.
+     */
+    int getMaxWidth();
+
+    /**
+     * Sets the maximum width attribute to the flex item
+     *
+     * @param maxWidth the order attribute
+     */
+    void setMaxWidth(int maxWidth);
+
+    /**
+     * @return the maximum height attribute of the flex item
+     */
+    int getMaxHeight();
+
+    /**
+     * Sets the maximum height attribute to the flex item
+     *
+     * @param maxHeight the order attribute
+     */
+    void setMaxHeight(int maxHeight);
+
+    /**
+     * @return the wrapBefore attribute of the flex item
+     *
+     * The attribute forces a flex line wrapping. i.e. if this is set to {@code true} for a
+     * flex item, the item will become the first item of the new flex line. (A wrapping happens
+     * regardless of the flex items being processed in the the previous flex line)
+     * This attribute is ignored if the flex_wrap attribute is set as nowrap.
+     * The equivalent attribute isn't defined in the original CSS Flexible Box Module
+     * specification, but having this attribute is useful for Android developers to flatten
+     * the layouts when building a grid like layout or for a situation where developers want
+     * to put a new flex line to make a semantic difference from the previous one, etc.
+     */
+    boolean isWrapBefore();
+
+    /**
+     * Sets the wrapBefore attribute to the flex item
+     *
+     * @param wrapBefore the order attribute
+     */
+    void setWrapBefore(boolean wrapBefore);
+
+    /**
+     * @return the flexBasisPercent attribute of the flex item
+     *
+     * The attribute determines the initial flex item length in a fraction format relative to its
+     * parent.
+     * The initial main size of this child View is trying to be expanded as the specified
+     * fraction against the parent main size.
+     * If this value is set, the length specified from layout_width
+     * (or layout_height) is overridden by the calculated value from this attribute.
+     * This attribute is only effective when the parent's MeasureSpec mode is
+     * MeasureSpec.EXACTLY. The default value is -1, which means not set.
+     */
+    float getFlexBasisPercent();
+
+    /**
+     * Sets the flex basis percent attribute to the flex item
+     *
+     * @param flexBasisPercent the order attribute
+     */
+    void setFlexBasisPercent(float flexBasisPercent);
+
+    /**
+     * @return the left margin of the flex item.
+     */
+    int getMarginLeft();
+
+    /**
+     * @return the top margin of the flex item.
+     */
+    int getMarginTop();
+
+    /**
+     * @return the right margin of the flex item.
+     */
+    int getMarginRight();
+
+    /**
+     * @return the bottom margin of the flex item.
+     */
+    int getMarginBottom();
+
+    /**
+     * @return the start margin of the flex item depending on its resolved layout direction.
+     */
+    int getMarginStart();
+
+    /**
+     * @return the end margin of the flex item depending on its resolved layout direction.
+     */
+    int getMarginEnd();
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexLine.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexLine.java
new file mode 100755
index 0000000..efb8f39
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexLine.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.view.View;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Holds properties related to a single flex line. This class is not expected to be changed outside
+ * of the {@link FlexboxLayout}, thus only exposing the getter methods that may be useful for
+ * other classes using the {@link FlexboxLayout}.
+ */
+public class FlexLine {
+
+    FlexLine() {
+    }
+
+    int mLeft = Integer.MAX_VALUE;
+
+    int mTop = Integer.MAX_VALUE;
+
+    int mRight = Integer.MIN_VALUE;
+
+    int mBottom = Integer.MIN_VALUE;
+
+    /** @see #getMainSize() */
+    int mMainSize;
+
+    /**
+     * The sum of the lengths of dividers along the main axis. This value should be lower
+     * than the value of {@link #mMainSize}.
+     */
+    int mDividerLengthInMainSize;
+
+    /** @see #getCrossSize() */
+    int mCrossSize;
+
+    /** @see #getItemCount() */
+    int mItemCount;
+
+    /** Holds the count of the views whose visibilities are gone */
+    int mGoneItemCount;
+
+    /** @see #getTotalFlexGrow() */
+    float mTotalFlexGrow;
+
+    /** @see #getTotalFlexShrink() */
+    float mTotalFlexShrink;
+
+    /**
+     * The largest value of the individual child's baseline (obtained by View#getBaseline()
+     * if the {@link FlexContainer#getAlignItems()} value is not {@link AlignItems#BASELINE}
+     * or the flex direction is vertical, this value is not used.
+     * If the alignment direction is from the bottom to top,
+     * (e.g. flexWrap == WRAP_REVERSE and flexDirection == ROW)
+     * store this value from the distance from the bottom of the view minus baseline.
+     * (Calculated as view.getMeasuredHeight() - view.getBaseline - LayoutParams.bottomMargin)
+     */
+    int mMaxBaseline;
+
+    /**
+     * The sum of the cross size used before this flex line.
+     */
+    int mSumCrossSizeBefore;
+
+    /**
+     * Store the indices of the children views whose alignSelf property is stretch.
+     * The stored indices are the absolute indices including all children in the Flexbox,
+     * not the relative indices in this flex line.
+     */
+    List<Integer> mIndicesAlignSelfStretch = new ArrayList<>();
+
+    int mFirstIndex;
+
+    int mLastIndex;
+
+    /**
+     * Set to true if any {@link FlexItem}s in this line have {@link FlexItem#getFlexGrow()}
+     * attributes set (have the value other than {@link FlexItem#FLEX_GROW_DEFAULT})
+     */
+    boolean mAnyItemsHaveFlexGrow;
+
+    /**
+     * Set to true if any {@link FlexItem}s in this line have {@link FlexItem#getFlexShrink()}
+     * attributes set (have the value other than {@link FlexItem#FLEX_SHRINK_NOT_SET})
+     */
+    boolean mAnyItemsHaveFlexShrink;
+
+    /**
+     * @return the size of the flex line in pixels along the main axis of the flex container.
+     */
+    public int getMainSize() {
+        return mMainSize;
+    }
+
+    /**
+     * @return the size of the flex line in pixels along the cross axis of the flex container.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int getCrossSize() {
+        return mCrossSize;
+    }
+
+    /**
+     * @return the count of the views contained in this flex line.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int getItemCount() {
+        return mItemCount;
+    }
+
+    /**
+     * @return the count of the views whose visibilities are not gone in this flex line.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int getItemCountNotGone() {
+        return mItemCount - mGoneItemCount;
+    }
+
+    /**
+     * @return the sum of the flexGrow properties of the children included in this flex line
+     */
+    @SuppressWarnings("WeakerAccess")
+    public float getTotalFlexGrow() {
+        return mTotalFlexGrow;
+    }
+
+    /**
+     * @return the sum of the flexShrink properties of the children included in this flex line
+     */
+    @SuppressWarnings("WeakerAccess")
+    public float getTotalFlexShrink() {
+        return mTotalFlexShrink;
+    }
+
+    /**
+     * @return the first view's index included in this flex line.
+     */
+    public int getFirstIndex() {
+        return mFirstIndex;
+    }
+
+    /**
+     * Updates the position of the flex line from the contained view.
+     *
+     * @param view             the view contained in this flex line
+     * @param leftDecoration   the length of the decoration on the left of the view
+     * @param topDecoration    the length of the decoration on the top of the view
+     * @param rightDecoration  the length of the decoration on the right of the view
+     * @param bottomDecoration the length of the decoration on the bottom of the view
+     */
+    void updatePositionFromView(View view, int leftDecoration, int topDecoration,
+            int rightDecoration, int bottomDecoration) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        mLeft = Math.min(mLeft, view.getLeft() - flexItem.getMarginLeft() - leftDecoration);
+        mTop = Math.min(mTop, view.getTop() - flexItem.getMarginTop() - topDecoration);
+        mRight = Math.max(mRight, view.getRight() + flexItem.getMarginRight() + rightDecoration);
+        mBottom = Math
+                .max(mBottom, view.getBottom() + flexItem.getMarginBottom() + bottomDecoration);
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexWrap.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexWrap.java
new file mode 100755
index 0000000..6604f33
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexWrap.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/**
+ * This attribute controls whether the flex container is single-line or multi-line, and the
+ * direction of the cross axis.
+ */
+@IntDef({FlexWrap.NOWRAP, FlexWrap.WRAP, FlexWrap.WRAP_REVERSE})
+@Retention(RetentionPolicy.SOURCE)
+public @interface FlexWrap {
+
+    /** The flex container is single-line. */
+    int NOWRAP = 0;
+
+    /** The flex container is multi-line. */
+    int WRAP = 1;
+
+    /**
+     * The flex container is multi-line. The direction of the
+     * cross axis is opposed to the direction as the {@link #WRAP}
+     */
+    int WRAP_REVERSE = 2;
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java
new file mode 100755
index 0000000..e271d8f
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java
@@ -0,0 +1,2065 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import static com.google.android.flexbox.FlexContainer.NOT_SET;
+import static com.google.android.flexbox.FlexItem.FLEX_BASIS_PERCENT_DEFAULT;
+import static com.google.android.flexbox.FlexItem.FLEX_GROW_DEFAULT;
+import static com.google.android.flexbox.FlexItem.FLEX_SHRINK_NOT_SET;
+
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
+
+import android.graphics.drawable.Drawable;
+import android.util.SparseIntArray;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.view.MarginLayoutParamsCompat;
+import androidx.core.widget.CompoundButtonCompat;
+
+/**
+ * Offers various calculations for Flexbox to use the common logic between the classes such as
+ * {@link FlexboxLayout} and {@link FlexboxLayoutManager}.
+ */
+class FlexboxHelper {
+
+    private static final int INITIAL_CAPACITY = 10;
+
+    private static final long MEASURE_SPEC_WIDTH_MASK = 0xffffffffL;
+
+    private final FlexContainer mFlexContainer;
+
+    /**
+     * Holds the 'frozen' state of children during measure. If a view is frozen it will no longer
+     * expand or shrink regardless of flex grow/flex shrink attributes.
+     */
+    private boolean[] mChildrenFrozen;
+
+    /**
+     * Map the view index to the flex line which contains the view represented by the index to
+     * look for a flex line from a given view index in a constant time.
+     * Key: index of the view
+     * Value: index of the flex line that contains the given view
+     *
+     * E.g. if we have following flex lines,
+     * <p>
+     * FlexLine(0): itemCount 3
+     * FlexLine(1): itemCount 2
+     * </p>
+     * this instance should have following entries
+     * <p>
+     * [0, 0, 0, 1, 1, ...]
+     * </p>
+     */
+    @Nullable
+    int[] mIndexToFlexLine;
+
+    /**
+     * Cache the measured spec. The first 32 bit represents the height measure spec, the last
+     * 32 bit represents the width measure spec of each flex item.
+     * E.g. an entry is created like {@code (long) heightMeasureSpec << 32 | widthMeasureSpec}
+     *
+     * To retrieve a widthMeasureSpec, call {@link #extractLowerInt(long)} or
+     * {@link #extractHigherInt(long)} for a heightMeasureSpec.
+     */
+    @Nullable
+    long[] mMeasureSpecCache;
+
+    /**
+     * Cache a flex item's measured width and height. The first 32 bit represents the height, the
+     * last 32 bit represents the width of each flex item.
+     * E.g. an entry is created like the following code.
+     * {@code (long) view.getMeasuredHeight() << 32 | view.getMeasuredWidth()}
+     *
+     * To retrieve a width value, call {@link #extractLowerInt(long)} or
+     * {@link #extractHigherInt(long)} for a height value.
+     */
+    @Nullable
+    private long[] mMeasuredSizeCache;
+
+    FlexboxHelper(FlexContainer flexContainer) {
+        mFlexContainer = flexContainer;
+    }
+
+    /**
+     * Create an array, which indicates the reordered indices that
+     * {@link FlexItem#getOrder()} attributes are taken into account.
+     * This method takes a View before that is added as the parent ViewGroup's children.
+     *
+     * @param viewBeforeAdded          the View instance before added to the array of children
+     *                                 Views of the parent ViewGroup
+     * @param indexForViewBeforeAdded  the index for the View before added to the array of the
+     *                                 parent ViewGroup
+     * @param paramsForViewBeforeAdded the layout parameters for the View before added to the array
+     *                                 of the parent ViewGroup
+     * @return an array which have the reordered indices
+     */
+    int[] createReorderedIndices(View viewBeforeAdded, int indexForViewBeforeAdded,
+            ViewGroup.LayoutParams paramsForViewBeforeAdded, SparseIntArray orderCache) {
+        int childCount = mFlexContainer.getFlexItemCount();
+        List<Order> orders = createOrders(childCount);
+        Order orderForViewToBeAdded = new Order();
+        if (viewBeforeAdded != null
+                && paramsForViewBeforeAdded instanceof FlexItem) {
+            orderForViewToBeAdded.order = ((FlexItem)
+                    paramsForViewBeforeAdded).getOrder();
+        } else {
+            orderForViewToBeAdded.order = FlexItem.ORDER_DEFAULT;
+        }
+
+        if (indexForViewBeforeAdded == -1 || indexForViewBeforeAdded == childCount) {
+            orderForViewToBeAdded.index = childCount;
+        } else if (indexForViewBeforeAdded < mFlexContainer.getFlexItemCount()) {
+            orderForViewToBeAdded.index = indexForViewBeforeAdded;
+            for (int i = indexForViewBeforeAdded; i < childCount; i++) {
+                orders.get(i).index++;
+            }
+        } else {
+            // This path is not expected since OutOfBoundException will be thrown in the ViewGroup
+            // But setting the index for fail-safe
+            orderForViewToBeAdded.index = childCount;
+        }
+        orders.add(orderForViewToBeAdded);
+
+        return sortOrdersIntoReorderedIndices(childCount + 1, orders, orderCache);
+    }
+
+    /**
+     * Create an array, which indicates the reordered indices that
+     * {@link FlexItem#getOrder()} attributes are taken into account.
+     *
+     * @return @return an array which have the reordered indices
+     */
+    int[] createReorderedIndices(SparseIntArray orderCache) {
+        int childCount = mFlexContainer.getFlexItemCount();
+        List<Order> orders = createOrders(childCount);
+        return sortOrdersIntoReorderedIndices(childCount, orders, orderCache);
+    }
+
+    @NonNull
+    private List<Order> createOrders(int childCount) {
+        List<Order> orders = new ArrayList<>(childCount);
+        for (int i = 0; i < childCount; i++) {
+            View child = mFlexContainer.getFlexItemAt(i);
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+            Order order = new Order();
+            order.order = flexItem.getOrder();
+            order.index = i;
+            orders.add(order);
+        }
+        return orders;
+    }
+
+    /**
+     * Returns if any of the children's {@link FlexItem#getOrder()} attributes are
+     * changed from the last measurement.
+     *
+     * @return {@code true} if changed from the last measurement, {@code false} otherwise.
+     */
+    boolean isOrderChangedFromLastMeasurement(SparseIntArray orderCache) {
+        int childCount = mFlexContainer.getFlexItemCount();
+        if (orderCache.size() != childCount) {
+            return true;
+        }
+        for (int i = 0; i < childCount; i++) {
+            View view = mFlexContainer.getFlexItemAt(i);
+            if (view == null) {
+                continue;
+            }
+            FlexItem flexItem = (FlexItem) view.getLayoutParams();
+            if (flexItem.getOrder() != orderCache.get(i)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private int[] sortOrdersIntoReorderedIndices(int childCount, List<Order> orders,
+            SparseIntArray orderCache) {
+        Collections.sort(orders);
+        orderCache.clear();
+        int[] reorderedIndices = new int[childCount];
+        int i = 0;
+        for (Order order : orders) {
+            reorderedIndices[i] = order.index;
+            orderCache.append(order.index, order.order);
+            i++;
+        }
+        return reorderedIndices;
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method should calculate all the flex lines from the existing flex items.
+     *
+     * @see #calculateFlexLines(FlexLinesResult, int, int, int, int, int, List)
+     */
+    void calculateHorizontalFlexLines(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec) {
+        calculateFlexLines(result, widthMeasureSpec, heightMeasureSpec, Integer.MAX_VALUE,
+                0, NO_POSITION, null);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * Stop calculating it if the calculated amount along the cross size reaches the argument
+     * as the needsCalcAmount.
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param fromIndex         the index of the child from which the calculation starts
+     * @param existingLines     If not null, calculated flex lines will be added to this instance
+     */
+    void calculateHorizontalFlexLines(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int fromIndex,
+            @Nullable List<FlexLine> existingLines) {
+        calculateFlexLines(result, widthMeasureSpec, heightMeasureSpec, needsCalcAmount,
+                fromIndex, NO_POSITION, existingLines);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method calculates the amount of pixels as the {@code needsCalcAmount} in addition to
+     * the
+     * flex lines which includes the view who has the index as the {@code toIndex} argument.
+     * (First calculate to the toIndex, then calculate the amount of pixels as needsCalcAmount)
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param toIndex           the index of the child to which the calculation ends (until the
+     *                          flex line which include the which who has that index). If this
+     *                          and needsCalcAmount are both set, first flex lines are calculated
+     *                          to the index, calculate the amount of pixels as the needsCalcAmount
+     *                          argument in addition to that
+     */
+    void calculateHorizontalFlexLinesToIndex(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int toIndex, List<FlexLine> existingLines) {
+        calculateFlexLines(result, widthMeasureSpec, heightMeasureSpec, needsCalcAmount,
+                0, toIndex, existingLines);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method should calculate all the flex lines from the existing flex items.
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @see #calculateFlexLines(FlexLinesResult, int, int, int, int, int, List)
+     */
+    void calculateVerticalFlexLines(FlexLinesResult result, int widthMeasureSpec, int heightMeasureSpec) {
+        calculateFlexLines(result, heightMeasureSpec, widthMeasureSpec, Integer.MAX_VALUE,
+                0, NO_POSITION, null);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * Stop calculating it if the calculated amount along the cross size reaches the argument
+     * as the needsCalcAmount.
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param fromIndex         the index of the child from which the calculation starts
+     * @param existingLines     If not null, calculated flex lines will be added to this instance
+     */
+    void calculateVerticalFlexLines(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int fromIndex,
+            @Nullable List<FlexLine> existingLines) {
+        calculateFlexLines(result, heightMeasureSpec, widthMeasureSpec, needsCalcAmount,
+                fromIndex, NO_POSITION, existingLines);
+    }
+
+    /**
+     * Calculate how many flex lines are needed in the flex container.
+     * This method calculates the amount of pixels as the {@code needsCalcAmount} in addition to
+     * the
+     * flex lines which includes the view who has the index as the {@code toIndex} argument.
+     * (First calculate to the toIndex, then calculate the amount of pixels as needsCalcAmount)
+     *
+     * @param result            an instance of {@link FlexLinesResult} that is going to contain a
+     *                          list of flex lines and the child state used by
+     *                          {@link View#setMeasuredDimension(int, int)}.
+     * @param widthMeasureSpec  the width measure spec imposed by the flex container
+     * @param heightMeasureSpec the height measure spec imposed by the flex container
+     * @param needsCalcAmount   the amount of pixels where flex line calculation should be stopped
+     *                          this is needed to avoid the expensive calculation if the
+     *                          calculation is needed only the small part of the entire flex
+     *                          container. (E.g. If the flex container is the
+     *                          {@link FlexboxLayoutManager}, the calculation only needs the
+     *                          visible area, imposing the entire calculation may cause bad
+     *                          performance
+     * @param toIndex           the index of the child to which the calculation ends (until the
+     *                          flex line which include the which who has that index). If this
+     *                          and needsCalcAmount are both set, first flex lines are calculated
+     *                          to the index, calculate the amount of pixels as the needsCalcAmount
+     *                          argument in addition to that
+     */
+    void calculateVerticalFlexLinesToIndex(FlexLinesResult result, int widthMeasureSpec,
+            int heightMeasureSpec, int needsCalcAmount, int toIndex, List<FlexLine> existingLines) {
+        calculateFlexLines(result, heightMeasureSpec, widthMeasureSpec, needsCalcAmount,
+                0, toIndex, existingLines);
+    }
+
+
+    /**
+     * Calculates how many flex lines are needed in the flex container layout by measuring each
+     * child.
+     * Expanding or shrinking the flex items depending on the flex grow and flex shrink
+     * attributes are done in a later procedure, so the views' measured width and measured
+     * height may be changed in a later process.
+     *
+     * @param result           an instance of {@link FlexLinesResult} that is going to contain a
+     *                         list of flex lines and the child state used by
+     *                         {@link View#setMeasuredDimension(int, int)}.
+     * @param mainMeasureSpec  the main axis measure spec imposed by the flex container,
+     *                         width for horizontal direction, height otherwise
+     * @param crossMeasureSpec the cross axis measure spec imposed by the flex container,
+     *                         height for horizontal direction, width otherwise
+     * @param needsCalcAmount  the amount of pixels where flex line calculation should be stopped
+     *                         this is needed to avoid the expensive calculation if the
+     *                         calculation is needed only the small part of the entire flex
+     *                         container. (E.g. If the flex container is the
+     *                         {@link FlexboxLayoutManager}, the calculation only needs the
+     *                         visible area, imposing the entire calculation may cause bad
+     *                         performance
+     * @param fromIndex        the index of the child from which the calculation starts
+     * @param toIndex          the index of the child to which the calculation ends (until the
+     *                         flex line which include the which who has that index). If this
+     *                         and needsCalcAmount are both set, first flex lines are calculated
+     *                         to the index, calculate the amount of pixels as the needsCalcAmount
+     *                         argument in addition to that
+     * @param existingLines    If not null, calculated flex lines will be added to this instance
+     */
+    void calculateFlexLines(FlexLinesResult result, int mainMeasureSpec,
+            int crossMeasureSpec, int needsCalcAmount, int fromIndex, int toIndex,
+            @Nullable List<FlexLine> existingLines) {
+
+        boolean isMainHorizontal = mFlexContainer.isMainAxisDirectionHorizontal();
+
+        int mainMode = View.MeasureSpec.getMode(mainMeasureSpec);
+        int mainSize = View.MeasureSpec.getSize(mainMeasureSpec);
+
+        int childState = 0;
+
+        List<FlexLine> flexLines;
+        if (existingLines == null) {
+            flexLines = new ArrayList<>();
+        } else {
+            flexLines = existingLines;
+        }
+
+        result.mFlexLines = flexLines;
+
+        boolean reachedToIndex = toIndex == NO_POSITION;
+
+        int mainPaddingStart = getPaddingStartMain(isMainHorizontal);
+        int mainPaddingEnd = getPaddingEndMain(isMainHorizontal);
+        int crossPaddingStart = getPaddingStartCross(isMainHorizontal);
+        int crossPaddingEnd = getPaddingEndCross(isMainHorizontal);
+
+        int largestSizeInCross = Integer.MIN_VALUE;
+
+        // The amount of cross size calculated in this method call.
+        int sumCrossSize = 0;
+
+        // The index of the view in the flex line.
+        int indexInFlexLine = 0;
+
+        FlexLine flexLine = new FlexLine();
+        flexLine.mFirstIndex = fromIndex;
+        flexLine.mMainSize = mainPaddingStart + mainPaddingEnd;
+
+        int childCount = mFlexContainer.getFlexItemCount();
+        for (int i = fromIndex; i < childCount; i++) {
+            View child = mFlexContainer.getReorderedFlexItemAt(i);
+
+            if (child == null) {
+                if (isLastFlexItem(i, childCount, flexLine)) {
+                    addFlexLine(flexLines, flexLine, i, sumCrossSize);
+                }
+                continue;
+            } else if (child.getVisibility() == View.GONE) {
+                flexLine.mGoneItemCount++;
+                flexLine.mItemCount++;
+                if (isLastFlexItem(i, childCount, flexLine)) {
+                    addFlexLine(flexLines, flexLine, i, sumCrossSize);
+                }
+                continue;
+            } else if (child instanceof CompoundButton) {
+                evaluateMinimumSizeForCompoundButton((CompoundButton) child);
+            }
+
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+
+            if (flexItem.getAlignSelf() == AlignItems.STRETCH) {
+                flexLine.mIndicesAlignSelfStretch.add(i);
+            }
+
+            int childMainSize = getFlexItemSizeMain(flexItem, isMainHorizontal);
+
+            if (flexItem.getFlexBasisPercent() != FLEX_BASIS_PERCENT_DEFAULT
+                    && mainMode == View.MeasureSpec.EXACTLY) {
+                childMainSize = Math.round(mainSize * flexItem.getFlexBasisPercent());
+                // Use the dimension from the layout if the mainMode is not
+                // MeasureSpec.EXACTLY even if any fraction value is set to
+                // layout_flexBasisPercent.
+            }
+
+            int childMainMeasureSpec;
+            int childCrossMeasureSpec;
+            if (isMainHorizontal) {
+                childMainMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(mainMeasureSpec,
+                        mainPaddingStart + mainPaddingEnd +
+                                getFlexItemMarginStartMain(flexItem, true) +
+                                getFlexItemMarginEndMain(flexItem, true),
+                        childMainSize);
+                childCrossMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(crossMeasureSpec,
+                        crossPaddingStart + crossPaddingEnd +
+                                getFlexItemMarginStartCross(flexItem, true) +
+                                getFlexItemMarginEndCross(flexItem, true)
+                                + sumCrossSize,
+                        getFlexItemSizeCross(flexItem, true));
+                child.measure(childMainMeasureSpec, childCrossMeasureSpec);
+                updateMeasureCache(i, childMainMeasureSpec, childCrossMeasureSpec, child);
+            } else {
+                childCrossMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(crossMeasureSpec,
+                        crossPaddingStart + crossPaddingEnd +
+                                getFlexItemMarginStartCross(flexItem, false) +
+                                getFlexItemMarginEndCross(flexItem, false) + sumCrossSize,
+                        getFlexItemSizeCross(flexItem, false));
+                childMainMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(mainMeasureSpec,
+                        mainPaddingStart + mainPaddingEnd +
+                                getFlexItemMarginStartMain(flexItem, false) +
+                                getFlexItemMarginEndMain(flexItem, false),
+                        childMainSize);
+                child.measure(childCrossMeasureSpec, childMainMeasureSpec);
+                updateMeasureCache(i, childCrossMeasureSpec, childMainMeasureSpec, child);
+            }
+            mFlexContainer.updateViewCache(i, child);
+
+            // Check the size constraint after the first measurement for the child
+            // To prevent the child's width/height violate the size constraints imposed by the
+            // {@link FlexItem#getMinWidth()}, {@link FlexItem#getMinHeight()},
+            // {@link FlexItem#getMaxWidth()} and {@link FlexItem#getMaxHeight()} attributes.
+            // E.g. When the child's layout_width is wrap_content the measured width may be
+            // less than the min width after the first measurement.
+            checkSizeConstraints(child, i);
+
+            childState = View.combineMeasuredStates(
+                    childState, child.getMeasuredState());
+
+            if (isWrapRequired(child, mainMode, mainSize, flexLine.mMainSize,
+                    getViewMeasuredSizeMain(child, isMainHorizontal)
+                            + getFlexItemMarginStartMain(flexItem, isMainHorizontal) +
+                            getFlexItemMarginEndMain(flexItem, isMainHorizontal),
+                    flexItem, i, indexInFlexLine, flexLines.size())) {
+                if (flexLine.getItemCountNotGone() > 0) {
+                    addFlexLine(flexLines, flexLine, i > 0 ? i - 1 : 0, sumCrossSize);
+                    sumCrossSize += flexLine.mCrossSize;
+                }
+
+                if (isMainHorizontal) {
+                    if (flexItem.getHeight() == ViewGroup.LayoutParams.MATCH_PARENT) {
+                        // This case takes care of the corner case where the cross size of the
+                        // child is affected by the just added flex line.
+                        // E.g. when the child's layout_height is set to match_parent, the height
+                        // of that child needs to be determined taking the total cross size used
+                        // so far into account. In that case, the height of the child needs to be
+                        // measured again note that we don't need to judge if the wrapping occurs
+                        // because it doesn't change the size along the main axis.
+                        childCrossMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(
+                                crossMeasureSpec,
+                                mFlexContainer.getPaddingTop() + mFlexContainer.getPaddingBottom()
+                                        + flexItem.getMarginTop()
+                                        + flexItem.getMarginBottom() + sumCrossSize,
+                                flexItem.getHeight());
+                        child.measure(childMainMeasureSpec, childCrossMeasureSpec);
+                        checkSizeConstraints(child, i);
+                    }
+                } else {
+                    if (flexItem.getWidth() == ViewGroup.LayoutParams.MATCH_PARENT) {
+                        // This case takes care of the corner case where the cross size of the
+                        // child is affected by the just added flex line.
+                        // E.g. when the child's layout_width is set to match_parent, the width
+                        // of that child needs to be determined taking the total cross size used
+                        // so far into account. In that case, the width of the child needs to be
+                        // measured again note that we don't need to judge if the wrapping occurs
+                        // because it doesn't change the size along the main axis.
+                        childCrossMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(
+                                crossMeasureSpec,
+                                mFlexContainer.getPaddingLeft() + mFlexContainer.getPaddingRight()
+                                        + flexItem.getMarginLeft()
+                                        + flexItem.getMarginRight() + sumCrossSize,
+                                flexItem.getWidth());
+                        child.measure(childCrossMeasureSpec, childMainMeasureSpec);
+                        checkSizeConstraints(child, i);
+                    }
+                }
+
+                flexLine = new FlexLine();
+                flexLine.mItemCount = 1;
+                flexLine.mMainSize = mainPaddingStart + mainPaddingEnd;
+                flexLine.mFirstIndex = i;
+                indexInFlexLine = 0;
+                largestSizeInCross = Integer.MIN_VALUE;
+            } else {
+                flexLine.mItemCount++;
+                indexInFlexLine++;
+            }
+            flexLine.mAnyItemsHaveFlexGrow |= flexItem.getFlexGrow() != FLEX_GROW_DEFAULT;
+            flexLine.mAnyItemsHaveFlexShrink |= flexItem.getFlexShrink() != FLEX_SHRINK_NOT_SET;
+
+            if (mIndexToFlexLine != null) {
+                mIndexToFlexLine[i] = flexLines.size();
+            }
+            flexLine.mMainSize += getViewMeasuredSizeMain(child, isMainHorizontal)
+                    + getFlexItemMarginStartMain(flexItem, isMainHorizontal) +
+                    getFlexItemMarginEndMain(flexItem, isMainHorizontal);
+            flexLine.mTotalFlexGrow += flexItem.getFlexGrow();
+            flexLine.mTotalFlexShrink += flexItem.getFlexShrink();
+
+            mFlexContainer.onNewFlexItemAdded(child, i, indexInFlexLine, flexLine);
+
+            largestSizeInCross = Math.max(largestSizeInCross,
+                    getViewMeasuredSizeCross(child, isMainHorizontal) +
+                            getFlexItemMarginStartCross(flexItem, isMainHorizontal) +
+                            getFlexItemMarginEndCross(flexItem, isMainHorizontal) +
+                            mFlexContainer.getDecorationLengthCrossAxis(child));
+            // Temporarily set the cross axis length as the largest child in the flexLine
+            // Expand along the cross axis depending on the mAlignContent property if needed
+            // later
+            flexLine.mCrossSize = Math.max(flexLine.mCrossSize, largestSizeInCross);
+
+            if (isMainHorizontal) {
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    flexLine.mMaxBaseline = Math.max(flexLine.mMaxBaseline,
+                            child.getBaseline() + flexItem.getMarginTop());
+                } else {
+                    // if the flex wrap property is WRAP_REVERSE, calculate the
+                    // baseline as the distance from the cross end and the baseline
+                    // since the cross size calculation is based on the distance from the cross end
+                    flexLine.mMaxBaseline = Math.max(flexLine.mMaxBaseline,
+                            child.getMeasuredHeight() - child.getBaseline()
+                                    + flexItem.getMarginBottom());
+                }
+            }
+
+            if (isLastFlexItem(i, childCount, flexLine)) {
+                addFlexLine(flexLines, flexLine, i, sumCrossSize);
+                sumCrossSize += flexLine.mCrossSize;
+            }
+
+            if (toIndex != NO_POSITION
+                    && flexLines.size() > 0
+                    && flexLines.get(flexLines.size() - 1).mLastIndex >= toIndex
+                    && i >= toIndex
+                    && !reachedToIndex) {
+                // Calculated to include a flex line which includes the flex item having the
+                // toIndex.
+                // Let the sumCrossSize start from the negative value of the last flex line's
+                // cross size because otherwise flex lines aren't calculated enough to fill the
+                // visible area.
+                sumCrossSize = -flexLine.getCrossSize();
+                reachedToIndex = true;
+            }
+            if (sumCrossSize > needsCalcAmount && reachedToIndex) {
+                // Stop the calculation if the sum of cross size calculated reached to the point
+                // beyond the needsCalcAmount value to avoid unneeded calculation in a
+                // RecyclerView.
+                // To be precise, the decoration length may be added to the sumCrossSize,
+                // but we omit adding the decoration length because even without the decorator
+                // length, it's guaranteed that calculation is done at least beyond the
+                // needsCalcAmount
+                break;
+            }
+        }
+
+        result.mChildState = childState;
+    }
+
+    /**
+     * Compound buttons (ex. {{@link android.widget.CheckBox}}, {@link android.widget.ToggleButton})
+     * have a button drawable with minimum height and width specified for them.
+     * To align the behavior with CSS Flexbox we want to respect these minimum measurement to avoid
+     * these drawables from being cut off during calculation. When the compound button has a minimum
+     * width or height already specified we will not make any change since we assume those were
+     * voluntarily set by the user.
+     *
+     * @param compoundButton the compound button that need to be evaluated
+     */
+    private void evaluateMinimumSizeForCompoundButton(CompoundButton compoundButton) {
+        FlexItem flexItem = (FlexItem) compoundButton.getLayoutParams();
+        int minWidth = flexItem.getMinWidth();
+        int minHeight = flexItem.getMinHeight();
+
+        Drawable drawable = CompoundButtonCompat.getButtonDrawable(compoundButton);
+        int drawableMinWidth = drawable == null ? 0 : drawable.getMinimumWidth();
+        int drawableMinHeight = drawable == null ? 0 : drawable.getMinimumHeight();
+        flexItem.setMinWidth(minWidth == NOT_SET ? drawableMinWidth : minWidth);
+        flexItem.setMinHeight(minHeight == NOT_SET ? drawableMinHeight : minHeight);
+    }
+
+    /**
+     * Returns the container's start padding in the main axis. Either start or top.
+     *
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the start padding in the main axis
+     */
+    private int getPaddingStartMain(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingStart();
+        }
+
+        return mFlexContainer.getPaddingTop();
+    }
+
+    /**
+     * Returns the container's end padding in the main axis. Either end or bottom.
+     *
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the end padding in the main axis
+     */
+    private int getPaddingEndMain(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingEnd();
+        }
+
+        return mFlexContainer.getPaddingBottom();
+    }
+
+    /**
+     * Returns the container's start padding in the cross axis. Either start or top.
+     *
+     * @param isMainHorizontal is the main axis horizontal.
+     * @return the start padding in the cross axis
+     */
+    private int getPaddingStartCross(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingTop();
+        }
+
+        return mFlexContainer.getPaddingStart();
+    }
+
+    /**
+     * Returns the container's end padding in the cross axis. Either end or bottom.
+     *
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the end padding in the cross axis
+     */
+    private int getPaddingEndCross(boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return mFlexContainer.getPaddingBottom();
+        }
+
+        return mFlexContainer.getPaddingEnd();
+    }
+
+    /**
+     * Returns the view's measured size in the main axis. Either width or height.
+     *
+     * @param view             the view
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the view's measured size in the main axis
+     */
+    private int getViewMeasuredSizeMain(View view, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return view.getMeasuredWidth();
+        }
+
+        return view.getMeasuredHeight();
+    }
+
+    /**
+     * Returns the view's measured size in the cross axis. Either width or height.
+     *
+     * @param view             the view
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the view's measured size in the cross axis
+     */
+    private int getViewMeasuredSizeCross(View view, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return view.getMeasuredHeight();
+        }
+
+        return view.getMeasuredWidth();
+    }
+
+    /**
+     * Returns the flexItem's size in the main axis. Either width or height.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's size in the main axis
+     */
+    private int getFlexItemSizeMain(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getWidth();
+        }
+
+        return flexItem.getHeight();
+    }
+
+    /**
+     * Returns the flexItem's size in the cross axis. Either width or height.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's size in the cross axis
+     */
+    private int getFlexItemSizeCross(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getHeight();
+        }
+
+        return flexItem.getWidth();
+    }
+
+    /**
+     * Returns the flexItem's start margin in the main axis. Either start or top.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginLeft} (ViewGroup.MarginLayoutParams#getMarginStart isn't available
+     * in API level < 17). Thus this method needs to be used with {@link #getFlexItemMarginEndMain}
+     * not to misuse the margin in RTL.
+     *
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's start margin in the main axis
+     */
+    private int getFlexItemMarginStartMain(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginLeft();
+        }
+
+        return flexItem.getMarginTop();
+    }
+
+    /**
+     * Returns the flexItem's end margin in the main axis. Either end or bottom.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginRight} (ViewGroup.MarginLayoutParams#getMarginEnd isn't available
+     * in API level < 17). Thus this method needs to be used with
+     * {@link #getFlexItemMarginStartMain} not to misuse the margin in RTL.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's end margin in the main axis
+     */
+    private int getFlexItemMarginEndMain(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginRight();
+        }
+
+        return flexItem.getMarginBottom();
+    }
+
+    /**
+     * Returns the flexItem's start margin in the cross axis. Either start or top.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginLeft} (ViewGroup.MarginLayoutParams#getMarginStart isn't available
+     * in API level < 17). Thus this method needs to be used with
+     * {@link #getFlexItemMarginEndCross} to not to misuse the margin in RTL.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's start margin in the cross axis
+     */
+    private int getFlexItemMarginStartCross(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginTop();
+        }
+
+        return flexItem.getMarginLeft();
+    }
+
+    /**
+     * Returns the flexItem's end margin in the cross axis. Either end or bottom.
+     * For the backward compatibility for API level < 17, the horizontal margin is returned using
+     * {@link FlexItem#getMarginRight} (ViewGroup.MarginLayoutParams#getMarginEnd isn't available
+     * in API level < 17). Thus this method needs to be used with
+     * {@link #getFlexItemMarginStartCross} to not to misuse the margin in RTL.
+     *
+     * @param flexItem         the flexItem
+     * @param isMainHorizontal is the main axis horizontal
+     * @return the flexItem's end margin in the cross axis
+     */
+    private int getFlexItemMarginEndCross(FlexItem flexItem, boolean isMainHorizontal) {
+        if (isMainHorizontal) {
+            return flexItem.getMarginBottom();
+        }
+
+        return flexItem.getMarginRight();
+    }
+
+    /**
+     * Determine if a wrap is required (add a new flex line).
+     *
+     * @param view          the view being judged if the wrap required
+     * @param mode          the width or height mode along the main axis direction
+     * @param maxSize       the max size along the main axis direction
+     * @param currentLength the accumulated current length
+     * @param childLength   the length of a child view which is to be collected to the flex line
+     * @param flexItem      the LayoutParams for the view being determined whether a new flex line
+     *                      is needed
+     * @param index         the index of the view being added within the entire flex container
+     * @param indexInFlexLine the index of the view being added within the current flex line
+     * @param flexLinesSize the number of the existing flexlines size
+     * @return {@code true} if a wrap is required, {@code false} otherwise
+     * @see FlexContainer#getFlexWrap()
+     * @see FlexContainer#setFlexWrap(int)
+     */
+    private boolean isWrapRequired(View view, int mode, int maxSize, int currentLength,
+            int childLength, FlexItem flexItem, int index, int indexInFlexLine, int flexLinesSize) {
+        if (mFlexContainer.getFlexWrap() == FlexWrap.NOWRAP) {
+            return false;
+        }
+        if (flexItem.isWrapBefore()) {
+            return true;
+        }
+        if (mode == View.MeasureSpec.UNSPECIFIED) {
+            return false;
+        }
+        int maxLine = mFlexContainer.getMaxLine();
+        // Judge the condition by adding 1 to the current flexLinesSize because the flex line
+        // being computed isn't added to the flexLinesSize.
+        if (maxLine != NOT_SET && maxLine <= flexLinesSize + 1) {
+            return false;
+        }
+        int decorationLength =
+                mFlexContainer.getDecorationLengthMainAxis(view, index, indexInFlexLine);
+        if (decorationLength > 0) {
+            childLength += decorationLength;
+        }
+        return maxSize < currentLength + childLength;
+    }
+
+    private boolean isLastFlexItem(int childIndex, int childCount,
+            FlexLine flexLine) {
+        return childIndex == childCount - 1 && flexLine.getItemCountNotGone() != 0;
+    }
+
+    private void addFlexLine(List<FlexLine> flexLines, FlexLine flexLine, int viewIndex,
+            int usedCrossSizeSoFar) {
+        flexLine.mSumCrossSizeBefore = usedCrossSizeSoFar;
+        mFlexContainer.onNewFlexLineAdded(flexLine);
+        flexLine.mLastIndex = viewIndex;
+        flexLines.add(flexLine);
+    }
+
+    /**
+     * Checks if the view's width/height don't violate the minimum/maximum size constraints imposed
+     * by the {@link FlexItem#getMinWidth()}, {@link FlexItem#getMinHeight()},
+     * {@link FlexItem#getMaxWidth()} and {@link FlexItem#getMaxHeight()} attributes.
+     *
+     * @param view  the view to be checked
+     * @param index index of the view
+     */
+    private void checkSizeConstraints(View view, int index) {
+        boolean needsMeasure = false;
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int childWidth = view.getMeasuredWidth();
+        int childHeight = view.getMeasuredHeight();
+
+        if (childWidth < flexItem.getMinWidth()) {
+            needsMeasure = true;
+            childWidth = flexItem.getMinWidth();
+        } else if (childWidth > flexItem.getMaxWidth()) {
+            needsMeasure = true;
+            childWidth = flexItem.getMaxWidth();
+        }
+
+        if (childHeight < flexItem.getMinHeight()) {
+            needsMeasure = true;
+            childHeight = flexItem.getMinHeight();
+        } else if (childHeight > flexItem.getMaxHeight()) {
+            needsMeasure = true;
+            childHeight = flexItem.getMaxHeight();
+        }
+        if (needsMeasure) {
+            int widthSpec = View.MeasureSpec.makeMeasureSpec(childWidth, View.MeasureSpec.EXACTLY);
+            int heightSpec = View.MeasureSpec
+                    .makeMeasureSpec(childHeight, View.MeasureSpec.EXACTLY);
+            view.measure(widthSpec, heightSpec);
+            updateMeasureCache(index, widthSpec, heightSpec, view);
+            mFlexContainer.updateViewCache(index, view);
+        }
+    }
+
+    /**
+     * @see #determineMainSize(int, int, int)
+     */
+    void determineMainSize(int widthMeasureSpec, int heightMeasureSpec) {
+        determineMainSize(widthMeasureSpec, heightMeasureSpec, 0);
+    }
+
+    /**
+     * Determine the main size by expanding (shrinking if negative remaining free space is given)
+     * an individual child in each flex line if any children's mFlexGrow (or mFlexShrink if
+     * remaining
+     * space is negative) properties are set to non-zero.
+     *
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexContainer#getFlexDirection()
+     */
+    void determineMainSize(int widthMeasureSpec, int heightMeasureSpec, int fromIndex) {
+        ensureChildrenFrozen(mFlexContainer.getFlexItemCount());
+        if (fromIndex >= mFlexContainer.getFlexItemCount()) {
+            return;
+        }
+        int mainSize;
+        int paddingAlongMainAxis;
+        int flexDirection = mFlexContainer.getFlexDirection();
+        switch (mFlexContainer.getFlexDirection()) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                int widthMode = View.MeasureSpec.getMode(widthMeasureSpec);
+                int widthSize = View.MeasureSpec.getSize(widthMeasureSpec);
+                int largestMainSize = mFlexContainer.getLargestMainSize();
+                if (widthMode == View.MeasureSpec.EXACTLY) {
+                    mainSize = widthSize;
+                } else {
+                    mainSize = Math.min(largestMainSize, widthSize);
+                }
+                paddingAlongMainAxis = mFlexContainer.getPaddingLeft()
+                        + mFlexContainer.getPaddingRight();
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                int heightMode = View.MeasureSpec.getMode(heightMeasureSpec);
+                int heightSize = View.MeasureSpec.getSize(heightMeasureSpec);
+                if (heightMode == View.MeasureSpec.EXACTLY) {
+                    mainSize = heightSize;
+                } else {
+                    mainSize = mFlexContainer.getLargestMainSize();
+                }
+                paddingAlongMainAxis = mFlexContainer.getPaddingTop()
+                        + mFlexContainer.getPaddingBottom();
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid flex direction: " + flexDirection);
+        }
+
+        int flexLineIndex = 0;
+        if (mIndexToFlexLine != null) {
+            flexLineIndex = mIndexToFlexLine[fromIndex];
+        }
+        List<FlexLine> flexLines = mFlexContainer.getFlexLinesInternal();
+        for (int i = flexLineIndex, size = flexLines.size(); i < size; i++) {
+            FlexLine flexLine = flexLines.get(i);
+            if (flexLine.mMainSize < mainSize && flexLine.mAnyItemsHaveFlexGrow) {
+                expandFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine,
+                        mainSize, paddingAlongMainAxis, false);
+            } else if (flexLine.mMainSize > mainSize && flexLine.mAnyItemsHaveFlexShrink) {
+                shrinkFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine,
+                        mainSize, paddingAlongMainAxis, false);
+            }
+        }
+    }
+
+    private void ensureChildrenFrozen(int size) {
+        if (mChildrenFrozen == null) {
+            mChildrenFrozen = new boolean[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mChildrenFrozen.length < size) {
+            int newCapacity = mChildrenFrozen.length * 2;
+            mChildrenFrozen = new boolean[Math.max(newCapacity, size)];
+        } else {
+            Arrays.fill(mChildrenFrozen, false);
+        }
+    }
+
+    /**
+     * Expand the flex items along the main axis based on the individual mFlexGrow attribute.
+     *
+     * @param widthMeasureSpec     the horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec    the vertical space requirements as imposed by the parent
+     * @param flexLine             the flex line to which flex items belong
+     * @param maxMainSize          the maximum main size. Expanded main size will be this size
+     * @param paddingAlongMainAxis the padding value along the main axis
+     * @param calledRecursively    true if this method is called recursively, false otherwise
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexItem#getFlexGrow()
+     */
+    private void expandFlexItems(int widthMeasureSpec, int heightMeasureSpec, FlexLine flexLine,
+            int maxMainSize, int paddingAlongMainAxis, boolean calledRecursively) {
+        if (flexLine.mTotalFlexGrow <= 0 || maxMainSize < flexLine.mMainSize) {
+            return;
+        }
+        int sizeBeforeExpand = flexLine.mMainSize;
+        boolean needsReexpand = false;
+        float unitSpace = (maxMainSize - flexLine.mMainSize) / flexLine.mTotalFlexGrow;
+        flexLine.mMainSize = paddingAlongMainAxis + flexLine.mDividerLengthInMainSize;
+
+        // Setting the cross size of the flex line as the temporal value since the cross size of
+        // each flex item may be changed from the initial calculation
+        // (in the measureHorizontal/measureVertical method) even this method is part of the main
+        // size determination.
+        // E.g. If a TextView's layout_width is set to 0dp, layout_height is set to wrap_content,
+        // and layout_flexGrow is set to 1, the TextView is trying to expand to the vertical
+        // direction to enclose its content (in the measureHorizontal method), but
+        // the width will be expanded in this method. In that case, the height needs to be measured
+        // again with the expanded width.
+        int largestCrossSize = 0;
+        if (!calledRecursively) {
+            flexLine.mCrossSize = Integer.MIN_VALUE;
+        }
+        float accumulatedRoundError = 0;
+        for (int i = 0; i < flexLine.mItemCount; i++) {
+            int index = flexLine.mFirstIndex + i;
+            View child = mFlexContainer.getReorderedFlexItemAt(index);
+            if (child == null || child.getVisibility() == View.GONE) {
+                continue;
+            }
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+            int flexDirection = mFlexContainer.getFlexDirection();
+            if (flexDirection == FlexDirection.ROW || flexDirection == FlexDirection.ROW_REVERSE) {
+                // The direction of the main axis is horizontal
+
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured width from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredWidth returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, the case happens
+                    // frequently
+                    childMeasuredWidth = extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured height from the cache
+                    childMeasuredHeight = extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexGrow() > 0f) {
+                    float rawCalculatedWidth = childMeasuredWidth
+                            + unitSpace * flexItem.getFlexGrow();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedWidth += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newWidth = Math.round(rawCalculatedWidth);
+                    if (newWidth > flexItem.getMaxWidth()) {
+                        // This means the child can't expand beyond the value of the mMaxWidth
+                        // attribute.
+                        // To adjust the flex line length to the size of maxMainSize, remaining
+                        // positive free space needs to be re-distributed to other flex items
+                        // (children views). In that case, invoke this method again with the same
+                        // fromIndex.
+                        needsReexpand = true;
+                        newWidth = flexItem.getMaxWidth();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexGrow -= flexItem.getFlexGrow();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedWidth - newWidth);
+                        if (accumulatedRoundError > 1.0) {
+                            newWidth += 1;
+                            accumulatedRoundError -= 1.0;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newWidth -= 1;
+                            accumulatedRoundError += 1.0;
+                        }
+                    }
+                    int childHeightMeasureSpec = getChildHeightMeasureSpecInternal(
+                            heightMeasureSpec, flexItem, flexLine.mSumCrossSizeBefore);
+                    int childWidthMeasureSpec = View.MeasureSpec.makeMeasureSpec(newWidth,
+                            View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredHeight
+                        + flexItem.getMarginTop() + flexItem.getMarginBottom()
+                        + mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredWidth + flexItem.getMarginLeft()
+                        + flexItem.getMarginRight();
+            } else {
+                // The direction of the main axis is vertical
+
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured height from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredHeight returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, that case happens
+                    // frequently
+                    childMeasuredHeight =
+                            extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured width from the cache
+                    childMeasuredWidth =
+                            extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexGrow() > 0f) {
+                    float rawCalculatedHeight = childMeasuredHeight
+                            + unitSpace * flexItem.getFlexGrow();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedHeight += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newHeight = Math.round(rawCalculatedHeight);
+                    if (newHeight > flexItem.getMaxHeight()) {
+                        // This means the child can't expand beyond the value of the mMaxHeight
+                        // attribute.
+                        // To adjust the flex line length to the size of maxMainSize, remaining
+                        // positive free space needs to be re-distributed to other flex items
+                        // (children views). In that case, invoke this method again with the same
+                        // fromIndex.
+                        needsReexpand = true;
+                        newHeight = flexItem.getMaxHeight();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexGrow -= flexItem.getFlexGrow();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedHeight - newHeight);
+                        if (accumulatedRoundError > 1.0) {
+                            newHeight += 1;
+                            accumulatedRoundError -= 1.0;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newHeight -= 1;
+                            accumulatedRoundError += 1.0;
+                        }
+                    }
+                    int childWidthMeasureSpec = getChildWidthMeasureSpecInternal(widthMeasureSpec,
+                            flexItem, flexLine.mSumCrossSizeBefore);
+                    int childHeightMeasureSpec = View.MeasureSpec.makeMeasureSpec(newHeight,
+                            View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredWidth
+                        + flexItem.getMarginLeft() + flexItem.getMarginRight()
+                        + mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredHeight + flexItem.getMarginTop()
+                        + flexItem.getMarginBottom();
+            }
+            flexLine.mCrossSize = Math.max(flexLine.mCrossSize, largestCrossSize);
+        }
+
+        if (needsReexpand && sizeBeforeExpand != flexLine.mMainSize) {
+            // Re-invoke the method with the same flex line to distribute the positive free space
+            // that wasn't fully distributed (because of maximum length constraint)
+            expandFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine, maxMainSize,
+                    paddingAlongMainAxis, true);
+        }
+    }
+
+    /**
+     * Shrink the flex items along the main axis based on the individual mFlexShrink attribute.
+     *
+     * @param widthMeasureSpec     the horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec    the vertical space requirements as imposed by the parent
+     * @param flexLine             the flex line to which flex items belong
+     * @param maxMainSize          the maximum main size. Shrank main size will be this size
+     * @param paddingAlongMainAxis the padding value along the main axis
+     * @param calledRecursively    true if this method is called recursively, false otherwise
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexItem#getFlexShrink()
+     */
+    private void shrinkFlexItems(int widthMeasureSpec, int heightMeasureSpec, FlexLine flexLine,
+            int maxMainSize, int paddingAlongMainAxis, boolean calledRecursively) {
+        int sizeBeforeShrink = flexLine.mMainSize;
+        if (flexLine.mTotalFlexShrink <= 0 || maxMainSize > flexLine.mMainSize) {
+            return;
+        }
+        boolean needsReshrink = false;
+        float unitShrink = (flexLine.mMainSize - maxMainSize) / flexLine.mTotalFlexShrink;
+        float accumulatedRoundError = 0;
+        flexLine.mMainSize = paddingAlongMainAxis + flexLine.mDividerLengthInMainSize;
+
+        // Setting the cross size of the flex line as the temporal value since the cross size of
+        // each flex item may be changed from the initial calculation
+        // (in the measureHorizontal/measureVertical method) even this method is part of the main
+        // size determination.
+        // E.g. If a TextView's layout_width is set to 0dp, layout_height is set to wrap_content,
+        // and layout_flexGrow is set to 1, the TextView is trying to expand to the vertical
+        // direction to enclose its content (in the measureHorizontal method), but
+        // the width will be expanded in this method. In that case, the height needs to be measured
+        // again with the expanded width.
+        int largestCrossSize = 0;
+        if (!calledRecursively) {
+            flexLine.mCrossSize = Integer.MIN_VALUE;
+        }
+        for (int i = 0; i < flexLine.mItemCount; i++) {
+            int index = flexLine.mFirstIndex + i;
+            View child = mFlexContainer.getReorderedFlexItemAt(index);
+            if (child == null || child.getVisibility() == View.GONE) {
+                continue;
+            }
+            FlexItem flexItem = (FlexItem) child.getLayoutParams();
+            int flexDirection = mFlexContainer.getFlexDirection();
+            if (flexDirection == FlexDirection.ROW || flexDirection == FlexDirection.ROW_REVERSE) {
+                // The direction of main axis is horizontal
+
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured width from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredWidth returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, the case happens
+                    // frequently
+                    childMeasuredWidth = extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured height from the cache
+                    childMeasuredHeight = extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexShrink() > 0f) {
+                    float rawCalculatedWidth = childMeasuredWidth
+                            - unitShrink * flexItem.getFlexShrink();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedWidth += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newWidth = Math.round(rawCalculatedWidth);
+                    if (newWidth < flexItem.getMinWidth()) {
+                        // This means the child doesn't have enough space to distribute the negative
+                        // free space. To adjust the flex line length down to the maxMainSize,
+                        // remaining
+                        // negative free space needs to be re-distributed to other flex items
+                        // (children views). In that case, invoke this method again with the same
+                        // fromIndex.
+                        needsReshrink = true;
+                        newWidth = flexItem.getMinWidth();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexShrink -= flexItem.getFlexShrink();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedWidth - newWidth);
+                        if (accumulatedRoundError > 1.0) {
+                            newWidth += 1;
+                            accumulatedRoundError -= 1;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newWidth -= 1;
+                            accumulatedRoundError += 1;
+                        }
+                    }
+                    int childHeightMeasureSpec = getChildHeightMeasureSpecInternal(
+                            heightMeasureSpec, flexItem, flexLine.mSumCrossSizeBefore);
+                    int childWidthMeasureSpec =
+                            View.MeasureSpec.makeMeasureSpec(newWidth, View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredHeight +
+                        flexItem.getMarginTop() + flexItem.getMarginBottom() +
+                        mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredWidth + flexItem.getMarginLeft()
+                        + flexItem.getMarginRight();
+            } else {
+                // The direction of main axis is vertical
+
+                int childMeasuredHeight = child.getMeasuredHeight();
+                if (mMeasuredSizeCache != null) {
+                    // Retrieve the measured height from the cache because there
+                    // are some cases that the view is re-created from the last measure, thus
+                    // View#getMeasuredHeight returns 0.
+                    // E.g. if the flex container is FlexboxLayoutManager, that case happens
+                    // frequently
+                    childMeasuredHeight =
+                            extractHigherInt(mMeasuredSizeCache[index]);
+                }
+                int childMeasuredWidth = child.getMeasuredWidth();
+                if (mMeasuredSizeCache != null) {
+                    // Extract the measured width from the cache
+                    childMeasuredWidth =
+                            extractLowerInt(mMeasuredSizeCache[index]);
+                }
+                if (!mChildrenFrozen[index] && flexItem.getFlexShrink() > 0f) {
+                    float rawCalculatedHeight = childMeasuredHeight
+                            - unitShrink * flexItem.getFlexShrink();
+                    if (i == flexLine.mItemCount - 1) {
+                        rawCalculatedHeight += accumulatedRoundError;
+                        accumulatedRoundError = 0;
+                    }
+                    int newHeight = Math.round(rawCalculatedHeight);
+                    if (newHeight < flexItem.getMinHeight()) {
+                        // Need to invoke this method again like the case flex direction is vertical
+                        needsReshrink = true;
+                        newHeight = flexItem.getMinHeight();
+                        mChildrenFrozen[index] = true;
+                        flexLine.mTotalFlexShrink -= flexItem.getFlexShrink();
+                    } else {
+                        accumulatedRoundError += (rawCalculatedHeight - newHeight);
+                        if (accumulatedRoundError > 1.0) {
+                            newHeight += 1;
+                            accumulatedRoundError -= 1;
+                        } else if (accumulatedRoundError < -1.0) {
+                            newHeight -= 1;
+                            accumulatedRoundError += 1;
+                        }
+                    }
+                    int childWidthMeasureSpec = getChildWidthMeasureSpecInternal(widthMeasureSpec,
+                            flexItem, flexLine.mSumCrossSizeBefore);
+                    int childHeightMeasureSpec =
+                            View.MeasureSpec.makeMeasureSpec(newHeight, View.MeasureSpec.EXACTLY);
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
+
+                    childMeasuredWidth = child.getMeasuredWidth();
+                    childMeasuredHeight = child.getMeasuredHeight();
+                    updateMeasureCache(index, childWidthMeasureSpec, childHeightMeasureSpec,
+                            child);
+                    mFlexContainer.updateViewCache(index, child);
+                }
+                largestCrossSize = Math.max(largestCrossSize, childMeasuredWidth +
+                        flexItem.getMarginLeft() + flexItem.getMarginRight() +
+                        mFlexContainer.getDecorationLengthCrossAxis(child));
+                flexLine.mMainSize += childMeasuredHeight + flexItem.getMarginTop()
+                        + flexItem.getMarginBottom();
+            }
+            flexLine.mCrossSize = Math.max(flexLine.mCrossSize, largestCrossSize);
+        }
+
+        if (needsReshrink && sizeBeforeShrink != flexLine.mMainSize) {
+            // Re-invoke the method with the same fromIndex to distribute the negative free space
+            // that wasn't fully distributed (because some views length were not enough)
+            shrinkFlexItems(widthMeasureSpec, heightMeasureSpec, flexLine,
+                    maxMainSize, paddingAlongMainAxis, true);
+        }
+    }
+
+    private int getChildWidthMeasureSpecInternal(int widthMeasureSpec, FlexItem flexItem,
+            int padding) {
+        int childWidthMeasureSpec = mFlexContainer.getChildWidthMeasureSpec(widthMeasureSpec,
+                mFlexContainer.getPaddingLeft() + mFlexContainer.getPaddingRight() +
+                        flexItem.getMarginLeft() + flexItem.getMarginRight() + padding,
+                flexItem.getWidth());
+        int childWidth = View.MeasureSpec.getSize(childWidthMeasureSpec);
+        if (childWidth > flexItem.getMaxWidth()) {
+            childWidthMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMaxWidth(),
+                    View.MeasureSpec.getMode(childWidthMeasureSpec));
+        } else if (childWidth < flexItem.getMinWidth()) {
+            childWidthMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMinWidth(),
+                    View.MeasureSpec.getMode(childWidthMeasureSpec));
+        }
+        return childWidthMeasureSpec;
+    }
+
+    private int getChildHeightMeasureSpecInternal(int heightMeasureSpec, FlexItem flexItem,
+            int padding) {
+        int childHeightMeasureSpec = mFlexContainer.getChildHeightMeasureSpec(heightMeasureSpec,
+                mFlexContainer.getPaddingTop() + mFlexContainer.getPaddingBottom()
+                        + flexItem.getMarginTop() + flexItem.getMarginBottom() + padding,
+                flexItem.getHeight());
+        int childHeight = View.MeasureSpec.getSize(childHeightMeasureSpec);
+        if (childHeight > flexItem.getMaxHeight()) {
+            childHeightMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMaxHeight(),
+                    View.MeasureSpec.getMode(childHeightMeasureSpec));
+        } else if (childHeight < flexItem.getMinHeight()) {
+            childHeightMeasureSpec = View.MeasureSpec.makeMeasureSpec(flexItem.getMinHeight(),
+                    View.MeasureSpec.getMode(childHeightMeasureSpec));
+        }
+        return childHeightMeasureSpec;
+    }
+
+    /**
+     * Determines the cross size (Calculate the length along the cross axis).
+     * Expand the cross size only if the height mode is MeasureSpec.EXACTLY, otherwise
+     * use the sum of cross sizes of all flex lines.
+     *
+     * @param widthMeasureSpec      horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec     vertical space requirements as imposed by the parent
+     * @param paddingAlongCrossAxis the padding value for the FlexboxLayout along the cross axis
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexContainer#getAlignContent()
+     * @see FlexContainer#setAlignContent(int)
+     */
+    void determineCrossSize(int widthMeasureSpec, int heightMeasureSpec,
+            int paddingAlongCrossAxis) {
+        // The MeasureSpec mode along the cross axis
+        int mode;
+        // The MeasureSpec size along the cross axis
+        int size;
+        int flexDirection = mFlexContainer.getFlexDirection();
+        switch (flexDirection) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                mode = View.MeasureSpec.getMode(heightMeasureSpec);
+                size = View.MeasureSpec.getSize(heightMeasureSpec);
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                mode = View.MeasureSpec.getMode(widthMeasureSpec);
+                size = View.MeasureSpec.getSize(widthMeasureSpec);
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid flex direction: " + flexDirection);
+        }
+        List<FlexLine> flexLines = mFlexContainer.getFlexLinesInternal();
+        if (mode == View.MeasureSpec.EXACTLY) {
+            int totalCrossSize = mFlexContainer.getSumOfCrossSize() + paddingAlongCrossAxis;
+            if (flexLines.size() == 1) {
+                flexLines.get(0).mCrossSize = size - paddingAlongCrossAxis;
+                // alignContent property is valid only if the Flexbox has at least two lines
+            } else if (flexLines.size() >= 2) {
+                switch (mFlexContainer.getAlignContent()) {
+                    case AlignContent.STRETCH: {
+                        if (totalCrossSize >= size) {
+                            break;
+                        }
+                        float freeSpaceUnit = (size - totalCrossSize) / (float) flexLines.size();
+                        float accumulatedError = 0;
+                        for (int i = 0, flexLinesSize = flexLines.size(); i < flexLinesSize; i++) {
+                            FlexLine flexLine = flexLines.get(i);
+                            float newCrossSizeAsFloat = flexLine.mCrossSize + freeSpaceUnit;
+                            if (i == flexLines.size() - 1) {
+                                newCrossSizeAsFloat += accumulatedError;
+                                accumulatedError = 0;
+                            }
+                            int newCrossSize = Math.round(newCrossSizeAsFloat);
+                            accumulatedError += (newCrossSizeAsFloat - newCrossSize);
+                            if (accumulatedError > 1) {
+                                newCrossSize += 1;
+                                accumulatedError -= 1;
+                            } else if (accumulatedError < -1) {
+                                newCrossSize -= 1;
+                                accumulatedError += 1;
+                            }
+                            flexLine.mCrossSize = newCrossSize;
+                        }
+                        break;
+                    }
+                    case AlignContent.SPACE_AROUND: {
+                        if (totalCrossSize >= size) {
+                            // If the size of the content is larger than the flex container, the
+                            // Flex lines should be aligned center like ALIGN_CONTENT_CENTER
+                            mFlexContainer.setFlexLines(
+                                    constructFlexLinesForAlignContentCenter(flexLines, size,
+                                            totalCrossSize));
+                            break;
+                        }
+                        // The value of free space along the cross axis which needs to be put on top
+                        // and below the bottom of each flex line.
+                        int spaceTopAndBottom = size - totalCrossSize;
+                        // The number of spaces along the cross axis
+                        int numberOfSpaces = flexLines.size() * 2;
+                        spaceTopAndBottom = spaceTopAndBottom / numberOfSpaces;
+                        List<FlexLine> newFlexLines = new ArrayList<>();
+                        FlexLine dummySpaceFlexLine = new FlexLine();
+                        dummySpaceFlexLine.mCrossSize = spaceTopAndBottom;
+                        for (FlexLine flexLine : flexLines) {
+                            newFlexLines.add(dummySpaceFlexLine);
+                            newFlexLines.add(flexLine);
+                            newFlexLines.add(dummySpaceFlexLine);
+                        }
+                        mFlexContainer.setFlexLines(newFlexLines);
+                        break;
+                    }
+                    case AlignContent.SPACE_BETWEEN: {
+                        if (totalCrossSize >= size) {
+                            break;
+                        }
+                        // The value of free space along the cross axis between each flex line.
+                        float spaceBetweenFlexLine = size - totalCrossSize;
+                        int numberOfSpaces = flexLines.size() - 1;
+                        spaceBetweenFlexLine = spaceBetweenFlexLine / (float) numberOfSpaces;
+                        float accumulatedError = 0;
+                        List<FlexLine> newFlexLines = new ArrayList<>();
+                        for (int i = 0, flexLineSize = flexLines.size(); i < flexLineSize; i++) {
+                            FlexLine flexLine = flexLines.get(i);
+                            newFlexLines.add(flexLine);
+
+                            if (i != flexLines.size() - 1) {
+                                FlexLine dummySpaceFlexLine = new FlexLine();
+                                if (i == flexLines.size() - 2) {
+                                    // The last dummy space block in the flex container.
+                                    // Adjust the cross size by the accumulated error.
+                                    dummySpaceFlexLine.mCrossSize = Math
+                                            .round(spaceBetweenFlexLine + accumulatedError);
+                                    accumulatedError = 0;
+                                } else {
+                                    dummySpaceFlexLine.mCrossSize = Math
+                                            .round(spaceBetweenFlexLine);
+                                }
+                                accumulatedError += (spaceBetweenFlexLine
+                                        - dummySpaceFlexLine.mCrossSize);
+                                if (accumulatedError > 1) {
+                                    dummySpaceFlexLine.mCrossSize += 1;
+                                    accumulatedError -= 1;
+                                } else if (accumulatedError < -1) {
+                                    dummySpaceFlexLine.mCrossSize -= 1;
+                                    accumulatedError += 1;
+                                }
+                                newFlexLines.add(dummySpaceFlexLine);
+                            }
+                        }
+                        mFlexContainer.setFlexLines(newFlexLines);
+                        break;
+                    }
+                    case AlignContent.CENTER: {
+                        mFlexContainer.setFlexLines(
+                                constructFlexLinesForAlignContentCenter(flexLines, size,
+                                        totalCrossSize));
+                        break;
+                    }
+                    case AlignContent.FLEX_END: {
+                        int spaceTop = size - totalCrossSize;
+                        FlexLine dummySpaceFlexLine = new FlexLine();
+                        dummySpaceFlexLine.mCrossSize = spaceTop;
+                        flexLines.add(0, dummySpaceFlexLine);
+                        break;
+                    }
+                    case AlignContent.FLEX_START:
+                        // No op. Just to cover the available switch statement options
+                        break;
+                }
+            }
+        }
+    }
+
+    private List<FlexLine> constructFlexLinesForAlignContentCenter(List<FlexLine> flexLines,
+            int size, int totalCrossSize) {
+        int spaceAboveAndBottom = size - totalCrossSize;
+        spaceAboveAndBottom = spaceAboveAndBottom / 2;
+        List<FlexLine> newFlexLines = new ArrayList<>();
+        FlexLine dummySpaceFlexLine = new FlexLine();
+        dummySpaceFlexLine.mCrossSize = spaceAboveAndBottom;
+        for (int i = 0, flexLineSize = flexLines.size(); i < flexLineSize; i++) {
+            if (i == 0) {
+                newFlexLines.add(dummySpaceFlexLine);
+            }
+            FlexLine flexLine = flexLines.get(i);
+            newFlexLines.add(flexLine);
+            if (i == flexLines.size() - 1) {
+                newFlexLines.add(dummySpaceFlexLine);
+            }
+        }
+        return newFlexLines;
+    }
+
+    void stretchViews() {
+        stretchViews(0);
+    }
+
+    /**
+     * Expand the view if the {@link FlexContainer#getAlignItems()} attribute is set to {@link
+     * AlignItems#STRETCH} or {@link FlexItem#getAlignSelf()} is set as
+     * {@link AlignItems#STRETCH}.
+     *
+     * @param fromIndex the index from which value, stretch is calculated
+     * @see FlexContainer#getFlexDirection()
+     * @see FlexContainer#setFlexDirection(int)
+     * @see FlexContainer#getAlignItems()
+     * @see FlexContainer#setAlignItems(int)
+     * @see FlexItem#getAlignSelf()
+     */
+    void stretchViews(int fromIndex) {
+        if (fromIndex >= mFlexContainer.getFlexItemCount()) {
+            return;
+        }
+        int flexDirection = mFlexContainer.getFlexDirection();
+        if (mFlexContainer.getAlignItems() == AlignItems.STRETCH) {
+            int flexLineIndex = 0;
+            if (mIndexToFlexLine != null) {
+                flexLineIndex = mIndexToFlexLine[fromIndex];
+            }
+            List<FlexLine> flexLines = mFlexContainer.getFlexLinesInternal();
+            for (int i = flexLineIndex, size = flexLines.size(); i < size; i++) {
+                FlexLine flexLine = flexLines.get(i);
+                for (int j = 0, itemCount = flexLine.mItemCount; j < itemCount; j++) {
+                    int viewIndex = flexLine.mFirstIndex + j;
+                    if (j >= mFlexContainer.getFlexItemCount()) {
+                        continue;
+                    }
+                    View view = mFlexContainer.getReorderedFlexItemAt(viewIndex);
+                    if (view == null || view.getVisibility() == View.GONE) {
+                        continue;
+                    }
+                    FlexItem flexItem = (FlexItem) view.getLayoutParams();
+                    if (flexItem.getAlignSelf() != AlignSelf.AUTO &&
+                            flexItem.getAlignSelf() != AlignItems.STRETCH) {
+                        continue;
+                    }
+                    switch (flexDirection) {
+                        case FlexDirection.ROW: // Intentional fall through
+                        case FlexDirection.ROW_REVERSE:
+                            stretchViewVertically(view, flexLine.mCrossSize, viewIndex);
+                            break;
+                        case FlexDirection.COLUMN:
+                        case FlexDirection.COLUMN_REVERSE:
+                            stretchViewHorizontally(view, flexLine.mCrossSize, viewIndex);
+                            break;
+                        default:
+                            throw new IllegalArgumentException(
+                                    "Invalid flex direction: " + flexDirection);
+                    }
+                }
+            }
+        } else {
+            for (FlexLine flexLine : mFlexContainer.getFlexLinesInternal()) {
+                for (Integer index : flexLine.mIndicesAlignSelfStretch) {
+                    View view = mFlexContainer.getReorderedFlexItemAt(index);
+                    switch (flexDirection) {
+                        case FlexDirection.ROW: // Intentional fall through
+                        case FlexDirection.ROW_REVERSE:
+                            stretchViewVertically(view, flexLine.mCrossSize, index);
+                            break;
+                        case FlexDirection.COLUMN:
+                        case FlexDirection.COLUMN_REVERSE:
+                            stretchViewHorizontally(view, flexLine.mCrossSize, index);
+                            break;
+                        default:
+                            throw new IllegalArgumentException(
+                                    "Invalid flex direction: " + flexDirection);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Expand the view vertically to the size of the crossSize (considering the view margins)
+     *
+     * @param view      the View to be stretched
+     * @param crossSize the cross size
+     * @param index     the index of the view
+     */
+    private void stretchViewVertically(View view, int crossSize, int index) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int newHeight = crossSize - flexItem.getMarginTop() - flexItem.getMarginBottom() -
+                mFlexContainer.getDecorationLengthCrossAxis(view);
+        newHeight = Math.max(newHeight, flexItem.getMinHeight());
+        newHeight = Math.min(newHeight, flexItem.getMaxHeight());
+        int childWidthSpec;
+        int measuredWidth;
+        if (mMeasuredSizeCache != null) {
+            // Retrieve the measured height from the cache because there
+            // are some cases that the view is re-created from the last measure, thus
+            // View#getMeasuredHeight returns 0.
+            // E.g. if the flex container is FlexboxLayoutManager, that case happens
+            // frequently
+            measuredWidth = extractLowerInt(mMeasuredSizeCache[index]);
+        } else {
+            measuredWidth = view.getMeasuredWidth();
+        }
+        childWidthSpec = View.MeasureSpec.makeMeasureSpec(measuredWidth,
+                View.MeasureSpec.EXACTLY);
+
+        int childHeightSpec = View.MeasureSpec.makeMeasureSpec(newHeight, View.MeasureSpec.EXACTLY);
+        view.measure(childWidthSpec, childHeightSpec);
+
+        updateMeasureCache(index, childWidthSpec, childHeightSpec, view);
+        mFlexContainer.updateViewCache(index, view);
+    }
+
+    /**
+     * Expand the view horizontally to the size of the crossSize (considering the view margins)
+     *
+     * @param view      the View to be stretched
+     * @param crossSize the cross size
+     * @param index     the index of the view
+     */
+    private void stretchViewHorizontally(View view, int crossSize, int index) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int newWidth = crossSize - flexItem.getMarginLeft() - flexItem.getMarginRight()
+                - mFlexContainer.getDecorationLengthCrossAxis(view);
+        newWidth = Math.max(newWidth, flexItem.getMinWidth());
+        newWidth = Math.min(newWidth, flexItem.getMaxWidth());
+        int childHeightSpec;
+        int measuredHeight;
+        if (mMeasuredSizeCache != null) {
+            // Retrieve the measured height from the cache because there
+            // are some cases that the view is re-created from the last measure, thus
+            // View#getMeasuredHeight returns 0.
+            // E.g. if the flex container is FlexboxLayoutManager, that case happens
+            // frequently
+            measuredHeight = extractHigherInt(mMeasuredSizeCache[index]);
+        } else {
+            measuredHeight = view.getMeasuredHeight();
+        }
+        childHeightSpec = View.MeasureSpec.makeMeasureSpec(measuredHeight,
+                View.MeasureSpec.EXACTLY);
+        int childWidthSpec = View.MeasureSpec.makeMeasureSpec(newWidth, View.MeasureSpec.EXACTLY);
+        view.measure(childWidthSpec, childHeightSpec);
+
+        updateMeasureCache(index, childWidthSpec, childHeightSpec, view);
+        mFlexContainer.updateViewCache(index, view);
+    }
+
+    /**
+     * Place a single View when the layout direction is horizontal
+     * ({@link FlexContainer#getFlexDirection()} is either {@link FlexDirection#ROW} or
+     * {@link FlexDirection#ROW_REVERSE}).
+     *
+     * @param view     the View to be placed
+     * @param flexLine the {@link FlexLine} where the View belongs to
+     * @param left     the left position of the View, which the View's margin is already taken
+     *                 into account
+     * @param top      the top position of the flex line where the View belongs to. The actual
+     *                 View's top position is shifted depending on the flexWrap and alignItems
+     *                 attributes
+     * @param right    the right position of the View, which the View's margin is already taken
+     *                 into account
+     * @param bottom   the bottom position of the flex line where the View belongs to. The actual
+     *                 View's bottom position is shifted depending on the flexWrap and alignItems
+     *                 attributes
+     * @see FlexContainer#getAlignItems()
+     * @see FlexContainer#setAlignItems(int)
+     * @see FlexItem#getAlignSelf()
+     */
+    void layoutSingleChildHorizontal(View view, FlexLine flexLine, int left, int top, int right,
+            int bottom) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int alignItems = mFlexContainer.getAlignItems();
+        if (flexItem.getAlignSelf() != AlignSelf.AUTO) {
+            // Expecting the values for alignItems and mAlignSelf match except for ALIGN_SELF_AUTO.
+            // Assigning the mAlignSelf value as alignItems should work.
+            alignItems = flexItem.getAlignSelf();
+        }
+        int crossSize = flexLine.mCrossSize;
+        switch (alignItems) {
+            case AlignItems.FLEX_START: // Intentional fall through
+            case AlignItems.STRETCH:
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    view.layout(left, top + flexItem.getMarginTop(), right,
+                            bottom + flexItem.getMarginTop());
+                } else {
+                    view.layout(left, top - flexItem.getMarginBottom(), right,
+                            bottom - flexItem.getMarginBottom());
+                }
+                break;
+            case AlignItems.BASELINE:
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    int marginTop = flexLine.mMaxBaseline - view.getBaseline();
+                    marginTop = Math.max(marginTop, flexItem.getMarginTop());
+                    view.layout(left, top + marginTop, right, bottom + marginTop);
+                } else {
+                    int marginBottom = flexLine.mMaxBaseline - view.getMeasuredHeight() + view
+                            .getBaseline();
+                    marginBottom = Math.max(marginBottom, flexItem.getMarginBottom());
+                    view.layout(left, top - marginBottom, right, bottom - marginBottom);
+                }
+                break;
+            case AlignItems.FLEX_END:
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    view.layout(left,
+                            top + crossSize - view.getMeasuredHeight() - flexItem.getMarginBottom(),
+                            right, top + crossSize - flexItem.getMarginBottom());
+                } else {
+                    // If the flexWrap == WRAP_REVERSE, the direction of the
+                    // flexEnd is flipped (from top to bottom).
+                    view.layout(left,
+                            top - crossSize + view.getMeasuredHeight() + flexItem.getMarginTop(),
+                            right, bottom - crossSize + view.getMeasuredHeight() + flexItem
+                                    .getMarginTop());
+                }
+                break;
+            case AlignItems.CENTER:
+                int topFromCrossAxis = (crossSize - view.getMeasuredHeight()
+                        + flexItem.getMarginTop() - flexItem.getMarginBottom()) / 2;
+                if (mFlexContainer.getFlexWrap() != FlexWrap.WRAP_REVERSE) {
+                    view.layout(left, top + topFromCrossAxis,
+                            right, top + topFromCrossAxis + view.getMeasuredHeight());
+                } else {
+                    view.layout(left, top - topFromCrossAxis,
+                            right, top - topFromCrossAxis + view.getMeasuredHeight());
+                }
+                break;
+        }
+    }
+
+    /**
+     * Place a single View when the layout direction is vertical
+     * ({@link FlexContainer#getFlexDirection()} is either {@link FlexDirection#COLUMN} or
+     * {@link FlexDirection#COLUMN_REVERSE}).
+     *
+     * @param view     the View to be placed
+     * @param flexLine the {@link FlexLine} where the View belongs to
+     * @param isRtl    {@code true} if the layout direction is right to left, {@code false}
+     *                 otherwise
+     * @param left     the left position of the flex line where the View belongs to. The actual
+     *                 View's left position is shifted depending on the isLayoutRtl and alignItems
+     *                 attributes
+     * @param top      the top position of the View, which the View's margin is already taken
+     *                 into account
+     * @param right    the right position of the flex line where the View belongs to. The actual
+     *                 View's right position is shifted depending on the isLayoutRtl and alignItems
+     *                 attributes
+     * @param bottom   the bottom position of the View, which the View's margin is already taken
+     *                 into account
+     * @see FlexContainer#getAlignItems()
+     * @see FlexContainer#setAlignItems(int)
+     * @see FlexItem#getAlignSelf()
+     */
+    void layoutSingleChildVertical(View view, FlexLine flexLine, boolean isRtl,
+            int left, int top, int right, int bottom) {
+        FlexItem flexItem = (FlexItem) view.getLayoutParams();
+        int alignItems = mFlexContainer.getAlignItems();
+        if (flexItem.getAlignSelf() != AlignSelf.AUTO) {
+            // Expecting the values for alignItems and mAlignSelf match except for ALIGN_SELF_AUTO.
+            // Assigning the mAlignSelf value as alignItems should work.
+            alignItems = flexItem.getAlignSelf();
+        }
+        int crossSize = flexLine.mCrossSize;
+        switch (alignItems) {
+            case AlignItems.FLEX_START: // Intentional fall through
+            case AlignItems.STRETCH: // Intentional fall through
+            case AlignItems.BASELINE:
+                if (!isRtl) {
+                    view.layout(left + flexItem.getMarginLeft(), top,
+                            right + flexItem.getMarginLeft(), bottom);
+                } else {
+                    view.layout(left - flexItem.getMarginRight(), top,
+                            right - flexItem.getMarginRight(), bottom);
+                }
+                break;
+            case AlignItems.FLEX_END:
+                if (!isRtl) {
+                    view.layout(
+                            left + crossSize - view.getMeasuredWidth() - flexItem.getMarginRight(),
+                            top,
+                            right + crossSize - view.getMeasuredWidth() - flexItem.getMarginRight(),
+                            bottom);
+                } else {
+                    // If the flexWrap == WRAP_REVERSE, the direction of the
+                    // flexEnd is flipped (from left to right).
+                    view.layout(
+                            left - crossSize + view.getMeasuredWidth() + flexItem.getMarginLeft(),
+                            top,
+                            right - crossSize + view.getMeasuredWidth() + flexItem.getMarginLeft(),
+                            bottom);
+                }
+                break;
+            case AlignItems.CENTER:
+                ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams)
+                        view.getLayoutParams();
+                int leftFromCrossAxis = (crossSize - view.getMeasuredWidth()
+                        + MarginLayoutParamsCompat.getMarginStart(lp)
+                        - MarginLayoutParamsCompat.getMarginEnd(lp)) / 2;
+                if (!isRtl) {
+                    view.layout(left + leftFromCrossAxis, top, right + leftFromCrossAxis, bottom);
+                } else {
+                    view.layout(left - leftFromCrossAxis, top, right - leftFromCrossAxis, bottom);
+                }
+                break;
+        }
+    }
+
+    void ensureMeasuredSizeCache(int size) {
+        if (mMeasuredSizeCache == null) {
+            mMeasuredSizeCache = new long[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mMeasuredSizeCache.length < size) {
+            int newCapacity = mMeasuredSizeCache.length * 2;
+            newCapacity = Math.max(newCapacity, size);
+            mMeasuredSizeCache = Arrays.copyOf(mMeasuredSizeCache, newCapacity);
+        }
+    }
+
+    void ensureMeasureSpecCache(int size) {
+        if (mMeasureSpecCache == null) {
+            mMeasureSpecCache = new long[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mMeasureSpecCache.length < size) {
+            int newCapacity = mMeasureSpecCache.length * 2;
+            newCapacity = Math.max(newCapacity, size);
+            mMeasureSpecCache = Arrays.copyOf(mMeasureSpecCache, newCapacity);
+        }
+    }
+
+    /**
+     * @param longValue the long value that consists of width and height measure specs
+     * @return the int value which consists from the lower 8 bits
+     * @see #makeCombinedLong(int, int)
+     */
+    int extractLowerInt(long longValue) {
+        return (int) longValue;
+    }
+
+    /**
+     * @param longValue the long value that consists of width and height measure specs
+     * @return the int value which consists from the higher 8 bits
+     * @see #makeCombinedLong(int, int)
+     */
+    int extractHigherInt(long longValue) {
+        return (int) (longValue >> 32);
+    }
+
+    /**
+     * Make a long value from the a width measure spec and a height measure spec.
+     * The first 32 bit is used for the height measure spec and the last 32 bit is used for the
+     * width measure spec.
+     *
+     * @param widthMeasureSpec  the width measure spec to consist the result long value
+     * @param heightMeasureSpec the height measure spec to consist the result long value
+     * @return the combined long value
+     * @see #extractLowerInt(long)
+     * @see #extractHigherInt(long)
+     */
+    @VisibleForTesting
+    long makeCombinedLong(int widthMeasureSpec, int heightMeasureSpec) {
+        // Suppress sign extension for the low bytes
+        return (long) heightMeasureSpec << 32 | (long) widthMeasureSpec & MEASURE_SPEC_WIDTH_MASK;
+    }
+
+    private void updateMeasureCache(int index, int widthMeasureSpec, int heightMeasureSpec,
+            View view) {
+        if (mMeasureSpecCache != null) {
+            mMeasureSpecCache[index] = makeCombinedLong(
+                    widthMeasureSpec,
+                    heightMeasureSpec);
+        }
+        if (mMeasuredSizeCache != null) {
+            mMeasuredSizeCache[index] = makeCombinedLong(
+                    view.getMeasuredWidth(),
+                    view.getMeasuredHeight());
+        }
+    }
+
+    void ensureIndexToFlexLine(int size) {
+        if (mIndexToFlexLine == null) {
+            mIndexToFlexLine = new int[Math.max(size, INITIAL_CAPACITY)];
+        } else if (mIndexToFlexLine.length < size) {
+            int newCapacity = mIndexToFlexLine.length * 2;
+            newCapacity = Math.max(newCapacity, size);
+            mIndexToFlexLine = Arrays.copyOf(mIndexToFlexLine, newCapacity);
+        }
+    }
+
+    /**
+     * Clear the from flex lines and the caches from the index passed as an argument.
+     *
+     * @param flexLines    the flex lines to be cleared
+     * @param fromFlexItem the index from which, flex lines are cleared
+     */
+    void clearFlexLines(List<FlexLine> flexLines, int fromFlexItem) {
+        assert mIndexToFlexLine != null;
+        assert mMeasureSpecCache != null;
+
+        int fromFlexLine = mIndexToFlexLine[fromFlexItem];
+        if (fromFlexLine == NO_POSITION) {
+            fromFlexLine = 0;
+        }
+
+        // Deleting from the last to avoid unneeded copy it happens when deleting the middle of the
+        // item in the ArrayList
+        if (flexLines.size() > fromFlexLine) {
+            flexLines.subList(fromFlexLine, flexLines.size()).clear();
+        }
+
+        int fillTo = mIndexToFlexLine.length - 1;
+        if (fromFlexItem > fillTo) {
+            Arrays.fill(mIndexToFlexLine, NO_POSITION);
+        } else {
+            Arrays.fill(mIndexToFlexLine, fromFlexItem, fillTo, NO_POSITION);
+        }
+
+        fillTo = mMeasureSpecCache.length - 1;
+        if (fromFlexItem > fillTo) {
+            Arrays.fill(mMeasureSpecCache, 0);
+        } else {
+            Arrays.fill(mMeasureSpecCache, fromFlexItem, fillTo, 0);
+        }
+    }
+
+    /**
+     * A class that is used for calculating the view order which view's indices and order
+     * properties from Flexbox are taken into account.
+     */
+    private static class Order implements Comparable<Order> {
+
+        /** {@link View}'s index */
+        int index;
+
+        /** order property in the Flexbox */
+        int order;
+
+        @Override
+        public int compareTo(@NonNull Order another) {
+            if (order != another.order) {
+                return order - another.order;
+            }
+            return index - another.index;
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return "Order{" +
+                    "order=" + order +
+                    ", index=" + index +
+                    '}';
+        }
+    }
+
+    static class FlexLinesResult {
+
+        List<FlexLine> mFlexLines;
+
+        int mChildState;
+
+        void reset() {
+            mFlexLines = null;
+            mChildState = 0;
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxItemDecoration.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxItemDecoration.java
new file mode 100755
index 0000000..ad33332
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxItemDecoration.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2017 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * {@link RecyclerView.ItemDecoration} implementation that can be used as item decorations between
+ * view holders within the {@link FlexboxLayoutManager}.
+ *
+ * Orientation for the decoration can be either of:
+ * <ul>
+ * <li>Horizontal (setOrientation(HORIZONTAL)</li>
+ * <li>Vertical (setOrientation(VERTICAL)</li>
+ * <li>Both orientation (setOrientation(BOTH)</li>
+ * </ul>.
+ * The default value is set to both.
+ */
+public class FlexboxItemDecoration extends RecyclerView.ItemDecoration {
+
+    public static final int HORIZONTAL = 1;
+    public static final int VERTICAL = 1 << 1;
+    @SuppressWarnings("WeakerAccess")
+    public static final int BOTH = HORIZONTAL | VERTICAL;
+
+    private static final int[] LIST_DIVIDER_ATTRS = new int[]{android.R.attr.listDivider};
+
+    private Drawable mDrawable;
+
+    private int mOrientation;
+
+    public FlexboxItemDecoration(Context context) {
+        final TypedArray a = context.obtainStyledAttributes(LIST_DIVIDER_ATTRS);
+        mDrawable = a.getDrawable(0);
+        a.recycle();
+        setOrientation(BOTH);
+    }
+
+    /**
+     * Set the drawable used as the item decoration.
+     * If the drawable is not set, the default list divider is used as the
+     * item decoration.
+     */
+    public void setDrawable(Drawable drawable) {
+        if (drawable == null) {
+            throw new IllegalArgumentException("Drawable cannot be null.");
+        }
+        mDrawable = drawable;
+    }
+
+    /**
+     * Set the orientation for the decoration.
+     * Orientation for the decoration can be either of:
+     * <ul>
+     * <li>Horizontal (setOrientation(HORIZONTAL)</li>
+     * <li>Vertical (setOrientation(VERTICAL)</li>
+     * <li>Both orientation (setOrientation(BOTH)</li>
+     * </ul>.
+     */
+    public void setOrientation(int orientation) {
+        mOrientation = orientation;
+    }
+
+    @Override
+    public void onDraw(
+            @NonNull Canvas canvas,
+            @NonNull RecyclerView parent,
+            @NonNull RecyclerView.State state) {
+        drawHorizontalDecorations(canvas, parent);
+        drawVerticalDecorations(canvas, parent);
+    }
+
+    @Override
+    public void getItemOffsets(
+            @NonNull Rect outRect,
+            @NonNull View view,
+            RecyclerView parent,
+            @NonNull RecyclerView.State state) {
+        int position = parent.getChildAdapterPosition(view);
+        if (position == 0) {
+            return;
+        }
+        if (!needsHorizontalDecoration() && !needsVerticalDecoration()) {
+            outRect.set(0, 0, 0, 0);
+            return;
+        }
+        FlexboxLayoutManager layoutManager = (FlexboxLayoutManager) parent.getLayoutManager();
+        List<FlexLine> flexLines = layoutManager.getFlexLines();
+        int flexDirection = layoutManager.getFlexDirection();
+        setOffsetAlongMainAxis(outRect, position, layoutManager, flexLines, flexDirection);
+        setOffsetAlongCrossAxis(outRect, position, layoutManager, flexLines);
+    }
+
+    private void setOffsetAlongCrossAxis(Rect outRect, int position,
+            FlexboxLayoutManager layoutManager, List<FlexLine> flexLines) {
+        if (flexLines.size() == 0) {
+            return;
+        }
+        int flexLineIndex = layoutManager.getPositionToFlexLineIndex(position);
+        if (flexLineIndex == 0) {
+            return;
+        }
+
+        if (layoutManager.isMainAxisDirectionHorizontal()) {
+            if (!needsHorizontalDecoration()) {
+                outRect.top = 0;
+                outRect.bottom = 0;
+                return;
+            }
+            outRect.top = mDrawable.getIntrinsicHeight();
+            outRect.bottom = 0;
+        } else {
+            if (!needsVerticalDecoration()) {
+                return;
+            }
+            if (layoutManager.isLayoutRtl()) {
+                outRect.right = mDrawable.getIntrinsicWidth();
+                outRect.left = 0;
+            } else {
+                outRect.left = mDrawable.getIntrinsicWidth();
+                outRect.right = 0;
+            }
+        }
+
+    }
+
+    private void setOffsetAlongMainAxis(Rect outRect, int position,
+            FlexboxLayoutManager layoutManager, List<FlexLine> flexLines, int flexDirection) {
+        if (isFirstItemInLine(position, flexLines, layoutManager)) {
+            return;
+        }
+
+        if (layoutManager.isMainAxisDirectionHorizontal()) {
+            if (!needsVerticalDecoration()) {
+                outRect.left = 0;
+                outRect.right = 0;
+                return;
+            }
+            if (layoutManager.isLayoutRtl()) {
+                outRect.right = mDrawable.getIntrinsicWidth();
+                outRect.left = 0;
+            } else {
+                outRect.left = mDrawable.getIntrinsicWidth();
+                outRect.right = 0;
+            }
+        } else {
+            if (!needsHorizontalDecoration()) {
+                outRect.top = 0;
+                outRect.bottom = 0;
+                return;
+            }
+            if (flexDirection == FlexDirection.COLUMN_REVERSE) {
+                outRect.bottom = mDrawable.getIntrinsicHeight();
+                outRect.top = 0;
+            } else {
+                outRect.top = mDrawable.getIntrinsicHeight();
+                outRect.bottom = 0;
+            }
+        }
+
+    }
+
+    private void drawVerticalDecorations(Canvas canvas, RecyclerView parent) {
+        if (!needsVerticalDecoration()) {
+            return;
+        }
+        FlexboxLayoutManager layoutManager = (FlexboxLayoutManager) parent.getLayoutManager();
+        int parentTop = parent.getTop() - parent.getPaddingTop();
+        int parentBottom = parent.getBottom() + parent.getPaddingBottom();
+        int childCount = parent.getChildCount();
+        int flexDirection = layoutManager.getFlexDirection();
+        for (int i = 0; i < childCount; i++) {
+            View child = parent.getChildAt(i);
+
+            RecyclerView.LayoutParams lp = (RecyclerView.LayoutParams) child.getLayoutParams();
+
+            int left, right;
+            if (layoutManager.isLayoutRtl()) {
+                left = child.getRight() + lp.rightMargin;
+                right = left + mDrawable.getIntrinsicWidth();
+            } else {
+                right = child.getLeft() - lp.leftMargin;
+                left = right - mDrawable.getIntrinsicWidth();
+            }
+
+            int top, bottom;
+            if (layoutManager.isMainAxisDirectionHorizontal()) {
+                top = child.getTop() - lp.topMargin;
+                bottom = child.getBottom() + lp.bottomMargin;
+            } else {
+                if (flexDirection == FlexDirection.COLUMN_REVERSE) {
+                    bottom = child.getBottom() + lp.bottomMargin + mDrawable.getIntrinsicHeight();
+                    bottom = Math.min(bottom, parentBottom);
+                    top = child.getTop() - lp.topMargin;
+                } else {
+                    top = child.getTop() - lp.topMargin - mDrawable.getIntrinsicHeight();
+                    top = Math.max(top, parentTop);
+                    bottom = child.getBottom() + lp.bottomMargin;
+                }
+            }
+
+            mDrawable.setBounds(left, top, right, bottom);
+            mDrawable.draw(canvas);
+        }
+    }
+
+    private void drawHorizontalDecorations(Canvas canvas, RecyclerView parent) {
+        if (!needsHorizontalDecoration()) {
+            return;
+        }
+        FlexboxLayoutManager layoutManager = (FlexboxLayoutManager) parent.getLayoutManager();
+        int flexDirection = layoutManager.getFlexDirection();
+        int parentLeft = parent.getLeft() - parent.getPaddingLeft();
+        int parentRight = parent.getRight() + parent.getPaddingRight();
+        int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            View child = parent.getChildAt(i);
+            RecyclerView.LayoutParams lp = (RecyclerView.LayoutParams) child.getLayoutParams();
+
+            int top, bottom;
+            if (flexDirection == FlexDirection.COLUMN_REVERSE) {
+                top = child.getBottom() + lp.bottomMargin;
+                bottom = top + mDrawable.getIntrinsicHeight();
+            } else {
+                bottom = child.getTop() - lp.topMargin;
+                top = bottom - mDrawable.getIntrinsicHeight();
+            }
+
+            int left, right;
+            if (layoutManager.isMainAxisDirectionHorizontal()) {
+                if (layoutManager.isLayoutRtl()) {
+                    right = child.getRight() + lp.rightMargin + mDrawable.getIntrinsicWidth();
+                    right = Math.min(right, parentRight);
+                    left = child.getLeft() - lp.leftMargin;
+                } else {
+                    left = child.getLeft() - lp.leftMargin - mDrawable.getIntrinsicWidth();
+                    left = Math.max(left, parentLeft);
+                    right = child.getRight() + lp.rightMargin;
+                }
+            } else {
+                left = child.getLeft() - lp.leftMargin;
+                right = child.getRight() + lp.rightMargin;
+            }
+            mDrawable.setBounds(left, top, right, bottom);
+            mDrawable.draw(canvas);
+        }
+    }
+
+    private boolean needsHorizontalDecoration() {
+        return (mOrientation & HORIZONTAL) > 0;
+    }
+
+    private boolean needsVerticalDecoration() {
+        return (mOrientation & VERTICAL) > 0;
+    }
+
+    /**
+     * @return {@code true} if the given position is the first item in a flex line.
+     */
+    private boolean isFirstItemInLine(int position, List<FlexLine> flexLines,
+            FlexboxLayoutManager layoutManager) {
+        int flexLineIndex = layoutManager.getPositionToFlexLineIndex(position);
+        if (flexLineIndex != NO_POSITION &&
+                flexLineIndex < layoutManager.getFlexLinesInternal().size() &&
+                layoutManager.getFlexLinesInternal().get(flexLineIndex).mFirstIndex == position) {
+            return true;
+        }
+        if (position == 0) {
+            return true;
+        }
+        if (flexLines.size() == 0) {
+            return false;
+        }
+        // Check if the position is the "lastIndex + 1" of the last line in case the FlexLine which
+        // has the View, whose index is position is not included in the flexLines. (E.g. flexLines
+        // is being calculated
+        FlexLine lastLine = flexLines.get(flexLines.size() - 1);
+        return lastLine.mLastIndex == position - 1;
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
new file mode 100755
index 0000000..12c3e8a
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
@@ -0,0 +1,1878 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.util.SparseIntArray;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+
+/**
+ * A layout that arranges its children in a way its attributes can be specified like the
+ * CSS Flexible Box Layout Module.
+ * This class extends the {@link ViewGroup} like other layout classes such as {@link LinearLayout}
+ * or {@link RelativeLayout}, the attributes can be specified from a layout XML or from code.
+ *
+ * The supported attributes that you can use are:
+ * <ul>
+ * <li>{@code flexDirection}</li>
+ * <li>{@code flexWrap}</li>
+ * <li>{@code justifyContent}</li>
+ * <li>{@code alignItems}</li>
+ * <li>{@code alignContent}</li>
+ * <li>{@code showDivider}</li>
+ * <li>{@code showDividerHorizontal}</li>
+ * <li>{@code showDividerVertical}</li>
+ * <li>{@code dividerDrawable}</li>
+ * <li>{@code dividerDrawableHorizontal}</li>
+ * <li>{@code dividerDrawableVertical}</li>
+ * <li>{@code maxLine}</li>
+ * </ul>
+ * for the FlexboxLayout.
+ *
+ * And for the children of the FlexboxLayout, you can use:
+ * <ul>
+ * <li>{@code layout_order}</li>
+ * <li>{@code layout_flexGrow}</li>
+ * <li>{@code layout_flexShrink}</li>
+ * <li>{@code layout_flexBasisPercent}</li>
+ * <li>{@code layout_alignSelf}</li>
+ * <li>{@code layout_minWidth}</li>
+ * <li>{@code layout_minHeight}</li>
+ * <li>{@code layout_maxWidth}</li>
+ * <li>{@code layout_maxHeight}</li>
+ * <li>{@code layout_wrapBefore}</li>
+ * </ul>
+ */
+public class FlexboxLayout extends ViewGroup implements FlexContainer {
+
+    /**
+     * The current value of the {@link FlexDirection}, the default value is {@link
+     * FlexDirection#ROW}.
+     *
+     * @see FlexDirection
+     */
+    private int mFlexDirection;
+
+    /**
+     * The current value of the {@link FlexWrap}, the default value is {@link FlexWrap#NOWRAP}.
+     *
+     * @see FlexWrap
+     */
+    private int mFlexWrap;
+
+    /**
+     * The current value of the {@link JustifyContent}, the default value is
+     * {@link JustifyContent#FLEX_START}.
+     *
+     * @see JustifyContent
+     */
+    private int mJustifyContent;
+
+    /**
+     * The current value of the {@link AlignItems}, the default value is
+     * {@link AlignItems#FLEX_START}.
+     *
+     * @see AlignItems
+     */
+    private int mAlignItems;
+
+    /**
+     * The current value of the {@link AlignContent}, the default value is
+     * {@link AlignContent#FLEX_START}.
+     *
+     * @see AlignContent
+     */
+    private int mAlignContent;
+
+    /**
+     * The current value of the maxLine attribute, which specifies the maximum number of flex lines.
+     */
+    private int mMaxLine = NOT_SET;
+
+    /**
+     * The int definition to be used as the arguments for the {@link #setShowDivider(int)},
+     * {@link #setShowDividerHorizontal(int)} or {@link #setShowDividerVertical(int)}.
+     * One or more of the values (such as
+     * {@link #SHOW_DIVIDER_BEGINNING} | {@link #SHOW_DIVIDER_MIDDLE}) can be passed to those set
+     * methods.
+     */
+    @IntDef(flag = true,
+            value = {
+                    SHOW_DIVIDER_NONE,
+                    SHOW_DIVIDER_BEGINNING,
+                    SHOW_DIVIDER_MIDDLE,
+                    SHOW_DIVIDER_END
+            })
+    @Retention(RetentionPolicy.SOURCE)
+    @SuppressWarnings("WeakerAccess")
+    public @interface DividerMode {
+
+    }
+
+    /** Constant to show no dividers */
+    public static final int SHOW_DIVIDER_NONE = 0;
+
+    /** Constant to show a divider at the beginning of the flex lines (or flex items). */
+    public static final int SHOW_DIVIDER_BEGINNING = 1;
+
+    /** Constant to show dividers between flex lines or flex items. */
+    public static final int SHOW_DIVIDER_MIDDLE = 1 << 1;
+
+    /** Constant to show a divider at the end of the flex lines or flex items. */
+    public static final int SHOW_DIVIDER_END = 1 << 2;
+
+    /** The drawable to be drawn for the horizontal dividers. */
+    @Nullable
+    private Drawable mDividerDrawableHorizontal;
+
+    /** The drawable to be drawn for the vertical dividers. */
+    @Nullable
+    private Drawable mDividerDrawableVertical;
+
+    /**
+     * Indicates the divider mode for the {@link #mDividerDrawableHorizontal}. The value needs to
+     * be the combination of the value of {@link #SHOW_DIVIDER_NONE},
+     * {@link #SHOW_DIVIDER_BEGINNING}, {@link #SHOW_DIVIDER_MIDDLE} and {@link #SHOW_DIVIDER_END}
+     */
+    private int mShowDividerHorizontal;
+
+    /**
+     * Indicates the divider mode for the {@link #mDividerDrawableVertical}. The value needs to
+     * be the combination of the value of {@link #SHOW_DIVIDER_NONE},
+     * {@link #SHOW_DIVIDER_BEGINNING}, {@link #SHOW_DIVIDER_MIDDLE} and {@link #SHOW_DIVIDER_END}
+     */
+    private int mShowDividerVertical;
+
+    /** The height of the {@link #mDividerDrawableHorizontal}. */
+    private int mDividerHorizontalHeight;
+
+    /** The width of the {@link #mDividerDrawableVertical}. */
+    private int mDividerVerticalWidth;
+
+    /**
+     * Holds reordered indices, which {@link FlexItem#getOrder()} parameters are taken
+     * into account
+     */
+    private int[] mReorderedIndices;
+
+    /**
+     * Caches the {@link FlexItem#getOrder()} attributes for children views.
+     * Key: the index of the view reordered indices using the {@link FlexItem#getOrder()}
+     * isn't taken into account)
+     * Value: the value for the order attribute
+     */
+    private SparseIntArray mOrderCache;
+
+    private FlexboxHelper mFlexboxHelper = new FlexboxHelper(this);
+
+    private List<FlexLine> mFlexLines = new ArrayList<>();
+
+    /**
+     * Used for receiving the calculation of the flex results to avoid creating a new instance
+     * every time flex lines are calculated.
+     */
+    private FlexboxHelper.FlexLinesResult mFlexLinesResult = new FlexboxHelper.FlexLinesResult();
+
+    public FlexboxLayout(Context context) {
+        this(context, null);
+    }
+
+    public FlexboxLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public FlexboxLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        TypedArray a = context.obtainStyledAttributes(
+                attrs, R.styleable.FlexboxLayout, defStyleAttr, 0);
+        mFlexDirection = a
+                .getInt(R.styleable.FlexboxLayout_flexDirection, FlexDirection.ROW);
+        mFlexWrap = a.getInt(R.styleable.FlexboxLayout_flexWrap, FlexWrap.NOWRAP);
+        mJustifyContent = a
+                .getInt(R.styleable.FlexboxLayout_justifyContent, JustifyContent.FLEX_START);
+        mAlignItems = a.getInt(R.styleable.FlexboxLayout_alignItems, AlignItems.FLEX_START);
+        mAlignContent = a.getInt(R.styleable.FlexboxLayout_alignContent, AlignContent.FLEX_START);
+        mMaxLine = a.getInt(R.styleable.FlexboxLayout_maxLine, NOT_SET);
+        Drawable drawable = a.getDrawable(R.styleable.FlexboxLayout_dividerDrawable);
+        if (drawable != null) {
+            setDividerDrawableHorizontal(drawable);
+            setDividerDrawableVertical(drawable);
+        }
+        Drawable drawableHorizontal = a
+                .getDrawable(R.styleable.FlexboxLayout_dividerDrawableHorizontal);
+        if (drawableHorizontal != null) {
+            setDividerDrawableHorizontal(drawableHorizontal);
+        }
+        Drawable drawableVertical = a
+                .getDrawable(R.styleable.FlexboxLayout_dividerDrawableVertical);
+        if (drawableVertical != null) {
+            setDividerDrawableVertical(drawableVertical);
+        }
+        int dividerMode = a.getInt(R.styleable.FlexboxLayout_showDivider, SHOW_DIVIDER_NONE);
+        if (dividerMode != SHOW_DIVIDER_NONE) {
+            mShowDividerVertical = dividerMode;
+            mShowDividerHorizontal = dividerMode;
+        }
+        int dividerModeVertical = a
+                .getInt(R.styleable.FlexboxLayout_showDividerVertical, SHOW_DIVIDER_NONE);
+        if (dividerModeVertical != SHOW_DIVIDER_NONE) {
+            mShowDividerVertical = dividerModeVertical;
+        }
+        int dividerModeHorizontal = a
+                .getInt(R.styleable.FlexboxLayout_showDividerHorizontal, SHOW_DIVIDER_NONE);
+        if (dividerModeHorizontal != SHOW_DIVIDER_NONE) {
+            mShowDividerHorizontal = dividerModeHorizontal;
+        }
+        a.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (mOrderCache == null) {
+            mOrderCache = new SparseIntArray(getChildCount());
+        }
+        if (mFlexboxHelper.isOrderChangedFromLastMeasurement(mOrderCache)) {
+            mReorderedIndices = mFlexboxHelper.createReorderedIndices(mOrderCache);
+        }
+
+        // TODO: Only calculate the children views which are affected from the last measure.
+
+        switch (mFlexDirection) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                measureHorizontal(widthMeasureSpec, heightMeasureSpec);
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                measureVertical(widthMeasureSpec, heightMeasureSpec);
+                break;
+            default:
+                throw new IllegalStateException(
+                        "Invalid value for the flex direction is set: " + mFlexDirection);
+        }
+    }
+
+    @Override
+    public int getFlexItemCount() {
+        return getChildCount();
+    }
+
+    @Override
+    public View getFlexItemAt(int index) {
+        return getChildAt(index);
+    }
+
+    /**
+     * Returns a View, which is reordered by taking {@link LayoutParams#mOrder} parameters
+     * into account.
+     *
+     * @param index the index of the view
+     * @return the reordered view, which {@link LayoutParams@order} is taken into account.
+     * If the index is negative or out of bounds of the number of contained views,
+     * returns {@code null}.
+     */
+    public View getReorderedChildAt(int index) {
+        if (index < 0 || index >= mReorderedIndices.length) {
+            return null;
+        }
+        return getChildAt(mReorderedIndices[index]);
+    }
+
+    @Override
+    public View getReorderedFlexItemAt(int index) {
+        return getReorderedChildAt(index);
+    }
+
+    @Override
+    public void addView(View child, int index, ViewGroup.LayoutParams params) {
+        if (mOrderCache == null) {
+            mOrderCache = new SparseIntArray(getChildCount());
+        }
+        // Create an array for the reordered indices before the View is added in the parent
+        // ViewGroup since otherwise reordered indices won't be in effect before the
+        // FlexboxLayout's onMeasure is called.
+        // Because requestLayout is requested in the super.addView method.
+        mReorderedIndices = mFlexboxHelper
+                .createReorderedIndices(child, index, params, mOrderCache);
+        super.addView(child, index, params);
+    }
+
+    /**
+     * Sub method for {@link #onMeasure(int, int)}, when the main axis direction is horizontal
+     * (either left to right or right to left).
+     *
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @see #onMeasure(int, int)
+     * @see #setFlexDirection(int)
+     * @see #setFlexWrap(int)
+     * @see #setAlignItems(int)
+     * @see #setAlignContent(int)
+     */
+    private void measureHorizontal(int widthMeasureSpec, int heightMeasureSpec) {
+        mFlexLines.clear();
+
+        mFlexLinesResult.reset();
+        mFlexboxHelper
+                .calculateHorizontalFlexLines(mFlexLinesResult, widthMeasureSpec,
+                        heightMeasureSpec);
+        mFlexLines = mFlexLinesResult.mFlexLines;
+
+        mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec);
+
+        // TODO: Consider the case any individual child's mAlignSelf is set to ALIGN_SELF_BASELINE
+        if (mAlignItems == AlignItems.BASELINE) {
+            for (FlexLine flexLine : mFlexLines) {
+                // The largest height value that also take the baseline shift into account
+                int largestHeightInLine = Integer.MIN_VALUE;
+                for (int i = 0; i < flexLine.mItemCount; i++) {
+                    int viewIndex = flexLine.mFirstIndex + i;
+                    View child = getReorderedChildAt(viewIndex);
+                    if (child == null || child.getVisibility() == View.GONE) {
+                        continue;
+                    }
+                    LayoutParams lp = (LayoutParams) child.getLayoutParams();
+                    if (mFlexWrap != FlexWrap.WRAP_REVERSE) {
+                        int marginTop = flexLine.mMaxBaseline - child.getBaseline();
+                        marginTop = Math.max(marginTop, lp.topMargin);
+                        largestHeightInLine = Math.max(largestHeightInLine,
+                                child.getMeasuredHeight() + marginTop + lp.bottomMargin);
+                    } else {
+                        int marginBottom = flexLine.mMaxBaseline - child.getMeasuredHeight() +
+                                child.getBaseline();
+                        marginBottom = Math.max(marginBottom, lp.bottomMargin);
+                        largestHeightInLine = Math.max(largestHeightInLine,
+                                child.getMeasuredHeight() + lp.topMargin + marginBottom);
+                    }
+                }
+                flexLine.mCrossSize = largestHeightInLine;
+            }
+        }
+
+        mFlexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec,
+                getPaddingTop() + getPaddingBottom());
+        // Now cross size for each flex line is determined.
+        // Expand the views if alignItems (or mAlignSelf in each child view) is set to stretch
+        mFlexboxHelper.stretchViews();
+        setMeasuredDimensionForFlex(mFlexDirection, widthMeasureSpec, heightMeasureSpec,
+                mFlexLinesResult.mChildState);
+    }
+
+    /**
+     * Sub method for {@link #onMeasure(int, int)} when the main axis direction is vertical
+     * (either from top to bottom or bottom to top).
+     *
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @see #onMeasure(int, int)
+     * @see #setFlexDirection(int)
+     * @see #setFlexWrap(int)
+     * @see #setAlignItems(int)
+     * @see #setAlignContent(int)
+     */
+    private void measureVertical(int widthMeasureSpec, int heightMeasureSpec) {
+        mFlexLines.clear();
+        mFlexLinesResult.reset();
+        mFlexboxHelper.calculateVerticalFlexLines(mFlexLinesResult, widthMeasureSpec,
+                heightMeasureSpec);
+        mFlexLines = mFlexLinesResult.mFlexLines;
+
+        mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec);
+        mFlexboxHelper.determineCrossSize(widthMeasureSpec, heightMeasureSpec,
+                getPaddingLeft() + getPaddingRight());
+        // Now cross size for each flex line is determined.
+        // Expand the views if alignItems (or mAlignSelf in each child view) is set to stretch
+        mFlexboxHelper.stretchViews();
+        setMeasuredDimensionForFlex(mFlexDirection, widthMeasureSpec, heightMeasureSpec,
+                mFlexLinesResult.mChildState);
+    }
+
+    /**
+     * Set this FlexboxLayouts' width and height depending on the calculated size of main axis and
+     * cross axis.
+     *
+     * @param flexDirection     the value of the flex direction
+     * @param widthMeasureSpec  horizontal space requirements as imposed by the parent
+     * @param heightMeasureSpec vertical space requirements as imposed by the parent
+     * @param childState        the child state of the View
+     * @see #getFlexDirection()
+     * @see #setFlexDirection(int)
+     */
+    private void setMeasuredDimensionForFlex(@FlexDirection int flexDirection, int widthMeasureSpec,
+            int heightMeasureSpec, int childState) {
+        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+        int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+        int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+        int calculatedMaxHeight;
+        int calculatedMaxWidth;
+        switch (flexDirection) {
+            case FlexDirection.ROW: // Intentional fall through
+            case FlexDirection.ROW_REVERSE:
+                calculatedMaxHeight = getSumOfCrossSize() + getPaddingTop()
+                        + getPaddingBottom();
+                calculatedMaxWidth = getLargestMainSize();
+                break;
+            case FlexDirection.COLUMN: // Intentional fall through
+            case FlexDirection.COLUMN_REVERSE:
+                calculatedMaxHeight = getLargestMainSize();
+                calculatedMaxWidth = getSumOfCrossSize() + getPaddingLeft() + getPaddingRight();
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid flex direction: " + flexDirection);
+        }
+
+        int widthSizeAndState;
+        switch (widthMode) {
+            case MeasureSpec.EXACTLY:
+                if (widthSize < calculatedMaxWidth) {
+                    childState = View
+                            .combineMeasuredStates(childState, View.MEASURED_STATE_TOO_SMALL);
+                }
+                widthSizeAndState = View.resolveSizeAndState(widthSize, widthMeasureSpec,
+                        childState);
+                break;
+            case MeasureSpec.AT_MOST: {
+                if (widthSize < calculatedMaxWidth) {
+                    childState = View
+                            .combineMeasuredStates(childState, View.MEASURED_STATE_TOO_SMALL);
+                } else {
+                    widthSize = calculatedMaxWidth;
+                }
+                widthSizeAndState = View.resolveSizeAndState(widthSize, widthMeasureSpec,
+                        childState);
+                break;
+            }
+            case MeasureSpec.UNSPECIFIED: {
+                widthSizeAndState = View
+                        .resolveSizeAndState(calculatedMaxWidth, widthMeasureSpec, childState);
+                break;
+            }
+            default:
+                throw new IllegalStateException("Unknown width mode is set: " + widthMode);
+        }
+        int heightSizeAndState;
+        switch (heightMode) {
+            case MeasureSpec.EXACTLY:
+                if (heightSize < calculatedMaxHeight) {
+                    childState = View.combineMeasuredStates(childState,
+                            View.MEASURED_STATE_TOO_SMALL
+                                    >> View.MEASURED_HEIGHT_STATE_SHIFT);
+                }
+                heightSizeAndState = View.resolveSizeAndState(heightSize, heightMeasureSpec,
+                        childState);
+                break;
+            case MeasureSpec.AT_MOST: {
+                if (heightSize < calculatedMaxHeight) {
+                    childState = View.combineMeasuredStates(childState,
+                            View.MEASURED_STATE_TOO_SMALL
+                                    >> View.MEASURED_HEIGHT_STATE_SHIFT);
+                } else {
+                    heightSize = calculatedMaxHeight;
+                }
+                heightSizeAndState = View.resolveSizeAndState(heightSize, heightMeasureSpec,
+                        childState);
+                break;
+            }
+            case MeasureSpec.UNSPECIFIED: {
+                heightSizeAndState = View.resolveSizeAndState(calculatedMaxHeight,
+                        heightMeasureSpec, childState);
+                break;
+            }
+            default:
+                throw new IllegalStateException("Unknown height mode is set: " + heightMode);
+        }
+        setMeasuredDimension(widthSizeAndState, heightSizeAndState);
+    }
+
+    @Override
+    public int getLargestMainSize() {
+        int largestSize = Integer.MIN_VALUE;
+        for (FlexLine flexLine : mFlexLines) {
+            largestSize = Math.max(largestSize, flexLine.mMainSize);
+        }
+        return largestSize;
+    }
+
+    @Override
+    public int getSumOfCrossSize() {
+        int sum = 0;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+
+            // Judge if the beginning or middle dividers are required
+            if (hasDividerBeforeFlexLine(i)) {
+                if (isMainAxisDirectionHorizontal()) {
+                    sum += mDividerHorizontalHeight;
+                } else {
+                    sum += mDividerVerticalWidth;
+                }
+            }
+
+            // Judge if the end divider is required
+            if (hasEndDividerAfterFlexLine(i)) {
+                if (isMainAxisDirectionHorizontal()) {
+                    sum += mDividerHorizontalHeight;
+                } else {
+                    sum += mDividerVerticalWidth;
+                }
+            }
+            sum += flexLine.mCrossSize;
+        }
+        return sum;
+    }
+
+    @Override
+    public boolean isMainAxisDirectionHorizontal() {
+        return mFlexDirection == FlexDirection.ROW || mFlexDirection == FlexDirection.ROW_REVERSE;
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        int layoutDirection = ViewCompat.getLayoutDirection(this);
+        boolean isRtl;
+        switch (mFlexDirection) {
+            case FlexDirection.ROW:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                layoutHorizontal(isRtl, left, top, right, bottom);
+                break;
+            case FlexDirection.ROW_REVERSE:
+                isRtl = layoutDirection != ViewCompat.LAYOUT_DIRECTION_RTL;
+                layoutHorizontal(isRtl, left, top, right, bottom);
+                break;
+            case FlexDirection.COLUMN:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                layoutVertical(isRtl, false, left, top, right, bottom);
+                break;
+            case FlexDirection.COLUMN_REVERSE:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                layoutVertical(isRtl, true, left, top, right, bottom);
+                break;
+            default:
+                throw new IllegalStateException("Invalid flex direction is set: " + mFlexDirection);
+        }
+    }
+
+    /**
+     * Sub method for {@link #onLayout(boolean, int, int, int, int)} when the
+     * {@link #mFlexDirection} is either {@link FlexDirection#ROW} or
+     * {@link FlexDirection#ROW_REVERSE}.
+     *
+     * @param isRtl  {@code true} if the horizontal layout direction is right to left, {@code
+     *               false} otherwise.
+     * @param left   the left position of this View
+     * @param top    the top position of this View
+     * @param right  the right position of this View
+     * @param bottom the bottom position of this View
+     * @see #getFlexWrap()
+     * @see #setFlexWrap(int)
+     * @see #getJustifyContent()
+     * @see #setJustifyContent(int)
+     * @see #getAlignItems()
+     * @see #setAlignItems(int)
+     * @see LayoutParams#mAlignSelf
+     */
+    private void layoutHorizontal(boolean isRtl, int left, int top, int right, int bottom) {
+        int paddingLeft = getPaddingLeft();
+        int paddingRight = getPaddingRight();
+        // Use float to reduce the round error that may happen in when justifyContent ==
+        // SPACE_BETWEEN or SPACE_AROUND
+        float childLeft;
+
+        int height = bottom - top;
+        int width = right - left;
+        // childBottom is used if the mFlexWrap is WRAP_REVERSE otherwise
+        // childTop is used to align the vertical position of the children views.
+        int childBottom = height - getPaddingBottom();
+        int childTop = getPaddingTop();
+
+        // Used only for RTL layout
+        // Use float to reduce the round error that may happen in when justifyContent ==
+        // SPACE_BETWEEN or SPACE_AROUND
+        float childRight;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            if (hasDividerBeforeFlexLine(i)) {
+                childBottom -= mDividerHorizontalHeight;
+                childTop += mDividerHorizontalHeight;
+            }
+            float spaceBetweenItem = 0f;
+            switch (mJustifyContent) {
+                case JustifyContent.FLEX_START:
+                    childLeft = paddingLeft;
+                    childRight = width - paddingRight;
+                    break;
+                case JustifyContent.FLEX_END:
+                    childLeft = width - flexLine.mMainSize + paddingRight;
+                    childRight = flexLine.mMainSize - paddingLeft;
+                    break;
+                case JustifyContent.CENTER:
+                    childLeft = paddingLeft + (width - flexLine.mMainSize) / 2f;
+                    childRight = width - paddingRight - (width - flexLine.mMainSize) / 2f;
+                    break;
+                case JustifyContent.SPACE_AROUND: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (width - flexLine.mMainSize)
+                                / (float) visibleCount;
+                    }
+                    childLeft = paddingLeft + spaceBetweenItem / 2f;
+                    childRight = width - paddingRight - spaceBetweenItem / 2f;
+                    break;
+                }
+                case JustifyContent.SPACE_BETWEEN: {
+                    childLeft = paddingLeft;
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    float denominator = visibleCount != 1 ? visibleCount - 1 : 1f;
+                    spaceBetweenItem = (width - flexLine.mMainSize) / denominator;
+                    childRight = width - paddingRight;
+                    break;
+                }
+                case JustifyContent.SPACE_EVENLY: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (width - flexLine.mMainSize)
+                                / (float) (visibleCount + 1);
+                    }
+                    childLeft = paddingLeft + spaceBetweenItem;
+                    childRight = width - paddingRight - spaceBetweenItem;
+                    break;
+                }
+                default:
+                    throw new IllegalStateException(
+                            "Invalid justifyContent is set: " + mJustifyContent);
+            }
+            spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int index = flexLine.mFirstIndex + j;
+                View child = getReorderedChildAt(index);
+                if (child == null || child.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = ((LayoutParams) child.getLayoutParams());
+                childLeft += lp.leftMargin;
+                childRight -= lp.rightMargin;
+                int beforeDividerLength = 0;
+                int endDividerLength = 0;
+                if (hasDividerBeforeChildAtAlongMainAxis(index, j)) {
+                    beforeDividerLength = mDividerVerticalWidth;
+                    childLeft += beforeDividerLength;
+                    childRight -= beforeDividerLength;
+                }
+                if (j == flexLine.mItemCount - 1 && (mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                    endDividerLength = mDividerVerticalWidth;
+                }
+
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    if (isRtl) {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childRight) - child.getMeasuredWidth(),
+                                childBottom - child.getMeasuredHeight(), Math.round(childRight),
+                                childBottom);
+                    } else {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childLeft), childBottom - child.getMeasuredHeight(),
+                                Math.round(childLeft) + child.getMeasuredWidth(), childBottom);
+                    }
+                } else {
+                    if (isRtl) {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childRight) - child.getMeasuredWidth(),
+                                childTop, Math.round(childRight),
+                                childTop + child.getMeasuredHeight());
+                    } else {
+                        mFlexboxHelper.layoutSingleChildHorizontal(child, flexLine,
+                                Math.round(childLeft), childTop,
+                                Math.round(childLeft) + child.getMeasuredWidth(),
+                                childTop + child.getMeasuredHeight());
+                    }
+                }
+                childLeft += child.getMeasuredWidth() + spaceBetweenItem + lp.rightMargin;
+                childRight -= child.getMeasuredWidth() + spaceBetweenItem + lp.leftMargin;
+
+                if (isRtl) {
+                    flexLine.updatePositionFromView(child, /*leftDecoration*/endDividerLength, 0,
+                            /*rightDecoration*/ beforeDividerLength, 0);
+                } else {
+                    flexLine.updatePositionFromView(child, /*leftDecoration*/beforeDividerLength, 0,
+                            /*rightDecoration*/ endDividerLength, 0);
+                }
+            }
+            childTop += flexLine.mCrossSize;
+            childBottom -= flexLine.mCrossSize;
+        }
+    }
+
+    /**
+     * Sub method for {@link #onLayout(boolean, int, int, int, int)} when the
+     * {@link #mFlexDirection} is either {@link FlexDirection#COLUMN} or
+     * {@link FlexDirection#COLUMN_REVERSE}.
+     *
+     * @param isRtl           {@code true} if the horizontal layout direction is right to left,
+     *                        {@code false}
+     *                        otherwise
+     * @param fromBottomToTop {@code true} if the layout direction is bottom to top, {@code false}
+     *                        otherwise
+     * @param left            the left position of this View
+     * @param top             the top position of this View
+     * @param right           the right position of this View
+     * @param bottom          the bottom position of this View
+     * @see #getFlexWrap()
+     * @see #setFlexWrap(int)
+     * @see #getJustifyContent()
+     * @see #setJustifyContent(int)
+     * @see #getAlignItems()
+     * @see #setAlignItems(int)
+     * @see LayoutParams#mAlignSelf
+     */
+    private void layoutVertical(boolean isRtl, boolean fromBottomToTop, int left, int top,
+            int right, int bottom) {
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+
+        int paddingRight = getPaddingRight();
+        int childLeft = getPaddingLeft();
+
+        int width = right - left;
+        int height = bottom - top;
+        // childRight is used if the mFlexWrap is WRAP_REVERSE otherwise
+        // childLeft is used to align the horizontal position of the children views.
+        int childRight = width - paddingRight;
+
+        // Use float to reduce the round error that may happen in when justifyContent ==
+        // SPACE_BETWEEN or SPACE_AROUND
+        float childTop;
+
+        // Used only for if the direction is from bottom to top
+        float childBottom;
+
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            if (hasDividerBeforeFlexLine(i)) {
+                childLeft += mDividerVerticalWidth;
+                childRight -= mDividerVerticalWidth;
+            }
+            float spaceBetweenItem = 0f;
+            switch (mJustifyContent) {
+                case JustifyContent.FLEX_START:
+                    childTop = paddingTop;
+                    childBottom = height - paddingBottom;
+                    break;
+                case JustifyContent.FLEX_END:
+                    childTop = height - flexLine.mMainSize + paddingBottom;
+                    childBottom = flexLine.mMainSize - paddingTop;
+                    break;
+                case JustifyContent.CENTER:
+                    childTop = paddingTop + (height - flexLine.mMainSize) / 2f;
+                    childBottom = height - paddingBottom - (height - flexLine.mMainSize) / 2f;
+                    break;
+                case JustifyContent.SPACE_AROUND: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (height - flexLine.mMainSize)
+                                / (float) visibleCount;
+                    }
+                    childTop = paddingTop + spaceBetweenItem / 2f;
+                    childBottom = height - paddingBottom - spaceBetweenItem / 2f;
+                    break;
+                }
+                case JustifyContent.SPACE_BETWEEN: {
+                    childTop = paddingTop;
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    float denominator = visibleCount != 1 ? visibleCount - 1 : 1f;
+                    spaceBetweenItem = (height - flexLine.mMainSize) / denominator;
+                    childBottom = height - paddingBottom;
+                    break;
+                }
+                case JustifyContent.SPACE_EVENLY: {
+                    int visibleCount = flexLine.getItemCountNotGone();
+                    if (visibleCount != 0) {
+                        spaceBetweenItem = (height - flexLine.mMainSize)
+                                / (float) (visibleCount + 1);
+                    }
+                    childTop = paddingTop + spaceBetweenItem;
+                    childBottom = height - paddingBottom - spaceBetweenItem;
+                    break;
+                }
+                default:
+                    throw new IllegalStateException(
+                            "Invalid justifyContent is set: " + mJustifyContent);
+            }
+            spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int index = flexLine.mFirstIndex + j;
+                View child = getReorderedChildAt(index);
+                if (child == null || child.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = ((LayoutParams) child.getLayoutParams());
+                childTop += lp.topMargin;
+                childBottom -= lp.bottomMargin;
+                int beforeDividerLength = 0;
+                int endDividerLength = 0;
+                if (hasDividerBeforeChildAtAlongMainAxis(index, j)) {
+                    beforeDividerLength = mDividerHorizontalHeight;
+                    childTop += beforeDividerLength;
+                    childBottom -= beforeDividerLength;
+                }
+                if (j == flexLine.mItemCount - 1
+                        && (mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                    endDividerLength = mDividerHorizontalHeight;
+                }
+                if (isRtl) {
+                    if (fromBottomToTop) {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, true,
+                                childRight - child.getMeasuredWidth(),
+                                Math.round(childBottom) - child.getMeasuredHeight(), childRight,
+                                Math.round(childBottom));
+                    } else {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, true,
+                                childRight - child.getMeasuredWidth(), Math.round(childTop),
+                                childRight, Math.round(childTop) + child.getMeasuredHeight());
+                    }
+                } else {
+                    if (fromBottomToTop) {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, false,
+                                childLeft, Math.round(childBottom) - child.getMeasuredHeight(),
+                                childLeft + child.getMeasuredWidth(), Math.round(childBottom));
+                    } else {
+                        mFlexboxHelper.layoutSingleChildVertical(child, flexLine, false,
+                                childLeft, Math.round(childTop),
+                                childLeft + child.getMeasuredWidth(),
+                                Math.round(childTop) + child.getMeasuredHeight());
+                    }
+                }
+                childTop += child.getMeasuredHeight() + spaceBetweenItem + lp.bottomMargin;
+                childBottom -= child.getMeasuredHeight() + spaceBetweenItem + lp.topMargin;
+
+                if (fromBottomToTop) {
+                    flexLine.updatePositionFromView(child, 0, /*topDecoration*/endDividerLength, 0,
+                            /*bottomDecoration*/ beforeDividerLength);
+                } else {
+                    flexLine.updatePositionFromView(child, 0, /*topDecoration*/beforeDividerLength,
+                            0, /*bottomDecoration*/endDividerLength);
+                }
+            }
+            childLeft += flexLine.mCrossSize;
+            childRight -= flexLine.mCrossSize;
+        }
+    }
+
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (mDividerDrawableVertical == null && mDividerDrawableHorizontal == null) {
+            return;
+        }
+        if (mShowDividerHorizontal == SHOW_DIVIDER_NONE
+                && mShowDividerVertical == SHOW_DIVIDER_NONE) {
+            return;
+        }
+
+        int layoutDirection = ViewCompat.getLayoutDirection(this);
+        boolean isRtl;
+        boolean fromBottomToTop = false;
+        switch (mFlexDirection) {
+            case FlexDirection.ROW:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    fromBottomToTop = true;
+                }
+                drawDividersHorizontal(canvas, isRtl, fromBottomToTop);
+                break;
+            case FlexDirection.ROW_REVERSE:
+                isRtl = layoutDirection != ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    fromBottomToTop = true;
+                }
+                drawDividersHorizontal(canvas, isRtl, fromBottomToTop);
+                break;
+            case FlexDirection.COLUMN:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                drawDividersVertical(canvas, isRtl, false);
+                break;
+            case FlexDirection.COLUMN_REVERSE:
+                isRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    isRtl = !isRtl;
+                }
+                drawDividersVertical(canvas, isRtl, true);
+                break;
+        }
+    }
+
+    /**
+     * Sub method for {@link #onDraw(Canvas)} when the main axis direction is horizontal
+     * ({@link #mFlexDirection} is either of {@link FlexDirection#ROW} or
+     * {@link FlexDirection#ROW_REVERSE}.
+     *
+     * @param canvas          the canvas on which the background will be drawn
+     * @param isRtl           {@code true} when the horizontal layout direction is right to left,
+     *                        {@code false} otherwise
+     * @param fromBottomToTop {@code true} when the vertical layout direction is bottom to top,
+     *                        {@code false} otherwise
+     */
+    private void drawDividersHorizontal(Canvas canvas, boolean isRtl, boolean fromBottomToTop) {
+        int paddingLeft = getPaddingLeft();
+        int paddingRight = getPaddingRight();
+        int horizontalDividerLength = Math.max(0, getWidth() - paddingRight - paddingLeft);
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int viewIndex = flexLine.mFirstIndex + j;
+                View view = getReorderedChildAt(viewIndex);
+                if (view == null || view.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = (LayoutParams) view.getLayoutParams();
+
+                // Judge if the beginning or middle divider is needed
+                if (hasDividerBeforeChildAtAlongMainAxis(viewIndex, j)) {
+                    int dividerLeft;
+                    if (isRtl) {
+                        dividerLeft = view.getRight() + lp.rightMargin;
+                    } else {
+                        dividerLeft = view.getLeft() - lp.leftMargin - mDividerVerticalWidth;
+                    }
+
+                    drawVerticalDivider(canvas, dividerLeft, flexLine.mTop, flexLine.mCrossSize);
+                }
+
+                // Judge if the end divider is needed
+                if (j == flexLine.mItemCount - 1) {
+                    if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                        int dividerLeft;
+                        if (isRtl) {
+                            dividerLeft = view.getLeft() - lp.leftMargin - mDividerVerticalWidth;
+                        } else {
+                            dividerLeft = view.getRight() + lp.rightMargin;
+                        }
+
+                        drawVerticalDivider(canvas, dividerLeft, flexLine.mTop,
+                                flexLine.mCrossSize);
+                    }
+                }
+            }
+
+            // Judge if the beginning or middle dividers are needed before the flex line
+            if (hasDividerBeforeFlexLine(i)) {
+                int horizontalDividerTop;
+                if (fromBottomToTop) {
+                    horizontalDividerTop = flexLine.mBottom;
+                } else {
+                    horizontalDividerTop = flexLine.mTop - mDividerHorizontalHeight;
+                }
+                drawHorizontalDivider(canvas, paddingLeft, horizontalDividerTop,
+                        horizontalDividerLength);
+            }
+            // Judge if the end divider is needed before the flex line
+            if (hasEndDividerAfterFlexLine(i)) {
+                if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                    int horizontalDividerTop;
+                    if (fromBottomToTop) {
+                        horizontalDividerTop = flexLine.mTop - mDividerHorizontalHeight;
+                    } else {
+                        horizontalDividerTop = flexLine.mBottom;
+                    }
+                    drawHorizontalDivider(canvas, paddingLeft, horizontalDividerTop,
+                            horizontalDividerLength);
+                }
+            }
+        }
+    }
+
+    /**
+     * Sub method for {@link #onDraw(Canvas)} when the main axis direction is vertical
+     * ({@link #mFlexDirection} is either of {@link FlexDirection#COLUMN} or
+     * {@link FlexDirection#COLUMN_REVERSE}.
+     *
+     * @param canvas          the canvas on which the background will be drawn
+     * @param isRtl           {@code true} when the horizontal layout direction is right to left,
+     *                        {@code false} otherwise
+     * @param fromBottomToTop {@code true} when the vertical layout direction is bottom to top,
+     *                        {@code false} otherwise
+     */
+    private void drawDividersVertical(Canvas canvas, boolean isRtl, boolean fromBottomToTop) {
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+        int verticalDividerLength = Math.max(0, getHeight() - paddingBottom - paddingTop);
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+
+            // Draw horizontal dividers if needed
+            for (int j = 0; j < flexLine.mItemCount; j++) {
+                int viewIndex = flexLine.mFirstIndex + j;
+                View view = getReorderedChildAt(viewIndex);
+                if (view == null || view.getVisibility() == View.GONE) {
+                    continue;
+                }
+                LayoutParams lp = (LayoutParams) view.getLayoutParams();
+
+                // Judge if the beginning or middle divider is needed
+                if (hasDividerBeforeChildAtAlongMainAxis(viewIndex, j)) {
+                    int dividerTop;
+                    if (fromBottomToTop) {
+                        dividerTop = view.getBottom() + lp.bottomMargin;
+                    } else {
+                        dividerTop = view.getTop() - lp.topMargin - mDividerHorizontalHeight;
+                    }
+
+                    drawHorizontalDivider(canvas, flexLine.mLeft, dividerTop, flexLine.mCrossSize);
+                }
+
+                // Judge if the end divider is needed
+                if (j == flexLine.mItemCount - 1) {
+                    if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                        int dividerTop;
+                        if (fromBottomToTop) {
+                            dividerTop = view.getTop() - lp.topMargin - mDividerHorizontalHeight;
+                        } else {
+                            dividerTop = view.getBottom() + lp.bottomMargin;
+                        }
+
+                        drawHorizontalDivider(canvas, flexLine.mLeft, dividerTop,
+                                flexLine.mCrossSize);
+                    }
+                }
+            }
+
+            // Judge if the beginning or middle dividers are needed before the flex line
+            if (hasDividerBeforeFlexLine(i)) {
+                int verticalDividerLeft;
+                if (isRtl) {
+                    verticalDividerLeft = flexLine.mRight;
+                } else {
+                    verticalDividerLeft = flexLine.mLeft - mDividerVerticalWidth;
+                }
+                drawVerticalDivider(canvas, verticalDividerLeft, paddingTop,
+                        verticalDividerLength);
+            }
+            if (hasEndDividerAfterFlexLine(i)) {
+                if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                    int verticalDividerLeft;
+                    if (isRtl) {
+                        verticalDividerLeft = flexLine.mLeft - mDividerVerticalWidth;
+                    } else {
+                        verticalDividerLeft = flexLine.mRight;
+                    }
+                    drawVerticalDivider(canvas, verticalDividerLeft, paddingTop,
+                            verticalDividerLength);
+                }
+            }
+        }
+    }
+
+    private void drawVerticalDivider(Canvas canvas, int left, int top, int length) {
+        if (mDividerDrawableVertical == null) {
+            return;
+        }
+        mDividerDrawableVertical.setBounds(left, top, left + mDividerVerticalWidth, top + length);
+        mDividerDrawableVertical.draw(canvas);
+    }
+
+    private void drawHorizontalDivider(Canvas canvas, int left, int top, int length) {
+        if (mDividerDrawableHorizontal == null) {
+            return;
+        }
+        mDividerDrawableHorizontal
+                .setBounds(left, top, left + length, top + mDividerHorizontalHeight);
+        mDividerDrawableHorizontal.draw(canvas);
+    }
+
+    @Override
+    protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+        return p instanceof FlexboxLayout.LayoutParams;
+    }
+
+    @Override
+    public LayoutParams generateLayoutParams(AttributeSet attrs) {
+        return new FlexboxLayout.LayoutParams(getContext(), attrs);
+    }
+
+    @Override
+    protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams lp) {
+        if (lp instanceof FlexboxLayout.LayoutParams) {
+            return new FlexboxLayout.LayoutParams((FlexboxLayout.LayoutParams) lp);
+        } else if (lp instanceof MarginLayoutParams) {
+            return new FlexboxLayout.LayoutParams((MarginLayoutParams) lp);
+        }
+        return new LayoutParams(lp);
+    }
+
+    @FlexDirection
+    @Override
+    public int getFlexDirection() {
+        return mFlexDirection;
+    }
+
+    @Override
+    public void setFlexDirection(@FlexDirection int flexDirection) {
+        if (mFlexDirection != flexDirection) {
+            mFlexDirection = flexDirection;
+            requestLayout();
+        }
+    }
+
+    @FlexWrap
+    @Override
+    public int getFlexWrap() {
+        return mFlexWrap;
+    }
+
+    @Override
+    public void setFlexWrap(@FlexWrap int flexWrap) {
+        if (mFlexWrap != flexWrap) {
+            mFlexWrap = flexWrap;
+            requestLayout();
+        }
+    }
+
+    @JustifyContent
+    @Override
+    public int getJustifyContent() {
+        return mJustifyContent;
+    }
+
+    @Override
+    public void setJustifyContent(@JustifyContent int justifyContent) {
+        if (mJustifyContent != justifyContent) {
+            mJustifyContent = justifyContent;
+            requestLayout();
+        }
+    }
+
+    @AlignItems
+    @Override
+    public int getAlignItems() {
+        return mAlignItems;
+    }
+
+    @Override
+    public void setAlignItems(@AlignItems int alignItems) {
+        if (mAlignItems != alignItems) {
+            mAlignItems = alignItems;
+            requestLayout();
+        }
+    }
+
+    @AlignContent
+    @Override
+    public int getAlignContent() {
+        return mAlignContent;
+    }
+
+    @Override
+    public void setAlignContent(@AlignContent int alignContent) {
+        if (mAlignContent != alignContent) {
+            mAlignContent = alignContent;
+            requestLayout();
+        }
+    }
+
+    @Override
+    public int getMaxLine() {
+        return mMaxLine;
+    }
+
+    @Override
+    public void setMaxLine(int maxLine) {
+        if (mMaxLine != maxLine) {
+            mMaxLine = maxLine;
+            requestLayout();
+        }
+    }
+
+    /**
+     * @return the flex lines composing this flex container. This method returns a copy of the
+     * original list excluding a dummy flex line (flex line that doesn't have any flex items in it
+     * but used for the alignment along the cross axis).
+     * Thus any changes of the returned list are not reflected to the original list.
+     */
+    @Override
+    public List<FlexLine> getFlexLines() {
+        List<FlexLine> result = new ArrayList<>(mFlexLines.size());
+        for (FlexLine flexLine : mFlexLines) {
+            if (flexLine.getItemCountNotGone() == 0) {
+                continue;
+            }
+            result.add(flexLine);
+        }
+        return result;
+    }
+
+    @Override
+    public int getDecorationLengthMainAxis(View view, int index, int indexInFlexLine) {
+        int decorationLength = 0;
+        if (isMainAxisDirectionHorizontal()) {
+            if (hasDividerBeforeChildAtAlongMainAxis(index, indexInFlexLine)) {
+                decorationLength += mDividerVerticalWidth;
+            }
+            if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                decorationLength += mDividerVerticalWidth;
+            }
+        } else {
+            if (hasDividerBeforeChildAtAlongMainAxis(index, indexInFlexLine)) {
+                decorationLength += mDividerHorizontalHeight;
+            }
+            if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                decorationLength += mDividerHorizontalHeight;
+            }
+        }
+        return decorationLength;
+    }
+
+    @Override
+    public int getDecorationLengthCrossAxis(View view) {
+        // Decoration along the cross axis for an individual view is not supported in the
+        // FlexboxLayout.
+        return 0;
+    }
+
+    @Override
+    public void onNewFlexLineAdded(FlexLine flexLine) {
+        // The size of the end divider isn't added until the flexLine is added to the flex container
+        // take the divider width (or height) into account when adding the flex line.
+        if (isMainAxisDirectionHorizontal()) {
+            if ((mShowDividerVertical & SHOW_DIVIDER_END) > 0) {
+                flexLine.mMainSize += mDividerVerticalWidth;
+                flexLine.mDividerLengthInMainSize += mDividerVerticalWidth;
+            }
+        } else {
+            if ((mShowDividerHorizontal & SHOW_DIVIDER_END) > 0) {
+                flexLine.mMainSize += mDividerHorizontalHeight;
+                flexLine.mDividerLengthInMainSize += mDividerHorizontalHeight;
+            }
+        }
+    }
+
+    @Override
+    public int getChildWidthMeasureSpec(int widthSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(widthSpec, padding, childDimension);
+    }
+
+    @Override
+    public int getChildHeightMeasureSpec(int heightSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(heightSpec, padding, childDimension);
+    }
+
+    @Override
+    public void onNewFlexItemAdded(View view, int index, int indexInFlexLine, FlexLine flexLine) {
+        // Check if the beginning or middle divider is required for the flex item
+        if (hasDividerBeforeChildAtAlongMainAxis(index, indexInFlexLine)) {
+            if (isMainAxisDirectionHorizontal()) {
+                flexLine.mMainSize += mDividerVerticalWidth;
+                flexLine.mDividerLengthInMainSize += mDividerVerticalWidth;
+            } else {
+                flexLine.mMainSize += mDividerHorizontalHeight;
+                flexLine.mDividerLengthInMainSize += mDividerHorizontalHeight;
+            }
+        }
+    }
+
+    @Override
+    public void setFlexLines(List<FlexLine> flexLines) {
+        mFlexLines = flexLines;
+    }
+
+    @Override
+    public List<FlexLine> getFlexLinesInternal() {
+        return mFlexLines;
+    }
+
+    @Override
+    public void updateViewCache(int position, View view) {
+        // No op
+    }
+
+    /**
+     * @return the horizontal divider drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setDividerDrawableHorizontal(Drawable)
+     */
+    @Nullable
+    @SuppressWarnings("UnusedDeclaration")
+    public Drawable getDividerDrawableHorizontal() {
+        return mDividerDrawableHorizontal;
+    }
+
+    /**
+     * @return the vertical divider drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setDividerDrawableVertical(Drawable)
+     */
+    @Nullable
+    @SuppressWarnings("UnusedDeclaration")
+    public Drawable getDividerDrawableVertical() {
+        return mDividerDrawableVertical;
+    }
+
+    /**
+     * Set a drawable to be used as a divider between items. The drawable is used for both
+     * horizontal and vertical dividers.
+     *
+     * @param divider Drawable that will divide each item for both horizontally and vertically.
+     * @see #setShowDivider(int)
+     */
+    public void setDividerDrawable(Drawable divider) {
+        setDividerDrawableHorizontal(divider);
+        setDividerDrawableVertical(divider);
+    }
+
+    /**
+     * Set a drawable to be used as a horizontal divider between items.
+     *
+     * @param divider Drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setShowDivider(int)
+     * @see #setShowDividerHorizontal(int)
+     */
+    public void setDividerDrawableHorizontal(@Nullable Drawable divider) {
+        if (divider == mDividerDrawableHorizontal) {
+            return;
+        }
+        mDividerDrawableHorizontal = divider;
+        if (divider != null) {
+            mDividerHorizontalHeight = divider.getIntrinsicHeight();
+        } else {
+            mDividerHorizontalHeight = 0;
+        }
+        setWillNotDrawFlag();
+        requestLayout();
+    }
+
+    /**
+     * Set a drawable to be used as a vertical divider between items.
+     *
+     * @param divider Drawable that will divide each item.
+     * @see #setDividerDrawable(Drawable)
+     * @see #setShowDivider(int)
+     * @see #setShowDividerVertical(int)
+     */
+    public void setDividerDrawableVertical(@Nullable Drawable divider) {
+        if (divider == mDividerDrawableVertical) {
+            return;
+        }
+        mDividerDrawableVertical = divider;
+        if (divider != null) {
+            mDividerVerticalWidth = divider.getIntrinsicWidth();
+        } else {
+            mDividerVerticalWidth = 0;
+        }
+        setWillNotDrawFlag();
+        requestLayout();
+    }
+
+    @FlexboxLayout.DividerMode
+    public int getShowDividerVertical() {
+        return mShowDividerVertical;
+    }
+
+    @FlexboxLayout.DividerMode
+    public int getShowDividerHorizontal() {
+        return mShowDividerHorizontal;
+    }
+
+    /**
+     * Set how dividers should be shown between items in this layout. This method sets the
+     * divider mode for both horizontally and vertically.
+     *
+     * @param dividerMode One or more of {@link #SHOW_DIVIDER_BEGINNING},
+     *                    {@link #SHOW_DIVIDER_MIDDLE}, or {@link #SHOW_DIVIDER_END},
+     *                    or {@link #SHOW_DIVIDER_NONE} to show no dividers.
+     * @see #setShowDividerVertical(int)
+     * @see #setShowDividerHorizontal(int)
+     */
+    public void setShowDivider(@DividerMode int dividerMode) {
+        setShowDividerVertical(dividerMode);
+        setShowDividerHorizontal(dividerMode);
+    }
+
+    /**
+     * Set how vertical dividers should be shown between items in this layout
+     *
+     * @param dividerMode One or more of {@link #SHOW_DIVIDER_BEGINNING},
+     *                    {@link #SHOW_DIVIDER_MIDDLE}, or {@link #SHOW_DIVIDER_END},
+     *                    or {@link #SHOW_DIVIDER_NONE} to show no dividers.
+     * @see #setShowDivider(int)
+     */
+    public void setShowDividerVertical(@DividerMode int dividerMode) {
+        if (dividerMode != mShowDividerVertical) {
+            mShowDividerVertical = dividerMode;
+            requestLayout();
+        }
+    }
+
+    /**
+     * Set how horizontal dividers should be shown between items in this layout.
+     *
+     * @param dividerMode One or more of {@link #SHOW_DIVIDER_BEGINNING},
+     *                    {@link #SHOW_DIVIDER_MIDDLE}, or {@link #SHOW_DIVIDER_END},
+     *                    or {@link #SHOW_DIVIDER_NONE} to show no dividers.
+     * @see #setShowDivider(int)
+     */
+    public void setShowDividerHorizontal(@DividerMode int dividerMode) {
+        if (dividerMode != mShowDividerHorizontal) {
+            mShowDividerHorizontal = dividerMode;
+            requestLayout();
+        }
+    }
+
+    private void setWillNotDrawFlag() {
+        if (mDividerDrawableHorizontal == null && mDividerDrawableVertical == null) {
+            setWillNotDraw(true);
+        } else {
+            setWillNotDraw(false);
+        }
+    }
+
+    /**
+     * Check if a divider is needed before the view whose indices are passed as arguments.
+     *
+     * @param index           the absolute index of the view to be judged
+     * @param indexInFlexLine the relative index in the flex line where the view
+     *                        belongs
+     * @return {@code true} if a divider is needed, {@code false} otherwise
+     */
+    private boolean hasDividerBeforeChildAtAlongMainAxis(int index, int indexInFlexLine) {
+        if (allViewsAreGoneBefore(index, indexInFlexLine)) {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerVertical & SHOW_DIVIDER_BEGINNING) != 0;
+            } else {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_BEGINNING) != 0;
+            }
+        } else {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerVertical & SHOW_DIVIDER_MIDDLE) != 0;
+            } else {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_MIDDLE) != 0;
+            }
+        }
+    }
+
+    private boolean allViewsAreGoneBefore(int index, int indexInFlexLine) {
+        for (int i = 1; i <= indexInFlexLine; i++) {
+            View view = getReorderedChildAt(index - i);
+            if (view != null && view.getVisibility() != View.GONE) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check if a divider is needed before the flex line whose index is passed as an argument.
+     *
+     * @param flexLineIndex the index of the flex line to be checked
+     * @return {@code true} if a divider is needed, {@code false} otherwise
+     */
+    private boolean hasDividerBeforeFlexLine(int flexLineIndex) {
+        if (flexLineIndex < 0 || flexLineIndex >= mFlexLines.size()) {
+            return false;
+        }
+        if (allFlexLinesAreDummyBefore(flexLineIndex)) {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_BEGINNING) != 0;
+            } else {
+                return (mShowDividerVertical & SHOW_DIVIDER_BEGINNING) != 0;
+            }
+        } else {
+            if (isMainAxisDirectionHorizontal()) {
+                return (mShowDividerHorizontal & SHOW_DIVIDER_MIDDLE) != 0;
+            } else {
+                return (mShowDividerVertical & SHOW_DIVIDER_MIDDLE) != 0;
+            }
+        }
+    }
+
+    private boolean allFlexLinesAreDummyBefore(int flexLineIndex) {
+        for (int i = 0; i < flexLineIndex; i++) {
+            if (mFlexLines.get(i).getItemCountNotGone() > 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check if a end divider is needed after the flex line whose index is passed as an argument.
+     *
+     * @param flexLineIndex the index of the flex line to be checked
+     * @return {@code true} if a divider is needed, {@code false} otherwise
+     */
+    private boolean hasEndDividerAfterFlexLine(int flexLineIndex) {
+        if (flexLineIndex < 0 || flexLineIndex >= mFlexLines.size()) {
+            return false;
+        }
+
+        for (int i = flexLineIndex + 1; i < mFlexLines.size(); i++) {
+            if (mFlexLines.get(i).getItemCountNotGone() > 0) {
+                return false;
+            }
+        }
+        if (isMainAxisDirectionHorizontal()) {
+            return (mShowDividerHorizontal & SHOW_DIVIDER_END) != 0;
+        } else {
+            return (mShowDividerVertical & SHOW_DIVIDER_END) != 0;
+        }
+
+    }
+
+    /**
+     * Per child parameters for children views of the {@link FlexboxLayout}.
+     *
+     * Note that some parent fields (which are not primitive nor a class implements
+     * {@link Parcelable}) are not included as the stored/restored fields after this class
+     * is serialized/de-serialized as an {@link Parcelable}.
+     */
+    public static class LayoutParams extends ViewGroup.MarginLayoutParams implements FlexItem {
+
+        /**
+         * @see FlexItem#getOrder()
+         */
+        private int mOrder = FlexItem.ORDER_DEFAULT;
+
+        /**
+         * @see FlexItem#getFlexGrow()
+         */
+        private float mFlexGrow = FlexItem.FLEX_GROW_DEFAULT;
+
+        /**
+         * @see FlexItem#getFlexShrink()
+         */
+        private float mFlexShrink = FlexItem.FLEX_SHRINK_DEFAULT;
+
+        /**
+         * @see FlexItem#getAlignSelf()
+         */
+        private int mAlignSelf = AlignSelf.AUTO;
+
+        /**
+         * @see FlexItem#getFlexBasisPercent()
+         */
+        private float mFlexBasisPercent = FlexItem.FLEX_BASIS_PERCENT_DEFAULT;
+
+        /**
+         * @see FlexItem#getMinWidth()
+         */
+        private int mMinWidth = NOT_SET;
+
+        /**
+         * @see FlexItem#getMinHeight()
+         */
+        private int mMinHeight = NOT_SET;
+
+        /**
+         * @see FlexItem#getMaxWidth()
+         */
+        private int mMaxWidth = MAX_SIZE;
+
+        /**
+         * @see FlexItem#getMaxHeight()
+         */
+        private int mMaxHeight = MAX_SIZE;
+
+        /**
+         * @see FlexItem#isWrapBefore()
+         */
+        private boolean mWrapBefore;
+
+        public LayoutParams(Context context, AttributeSet attrs) {
+            super(context, attrs);
+
+            TypedArray a = context
+                    .obtainStyledAttributes(attrs, R.styleable.FlexboxLayout_Layout);
+            mOrder = a.getInt(R.styleable.FlexboxLayout_Layout_layout_order, ORDER_DEFAULT);
+            mFlexGrow = a
+                    .getFloat(R.styleable.FlexboxLayout_Layout_layout_flexGrow, FLEX_GROW_DEFAULT);
+            mFlexShrink = a.getFloat(R.styleable.FlexboxLayout_Layout_layout_flexShrink,
+                    FLEX_SHRINK_DEFAULT);
+            mAlignSelf = a
+                    .getInt(R.styleable.FlexboxLayout_Layout_layout_alignSelf, AlignSelf.AUTO);
+            mFlexBasisPercent = a
+                    .getFraction(R.styleable.FlexboxLayout_Layout_layout_flexBasisPercent, 1, 1,
+                            FLEX_BASIS_PERCENT_DEFAULT);
+            mMinWidth = a
+                    .getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_minWidth, NOT_SET);
+            mMinHeight = a
+                    .getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_minHeight, NOT_SET);
+            mMaxWidth = a.getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_maxWidth,
+                    MAX_SIZE);
+            mMaxHeight = a.getDimensionPixelSize(R.styleable.FlexboxLayout_Layout_layout_maxHeight,
+                    MAX_SIZE);
+            mWrapBefore = a.getBoolean(R.styleable.FlexboxLayout_Layout_layout_wrapBefore, false);
+            a.recycle();
+        }
+
+        public LayoutParams(LayoutParams source) {
+            super(source);
+
+            mOrder = source.mOrder;
+            mFlexGrow = source.mFlexGrow;
+            mFlexShrink = source.mFlexShrink;
+            mAlignSelf = source.mAlignSelf;
+            mFlexBasisPercent = source.mFlexBasisPercent;
+            mMinWidth = source.mMinWidth;
+            mMinHeight = source.mMinHeight;
+            mMaxWidth = source.mMaxWidth;
+            mMaxHeight = source.mMaxHeight;
+            mWrapBefore = source.mWrapBefore;
+        }
+
+        public LayoutParams(ViewGroup.LayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(int width, int height) {
+            super(new ViewGroup.LayoutParams(width, height));
+        }
+
+        public LayoutParams(MarginLayoutParams source) {
+            super(source);
+        }
+
+        @Override
+        public int getWidth() {
+            return width;
+        }
+
+        @Override
+        public void setWidth(int width) {
+            this.width = width;
+        }
+
+        @Override
+        public int getHeight() {
+            return height;
+        }
+
+        @Override
+        public void setHeight(int height) {
+            this.height = height;
+        }
+
+        @Override
+        public int getOrder() {
+            return mOrder;
+        }
+
+        @Override
+        public void setOrder(int order) {
+            mOrder = order;
+        }
+
+        @Override
+        public float getFlexGrow() {
+            return mFlexGrow;
+        }
+
+        @Override
+        public void setFlexGrow(float flexGrow) {
+            this.mFlexGrow = flexGrow;
+        }
+
+        @Override
+        public float getFlexShrink() {
+            return mFlexShrink;
+        }
+
+        @Override
+        public void setFlexShrink(float flexShrink) {
+            this.mFlexShrink = flexShrink;
+        }
+
+        @AlignSelf
+        @Override
+        public int getAlignSelf() {
+            return mAlignSelf;
+        }
+
+        @Override
+        public void setAlignSelf(@AlignSelf int alignSelf) {
+            this.mAlignSelf = alignSelf;
+        }
+
+        @Override
+        public int getMinWidth() {
+            return mMinWidth;
+        }
+
+        @Override
+        public void setMinWidth(int minWidth) {
+            this.mMinWidth = minWidth;
+        }
+
+        @Override
+        public int getMinHeight() {
+            return mMinHeight;
+        }
+
+        @Override
+        public void setMinHeight(int minHeight) {
+            this.mMinHeight = minHeight;
+        }
+
+        @Override
+        public int getMaxWidth() {
+            return mMaxWidth;
+        }
+
+        @Override
+        public void setMaxWidth(int maxWidth) {
+            this.mMaxWidth = maxWidth;
+        }
+
+        @Override
+        public int getMaxHeight() {
+            return mMaxHeight;
+        }
+
+        @Override
+        public void setMaxHeight(int maxHeight) {
+            this.mMaxHeight = maxHeight;
+        }
+
+        @Override
+        public boolean isWrapBefore() {
+            return mWrapBefore;
+        }
+
+        @Override
+        public void setWrapBefore(boolean wrapBefore) {
+            this.mWrapBefore = wrapBefore;
+        }
+
+        @Override
+        public float getFlexBasisPercent() {
+            return mFlexBasisPercent;
+        }
+
+        @Override
+        public void setFlexBasisPercent(float flexBasisPercent) {
+            this.mFlexBasisPercent = flexBasisPercent;
+        }
+
+        @Override
+        public int getMarginLeft() {
+            return leftMargin;
+        }
+
+        @Override
+        public int getMarginTop() {
+            return topMargin;
+        }
+
+        @Override
+        public int getMarginRight() {
+            return rightMargin;
+        }
+
+        @Override
+        public int getMarginBottom() {
+            return bottomMargin;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(this.mOrder);
+            dest.writeFloat(this.mFlexGrow);
+            dest.writeFloat(this.mFlexShrink);
+            dest.writeInt(this.mAlignSelf);
+            dest.writeFloat(this.mFlexBasisPercent);
+            dest.writeInt(this.mMinWidth);
+            dest.writeInt(this.mMinHeight);
+            dest.writeInt(this.mMaxWidth);
+            dest.writeInt(this.mMaxHeight);
+            dest.writeByte(this.mWrapBefore ? (byte) 1 : (byte) 0);
+            dest.writeInt(this.bottomMargin);
+            dest.writeInt(this.leftMargin);
+            dest.writeInt(this.rightMargin);
+            dest.writeInt(this.topMargin);
+            dest.writeInt(this.height);
+            dest.writeInt(this.width);
+        }
+
+        protected LayoutParams(Parcel in) {
+            // Passing a resolved value to resolve a lint warning
+            // height and width are set in this method anyway.
+            super(0, 0);
+            this.mOrder = in.readInt();
+            this.mFlexGrow = in.readFloat();
+            this.mFlexShrink = in.readFloat();
+            this.mAlignSelf = in.readInt();
+            this.mFlexBasisPercent = in.readFloat();
+            this.mMinWidth = in.readInt();
+            this.mMinHeight = in.readInt();
+            this.mMaxWidth = in.readInt();
+            this.mMaxHeight = in.readInt();
+            this.mWrapBefore = in.readByte() != 0;
+            this.bottomMargin = in.readInt();
+            this.leftMargin = in.readInt();
+            this.rightMargin = in.readInt();
+            this.topMargin = in.readInt();
+            this.height = in.readInt();
+            this.width = in.readInt();
+        }
+
+        public static final Parcelable.Creator<LayoutParams> CREATOR
+                = new Parcelable.Creator<LayoutParams>() {
+            @Override
+            public LayoutParams createFromParcel(Parcel source) {
+                return new LayoutParams(source);
+            }
+
+            @Override
+            public LayoutParams[] newArray(int size) {
+                return new LayoutParams[size];
+            }
+        };
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
new file mode 100755
index 0000000..21ea733
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
@@ -0,0 +1,3112 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import static androidx.recyclerview.widget.LinearLayoutManager.INVALID_OFFSET;
+import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
+
+import android.content.Context;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSmoothScroller;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * LayoutManager for the {@link RecyclerView}. This class is intended to be used within a
+ * {@link RecyclerView} and offers the same capabilities of measure/layout its children
+ * as the {@link FlexboxLayout}.
+ */
+public class FlexboxLayoutManager extends RecyclerView.LayoutManager implements FlexContainer,
+        RecyclerView.SmoothScroller.ScrollVectorProvider {
+
+    private static final String TAG = "FlexboxLayoutManager";
+
+    /**
+     * Temporary Rect instance to be passed to
+     * {@link RecyclerView.LayoutManager#calculateItemDecorationsForChild}
+     * to avoid creating a Rect instance every time.
+     */
+    private static final Rect TEMP_RECT = new Rect();
+
+    private static final boolean DEBUG = false;
+
+    /**
+     * The current value of the {@link FlexDirection}, the default value is {@link
+     * FlexDirection#ROW}.
+     *
+     * @see FlexContainer#getFlexDirection()
+     */
+    private int mFlexDirection;
+
+    /**
+     * The current value of the {@link FlexWrap}, the default value is {@link FlexWrap#WRAP}.
+     *
+     * @see FlexContainer#getFlexWrap()
+     */
+    private int mFlexWrap;
+
+    /**
+     * The current value of the {@link JustifyContent}, the default value is
+     * {@link JustifyContent#FLEX_START}.
+     *
+     * @see FlexContainer#getJustifyContent()
+     */
+    private int mJustifyContent;
+
+    /**
+     * The current value of the {@link AlignItems}, the default value is
+     * {@link AlignItems#STRETCH}.
+     *
+     * @see FlexContainer#getAlignItems()
+     */
+    private int mAlignItems;
+
+    private int mMaxLine = NOT_SET;
+
+    /**
+     * True if the layout direction is right to left, false otherwise.
+     */
+    private boolean mIsRtl;
+
+    /**
+     * True if the layout direction is bottom to top, false otherwise.
+     */
+    private boolean mFromBottomToTop;
+
+    private List<FlexLine> mFlexLines = new ArrayList<>();
+
+    private final FlexboxHelper mFlexboxHelper = new FlexboxHelper(this);
+
+    /**
+     * A snapshot of the {@link RecyclerView.Recycler} instance at a given moment.
+     * It's not guaranteed that this instance has a reference to the latest Recycler.
+     * When you want to use the latest Recycler, use the one passed as an method argument
+     * (such as the one in {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     */
+    private RecyclerView.Recycler mRecycler;
+
+    /**
+     * A snapshot of the {@link RecyclerView.State} instance at a given moment.
+     * It's not guaranteed that this instance has a reference to the latest State.
+     * When you want to use the latest State, use the one passed as an method argument
+     * (such as the one in {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     */
+    private RecyclerView.State mState;
+
+    private LayoutState mLayoutState;
+
+    private AnchorInfo mAnchorInfo = new AnchorInfo();
+
+    /**
+     * {@link OrientationHelper} along cross axis, which will be the primary scrolling direction.
+     * e.g. If the flex direction is set to {@link FlexDirection#ROW} and flex wrap is set to
+     * {@link FlexWrap#WRAP}, the RecyclerView scrolls vertically (along the cross axis).
+     */
+    private OrientationHelper mOrientationHelper;
+
+    /**
+     * {@link OrientationHelper} along the main axis, which will be the secondary scrolling
+     * direction if the size of the main size is larger than the parent of the RecyclerView.
+     */
+    private OrientationHelper mSubOrientationHelper;
+
+    private SavedState mPendingSavedState;
+
+    /**
+     * The position to which the next layout should start from this adapter position.
+     * This value is set either from the {@link #mPendingSavedState} when a configuration change
+     * happens or programmatically such as when the {@link #scrollToPosition(int)} is called.
+     */
+    private int mPendingScrollPosition = NO_POSITION;
+
+    /**
+     * The offset by which the next layout should be offset.
+     */
+    private int mPendingScrollPositionOffset = INVALID_OFFSET;
+
+    /**
+     * The width value used in the last {@link #onLayoutChildren} method.
+     */
+    private int mLastWidth = Integer.MIN_VALUE;
+
+    /**
+     * The height value used in the last {@link #onLayoutChildren} method.
+     */
+    private int mLastHeight = Integer.MIN_VALUE;
+
+    /**
+     * If set to {@code true}, this LayoutManager tries to recycle the children when detached from
+     * the RecyclerView so that recycled views can be reused using RecycledViewPool.
+     */
+    private boolean mRecycleChildrenOnDetach;
+
+    /**
+     * View cache within this LayoutManager. This is used to avoid the same ViewHolder is created
+     * multiple times in the same layout pass (onLayoutChildren or scrollHorizontally or
+     * scrollVertically).
+     * The keys and values in this cache needs to be cleared at the end of each layout pass.
+     */
+    private SparseArray<View> mViewCache = new SparseArray<>();
+
+    private final Context mContext;
+
+    /** The reference to the parent of the RecyclerView */
+    private View mParent;
+
+    /**
+     * Indicates the position that the view position that the flex line which has the view having
+     * this position needs to be recomputed before the next layout.
+     * For example, this is updated when a new View is inserted into the position before the
+     * first visible position.
+     */
+    private int mDirtyPosition = NO_POSITION;
+
+    /**
+     * Used for storing the results of calculation of flex lines to avoid creating a new instance
+     * every time the calculation happens.
+     */
+    private FlexboxHelper.FlexLinesResult mFlexLinesResult = new FlexboxHelper.FlexLinesResult();
+
+    /**
+     * Creates a default FlexboxLayoutManager.
+     */
+    public FlexboxLayoutManager(Context context) {
+        this(context, FlexDirection.ROW, FlexWrap.WRAP);
+    }
+
+    /**
+     * Creates a FlexboxLayoutManager with the flexDirection specified.
+     *
+     * @param flexDirection the flex direction attribute
+     */
+    public FlexboxLayoutManager(Context context, @FlexDirection int flexDirection) {
+        this(context, flexDirection, FlexWrap.WRAP);
+    }
+
+    /**
+     * Creates a FlexboxLayoutManager with the flexDirection and flexWrap attributes specified.
+     *
+     * @param flexDirection the flex direction attribute
+     * @param flexWrap      the flex wrap attribute
+     */
+    public FlexboxLayoutManager(Context context, @FlexDirection int flexDirection,
+            @FlexWrap int flexWrap) {
+        setFlexDirection(flexDirection);
+        setFlexWrap(flexWrap);
+        setAlignItems(AlignItems.STRETCH);
+        mContext = context;
+    }
+
+    /**
+     * Constructor used when layout manager is set in XML by RecyclerView attribute
+     * "layoutManager". No corresponding attributes for the {@code orientation},
+     * {@code reverseLayout} and {@code stackFromEnd} exist in Flexbox, thus map the similar
+     * attributes from Flexbox that behave similarly for each of them.
+     *
+     * {@code android:orientation} maps to the {@link FlexDirection},
+     * HORIZONTAL -> {@link FlexDirection#ROW}, VERTICAL -> {@link FlexDirection#COLUMN}.
+     *
+     * {@code android.support.v7.recyclerview:reverseLayout} reverses the direction of the
+     * {@link FlexDirection}, i.e. if reverseLayout is {@code true}, {@link FlexDirection#ROW} is
+     * changed to {@link FlexDirection#ROW_REVERSE}. Similarly {@link FlexDirection#COLUMN} is
+     * changed to {@link FlexDirection#COLUMN_REVERSE}.
+     */
+    public FlexboxLayoutManager(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        Properties properties = getProperties(context, attrs, defStyleAttr, defStyleRes);
+        switch (properties.orientation) {
+            case LinearLayoutManager.HORIZONTAL:
+                if (properties.reverseLayout) {
+                    setFlexDirection(FlexDirection.ROW_REVERSE);
+                } else {
+                    setFlexDirection(FlexDirection.ROW);
+                }
+                break;
+            case LinearLayoutManager.VERTICAL:
+                if (properties.reverseLayout) {
+                    setFlexDirection(FlexDirection.COLUMN_REVERSE);
+                } else {
+                    setFlexDirection(FlexDirection.COLUMN);
+                }
+                break;
+        }
+        setFlexWrap(FlexWrap.WRAP);
+        setAlignItems(AlignItems.STRETCH);
+        mContext = context;
+    }
+
+    @Override
+    public boolean isAutoMeasureEnabled() {
+        return true;
+    }
+
+    // From here, methods from FlexContainer
+    @FlexDirection
+    @Override
+    public int getFlexDirection() {
+        return mFlexDirection;
+    }
+
+    @Override
+    public void setFlexDirection(@FlexDirection int flexDirection) {
+        if (mFlexDirection != flexDirection) {
+            // Remove the existing views even if the direction changes from
+            // row -> row_reverse or column -> column_reverse to make the item decorations dirty
+            // state
+            removeAllViews();
+            mFlexDirection = flexDirection;
+            mOrientationHelper = null;
+            mSubOrientationHelper = null;
+            clearFlexLines();
+            requestLayout();
+        }
+    }
+
+    @Override
+    @FlexWrap
+    public int getFlexWrap() {
+        return mFlexWrap;
+    }
+
+    @Override
+    public void setFlexWrap(@FlexWrap int flexWrap) {
+        if (flexWrap == FlexWrap.WRAP_REVERSE) {
+            throw new UnsupportedOperationException("wrap_reverse is not supported in "
+                    + "FlexboxLayoutManager");
+        }
+        if (mFlexWrap != flexWrap) {
+            if (mFlexWrap == FlexWrap.NOWRAP || flexWrap == FlexWrap.NOWRAP) {
+                removeAllViews();
+                clearFlexLines();
+            }
+            mFlexWrap = flexWrap;
+            mOrientationHelper = null;
+            mSubOrientationHelper = null;
+            requestLayout();
+        }
+    }
+
+    @JustifyContent
+    @Override
+    public int getJustifyContent() {
+        return mJustifyContent;
+    }
+
+    @Override
+    public void setJustifyContent(@JustifyContent int justifyContent) {
+        if (mJustifyContent != justifyContent) {
+            mJustifyContent = justifyContent;
+            requestLayout();
+        }
+    }
+
+    @AlignItems
+    @Override
+    public int getAlignItems() {
+        return mAlignItems;
+    }
+
+    @Override
+    public void setAlignItems(@AlignItems int alignItems) {
+        if (mAlignItems != alignItems) {
+            if (mAlignItems == AlignItems.STRETCH || alignItems == AlignItems.STRETCH) {
+                removeAllViews();
+                clearFlexLines();
+            }
+            mAlignItems = alignItems;
+            requestLayout();
+        }
+    }
+
+    @AlignContent
+    @Override
+    public int getAlignContent() {
+        return AlignContent.STRETCH;
+    }
+
+    @Override
+    public void setAlignContent(@AlignContent int alignContent) {
+        throw new UnsupportedOperationException("Setting the alignContent in the "
+                + "FlexboxLayoutManager is not supported. Use FlexboxLayout "
+                + "if you need to use this attribute.");
+    }
+
+    @Override
+    public int getMaxLine() {
+        return mMaxLine;
+    }
+
+    @Override
+    public void setMaxLine(int maxLine) {
+        if (mMaxLine != maxLine) {
+            mMaxLine = maxLine;
+            requestLayout();
+        }
+    }
+
+    @Override
+    @NonNull
+    public List<FlexLine> getFlexLines() {
+        List<FlexLine> result = new ArrayList<>(mFlexLines.size());
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            if (flexLine.getItemCount() == 0) {
+                continue;
+            }
+            result.add(flexLine);
+        }
+        return result;
+    }
+
+    @Override
+    public int getDecorationLengthMainAxis(View view, int index, int indexInFlexLine) {
+        if (isMainAxisDirectionHorizontal()) {
+            return getLeftDecorationWidth(view) + getRightDecorationWidth(view);
+        } else {
+            return getTopDecorationHeight(view) + getBottomDecorationHeight(view);
+        }
+    }
+
+    @Override
+    public int getDecorationLengthCrossAxis(View view) {
+        if (isMainAxisDirectionHorizontal()) {
+            return getTopDecorationHeight(view) + getBottomDecorationHeight(view);
+        } else {
+            return getLeftDecorationWidth(view) + getRightDecorationWidth(view);
+        }
+    }
+
+    @Override
+    public void onNewFlexItemAdded(View view, int index, int indexInFlexLine, FlexLine flexLine) {
+        // To avoid creating a new Rect instance every time, passing the same Rect instance
+        // since calculated decorations are assigned to view's LayoutParams inside the
+        // calculateItemDecorationsForChild method anyway.
+        calculateItemDecorationsForChild(view, TEMP_RECT);
+        if (isMainAxisDirectionHorizontal()) {
+            int decorationWidth = getLeftDecorationWidth(view) + getRightDecorationWidth(view);
+            flexLine.mMainSize += decorationWidth;
+            flexLine.mDividerLengthInMainSize += decorationWidth;
+        } else {
+            int decorationHeight = getTopDecorationHeight(view) + getBottomDecorationHeight(view);
+            flexLine.mMainSize += decorationHeight;
+            flexLine.mDividerLengthInMainSize += decorationHeight;
+        }
+    }
+
+    /**
+     * @return the number of flex items contained in the flex container.
+     * This method doesn't always reflect the latest state of the adapter.
+     * If you want to access the latest state of the adapter, use the {@link RecyclerView.State}
+     * instance passed as an argument for some methods (such as
+     * {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     *
+     * This method is used to avoid the implementation of the similar method.
+     * i.e. {@link FlexboxLayoutManager#getChildCount()} returns the child count, but it doesn't
+     * include the children that are detached or scrapped.
+     */
+    @Override
+    public int getFlexItemCount() {
+        return mState.getItemCount();
+    }
+
+    /**
+     * @return the flex item as a view specified as the index.
+     * This method doesn't always return the latest state of the view in the adapter.
+     * If you want to access the latest state, use the {@link RecyclerView.Recycler}
+     * instance passed as an argument for some methods (such as
+     * {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)})
+     *
+     * This method is used to avoid the implementation of the similar method.
+     * i.e. {@link FlexboxLayoutManager#getChildAt(int)} returns a view for the given index,
+     * but the index is based on the layout position, not based on the adapter position, which
+     * isn't desired given the usage of this method.
+     */
+    @Override
+    public View getFlexItemAt(int index) {
+        // Look up the cache within the LayoutManager first, since it's the most light operation.
+        View cachedView = mViewCache.get(index);
+        if (cachedView != null) {
+            return cachedView;
+        }
+        return mRecycler.getViewForPosition(index);
+    }
+
+    /**
+     * Returns a View for the given index.
+     * The order attribute ({@link FlexItem#getOrder()}) is not supported by this class since
+     * otherwise all view holders need to be inflated at least once even though only the visible
+     * part of the layout is needed.
+     * Implementing this method just to make this class conform to the
+     * {@link FlexContainer} interface.
+     *
+     * @param index the index of the view
+     * @return the view for the given index.
+     * If the index is negative or out of bounds of the number of contained views,
+     * returns {@code null}.
+     */
+    @Override
+    public View getReorderedFlexItemAt(int index) {
+        return getFlexItemAt(index);
+    }
+
+    @Override
+    public void onNewFlexLineAdded(FlexLine flexLine) {
+        // No op
+    }
+
+    @Override
+    public int getChildWidthMeasureSpec(int widthSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(getWidth(), getWidthMode(), padding, childDimension,
+                canScrollHorizontally());
+    }
+
+    @Override
+    public int getChildHeightMeasureSpec(int heightSpec, int padding, int childDimension) {
+        return getChildMeasureSpec(getHeight(), getHeightMode(), padding, childDimension,
+                canScrollVertically());
+    }
+
+    @Override
+    public int getLargestMainSize() {
+        if (mFlexLines.size() == 0) {
+            return 0;
+        }
+        int largestSize = Integer.MIN_VALUE;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            largestSize = Math.max(largestSize, flexLine.mMainSize);
+        }
+        return largestSize;
+    }
+
+    @Override
+    public int getSumOfCrossSize() {
+        int sum = 0;
+        for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+            FlexLine flexLine = mFlexLines.get(i);
+            // TODO: Consider adding decorator between flex lines.
+            sum += flexLine.mCrossSize;
+        }
+        return sum;
+    }
+
+    @Override
+    public void setFlexLines(List<FlexLine> flexLines) {
+        mFlexLines = flexLines;
+    }
+
+    @Override
+    public List<FlexLine> getFlexLinesInternal() {
+        return mFlexLines;
+    }
+
+    @Override
+    public void updateViewCache(int position, View view) {
+        mViewCache.put(position, view);
+    }
+    // The end of methods from FlexContainer
+
+    // ScrollVectorProvider method
+    @Override
+    public PointF computeScrollVectorForPosition(int targetPosition) {
+        if (getChildCount() == 0) {
+            return null;
+        }
+        View view = getChildAt(0);
+        if (view == null) {
+            return null;
+        }
+        int firstChildPos = getPosition(view);
+        int direction = targetPosition < firstChildPos ? -1 : 1;
+        if (isMainAxisDirectionHorizontal()) {
+            return new PointF(0, direction);
+        } else {
+            return new PointF(direction, 0);
+        }
+    }
+
+    @Override
+    public RecyclerView.LayoutParams generateDefaultLayoutParams() {
+        return new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+    }
+
+    @Override
+    public RecyclerView.LayoutParams generateLayoutParams(Context c, AttributeSet attrs) {
+        return new LayoutParams(c, attrs);
+    }
+
+    @Override
+    public boolean checkLayoutParams(RecyclerView.LayoutParams lp) {
+        return lp instanceof LayoutParams;
+    }
+
+    @Override
+    public void onAdapterChanged(RecyclerView.Adapter oldAdapter, RecyclerView.Adapter newAdapter) {
+        removeAllViews();
+    }
+
+    @Override
+    public Parcelable onSaveInstanceState() {
+        if (mPendingSavedState != null) {
+            return new SavedState(mPendingSavedState);
+        }
+        SavedState savedState = new SavedState();
+        if (getChildCount() > 0) {
+            // TODO: Find the child from end if mFlexWrap == FlexWrap.WRAP_REVERSE
+            View firstView = getChildClosestToStart();
+            savedState.mAnchorPosition = getPosition(firstView);
+            savedState.mAnchorOffset = mOrientationHelper.getDecoratedStart(firstView) -
+                    mOrientationHelper.getStartAfterPadding();
+        } else {
+            savedState.invalidateAnchor();
+        }
+        return savedState;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Parcelable state) {
+        if (state instanceof SavedState) {
+            mPendingSavedState = (SavedState) state;
+            requestLayout();
+            if (DEBUG) {
+                Log.d(TAG, "Loaded saved state. " + mPendingSavedState);
+            }
+        } else {
+            if (DEBUG) {
+                Log.w(TAG, "Invalid state was trying to be restored. " + state);
+            }
+        }
+    }
+
+    @Override
+    public void onItemsAdded(@NonNull RecyclerView recyclerView, int positionStart, int itemCount) {
+        super.onItemsAdded(recyclerView, positionStart, itemCount);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsUpdated(@NonNull RecyclerView recyclerView, int positionStart, int itemCount,
+            Object payload) {
+        super.onItemsUpdated(recyclerView, positionStart, itemCount, payload);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsUpdated(@NonNull RecyclerView recyclerView, int positionStart, int itemCount) {
+        super.onItemsUpdated(recyclerView, positionStart, itemCount);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsRemoved(@NonNull RecyclerView recyclerView, int positionStart, int itemCount) {
+        super.onItemsRemoved(recyclerView, positionStart, itemCount);
+        updateDirtyPosition(positionStart);
+    }
+
+    @Override
+    public void onItemsMoved(@NonNull RecyclerView recyclerView, int from, int to, int itemCount) {
+        super.onItemsMoved(recyclerView, from, to, itemCount);
+        updateDirtyPosition(Math.min(from, to));
+    }
+
+    private void updateDirtyPosition(int positionStart) {
+        int lastVisiblePosition = findLastVisibleItemPosition();
+        if (positionStart >= lastVisiblePosition) {
+            return;
+        }
+        int childCount = getChildCount();
+        mFlexboxHelper.ensureMeasureSpecCache(childCount);
+        mFlexboxHelper.ensureMeasuredSizeCache(childCount);
+        mFlexboxHelper.ensureIndexToFlexLine(childCount);
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+
+        if (positionStart >= mFlexboxHelper.mIndexToFlexLine.length) {
+            return;
+        }
+
+        mDirtyPosition = positionStart;
+
+        View firstView = getChildClosestToStart();
+        if (firstView == null) {
+            return;
+        }
+
+        // Assign the pending scroll position and offset so that the first visible position is
+        // restored in the next layout.
+        mPendingScrollPosition = getPosition(firstView);
+
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            mPendingScrollPositionOffset = mOrientationHelper.getDecoratedEnd(firstView) +
+                    mOrientationHelper.getEndPadding();
+        } else {
+            mPendingScrollPositionOffset = mOrientationHelper.getDecoratedStart(firstView) -
+                    mOrientationHelper.getStartAfterPadding();
+        }
+    }
+
+    @Override
+    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+        // Layout algorithm:
+        // 1) Find an anchor coordinate and anchor flex line position. If not found, the coordinate
+        //    starts from zero.
+        // 2) From the anchor position to the visible area, calculate the flex lines that needs to
+        //    be filled.
+        // 3) Fill toward end from the anchor position
+        // 4) Fill toward start from the anchor position
+        if (DEBUG) {
+            Log.d(TAG, "onLayoutChildren started");
+            Log.d(TAG, "getChildCount: " + getChildCount());
+            Log.d(TAG, "State: " + state);
+            Log.d(TAG, "PendingSavedState: " + mPendingSavedState);
+            Log.d(TAG, "PendingScrollPosition: " + mPendingScrollPosition);
+            Log.d(TAG, "PendingScrollOffset: " + mPendingScrollPositionOffset);
+        }
+
+        // Assign the Recycler and the State as the member variables so that
+        // the method from FlexContainer (such as getFlexItemCount()) returns the number of
+        // flex items from the adapter not the child count in the LayoutManager because
+        // LayoutManager#getChildCount doesn't include the views that are detached or scrapped.
+        mRecycler = recycler;
+        mState = state;
+        int childCount = state.getItemCount();
+        if (childCount == 0 && state.isPreLayout()) {
+            return;
+        }
+        resolveLayoutDirection();
+        ensureOrientationHelper();
+        ensureLayoutState();
+        mFlexboxHelper.ensureMeasureSpecCache(childCount);
+        mFlexboxHelper.ensureMeasuredSizeCache(childCount);
+
+        mFlexboxHelper.ensureIndexToFlexLine(childCount);
+
+        mLayoutState.mShouldRecycle = false;
+
+        if (mPendingSavedState != null && mPendingSavedState.hasValidAnchor(childCount)) {
+            mPendingScrollPosition = mPendingSavedState.mAnchorPosition;
+        }
+
+        if (!mAnchorInfo.mValid || mPendingScrollPosition != NO_POSITION ||
+                mPendingSavedState != null) {
+            mAnchorInfo.reset();
+            updateAnchorInfoForLayout(state, mAnchorInfo);
+            mAnchorInfo.mValid = true;
+        }
+        detachAndScrapAttachedViews(recycler);
+
+        if (mAnchorInfo.mLayoutFromEnd) {
+            updateLayoutStateToFillStart(mAnchorInfo, false, true);
+        } else {
+            updateLayoutStateToFillEnd(mAnchorInfo, false, true);
+        }
+        if (DEBUG) {
+            Log.d(TAG,
+                    String.format("onLayoutChildren. recycler.getScrapList.size(): %s, state: %s",
+                            recycler.getScrapList().size(), state));
+        }
+
+        updateFlexLines(childCount);
+        if (DEBUG) {
+            for (int i = 0, size = mFlexLines.size(); i < size; i++) {
+                FlexLine flexLine = mFlexLines.get(i);
+                Log.d(TAG, String.format("%d flex line. MainSize: %d, CrossSize: %d, itemCount: %d",
+                        i, flexLine.getMainSize(), flexLine.getCrossSize(),
+                        flexLine.getItemCount()));
+            }
+        }
+
+        int startOffset;
+        int endOffset;
+        int filledToEnd = fill(recycler, state, mLayoutState);
+        if (mAnchorInfo.mLayoutFromEnd) {
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward start", filledToEnd));
+            }
+            startOffset = mLayoutState.mOffset;
+            updateLayoutStateToFillEnd(mAnchorInfo, true, false);
+            int filledToStart = fill(recycler, state, mLayoutState);
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward end", filledToStart));
+            }
+            endOffset = mLayoutState.mOffset;
+        } else {
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward end", filledToEnd));
+            }
+            endOffset = mLayoutState.mOffset;
+            updateLayoutStateToFillStart(mAnchorInfo, true, false);
+            int filledToStart = fill(recycler, state, mLayoutState);
+            if (DEBUG) {
+                Log.d(TAG, String.format("filled: %d toward start", filledToStart));
+            }
+            startOffset = mLayoutState.mOffset;
+        }
+
+        if (getChildCount() > 0) {
+            if (mAnchorInfo.mLayoutFromEnd) {
+                int fixOffset = fixLayoutEndGap(endOffset, recycler, state, true);
+                startOffset += fixOffset;
+                fixLayoutStartGap(startOffset, recycler, state, false);
+            } else {
+                int fixOffset = fixLayoutStartGap(startOffset, recycler, state, true);
+                endOffset += fixOffset;
+                fixLayoutEndGap(endOffset, recycler, state, false);
+            }
+        }
+    }
+
+    /**
+     * Fill the gap the toward the start position if the gap to be filled is made.
+     * Large part is copied from LinearLayoutManager#fixLayoutStartGap.
+     */
+    private int fixLayoutStartGap(int startOffset, RecyclerView.Recycler recycler,
+            RecyclerView.State state, boolean canOffsetChildren) {
+        int gap;
+        int fixOffset;
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            gap = mOrientationHelper.getEndAfterPadding() - startOffset;
+            if (gap > 0) {
+                // check if we should fix this gap.
+                fixOffset = handleScrollingMainOrientation(-gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        } else {
+            gap = startOffset - mOrientationHelper.getStartAfterPadding();
+            if (gap > 0) {
+                // check if we should fix this gap.
+                fixOffset = -handleScrollingMainOrientation(gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        }
+        startOffset += fixOffset;
+        if (canOffsetChildren) {
+            // re-calculate gap, see if we could fix it
+            gap = startOffset - mOrientationHelper.getStartAfterPadding();
+            if (gap > 0) {
+                mOrientationHelper.offsetChildren(-gap);
+                return fixOffset - gap;
+            }
+        }
+        return fixOffset;
+    }
+
+    /**
+     * Fill the gap the toward the end position if the gap to be filled is made.
+     * This process is necessary in a case like {@link #scrollToPosition(int)} is called
+     * for the last item, otherwise the last item is placed as the first line.
+     * Large part is copied from LinearLayoutManager#fixLayoutEndGap.
+     */
+    private int fixLayoutEndGap(int endOffset, RecyclerView.Recycler recycler,
+            RecyclerView.State state, boolean canOffsetChildren) {
+        int gap;
+        boolean columnAndRtl = !isMainAxisDirectionHorizontal() && mIsRtl;
+        int fixOffset;
+        if (columnAndRtl) {
+            gap = endOffset - mOrientationHelper.getStartAfterPadding();
+            if (gap > 0) {
+                fixOffset = handleScrollingMainOrientation(gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        } else {
+            gap = mOrientationHelper.getEndAfterPadding() - endOffset;
+            if (gap > 0) {
+                fixOffset = -handleScrollingMainOrientation(-gap, recycler, state);
+            } else {
+                return 0; // nothing to fix
+            }
+        }
+
+        // move offset according to scroll amount
+        endOffset += fixOffset;
+        if (canOffsetChildren) {
+            // re-calculate gap, see if we could fix it
+            gap = mOrientationHelper.getEndAfterPadding() - endOffset;
+            if (gap > 0) {
+                mOrientationHelper.offsetChildren(gap);
+                return gap + fixOffset;
+            }
+        }
+        return fixOffset;
+    }
+
+    private void updateFlexLines(int childCount) {
+        //noinspection ResourceType
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(getWidth(), getWidthMode());
+        //noinspection ResourceType
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(getHeight(), getHeightMode());
+        int width = getWidth();
+        int height = getHeight();
+        boolean isMainSizeChanged;
+        int needsToFill;
+        // Clear the flex lines if the main size has changed from the last measurement.
+        // For example this happens when the developer handles the configuration changes manually
+        // or the user change the width boundary in the multi window mode.
+        if (isMainAxisDirectionHorizontal()) {
+            isMainSizeChanged = mLastWidth != Integer.MIN_VALUE && mLastWidth != width;
+
+            // If the mInfinite flag is set to true (that usually happens when RecyclerViews are
+            // nested and inner RecyclerView's layout_height is set to wrap_content, thus height is
+            // passed as 0 from the RecyclerView)
+            // Set the upper limit as the height of the device in order to prevent computing all
+            // items in the adapter
+            needsToFill = mLayoutState.mInfinite ?
+                    mContext.getResources().getDisplayMetrics().heightPixels
+                    : mLayoutState.mAvailable;
+        } else {
+            isMainSizeChanged = mLastHeight != Integer.MIN_VALUE && mLastHeight != height;
+
+            // If the mInfinite flag is set to true (that usually happens when RecyclerViews are
+            // nested and inner RecyclerView's layout_width is set to wrap_content, thus width is
+            // passed as 0 from the RecyclerView)
+            // Set the upper limit as the width of the device in order to prevent computing all
+            // items in the adapter
+            needsToFill = mLayoutState.mInfinite ?
+                    mContext.getResources().getDisplayMetrics().widthPixels
+                    : mLayoutState.mAvailable;
+        }
+
+        mLastWidth = width;
+        mLastHeight = height;
+
+        if (mDirtyPosition == NO_POSITION &&
+                (mPendingScrollPosition != NO_POSITION || isMainSizeChanged)) {
+            if (mAnchorInfo.mLayoutFromEnd) {
+                // Prior flex lines should be already calculated, don't have to be updated
+                return;
+            }
+            // TODO: This path may need another consideration to not calculate the entire flex
+            // lines prior to the anchor position since it may cause noticeable amount of
+            // skipped frames.
+            // Another note: deciding anchor position for the anchor view assumes that prior
+            // flex lines are calculated otherwise the position of the view can't be decided.
+            // It may be possible that assumes the anchor view is always at the start of a flex
+            // line and calculate the rest of flex lines as user scrolls to the top (toward the
+            // start) incrementally, but that approach may lead to inconsistent anchor view
+            // position
+            mFlexLines.clear();
+            assert mFlexboxHelper.mIndexToFlexLine != null;
+            mFlexLinesResult.reset();
+            if (isMainAxisDirectionHorizontal()) {
+                mFlexboxHelper
+                        .calculateHorizontalFlexLinesToIndex(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec,
+                                needsToFill, mAnchorInfo.mPosition, mFlexLines);
+            } else {
+                mFlexboxHelper
+                        .calculateVerticalFlexLinesToIndex(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec,
+                                needsToFill, mAnchorInfo.mPosition, mFlexLines);
+            }
+            mFlexLines = mFlexLinesResult.mFlexLines;
+            mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec);
+            mFlexboxHelper.stretchViews();
+            mAnchorInfo.mFlexLinePosition =
+                    mFlexboxHelper.mIndexToFlexLine[mAnchorInfo.mPosition];
+            mLayoutState.mFlexLinePosition = mAnchorInfo.mFlexLinePosition;
+        } else {
+            // Calculate the flex lines until the calculated cross size reaches the
+            // LayoutState#mAvailable (or until the end of the flex container)
+            // calculation can be done incrementally because the flex lines prior to the anchor
+            // position haven't changed
+            int fromIndex = mDirtyPosition != NO_POSITION ?
+                    Math.min(mDirtyPosition, mAnchorInfo.mPosition) : mAnchorInfo.mPosition;
+
+            mFlexLinesResult.reset();
+            if (isMainAxisDirectionHorizontal()) {
+                if (mFlexLines.size() > 0) {
+                    // Remove the already calculated flex lines from the fromIndex (either of
+                    // anchor position or the position marked as dirty (last time the item was
+                    // changed) and calculate beyond the available amount
+                    // (visible area that needs to be filled)
+                    mFlexboxHelper.clearFlexLines(mFlexLines, fromIndex);
+                    mFlexboxHelper.calculateFlexLines(mFlexLinesResult, widthMeasureSpec,
+                            heightMeasureSpec, needsToFill, fromIndex, mAnchorInfo.mPosition,
+                            mFlexLines);
+                } else {
+                    mFlexboxHelper.ensureIndexToFlexLine(childCount);
+                    mFlexboxHelper
+                            .calculateHorizontalFlexLines(mFlexLinesResult,
+                                    widthMeasureSpec, heightMeasureSpec,
+                                    needsToFill, 0, mFlexLines);
+                }
+            } else {
+                if (mFlexLines.size() > 0) {
+                    // Remove the already calculated flex lines from the fromIndex (either of
+                    // anchor position or the position marked as dirty (last time the item was
+                    // changed) and calculate beyond the available amount
+                    // (visible area that needs to be filled)
+                    mFlexboxHelper.clearFlexLines(mFlexLines, fromIndex);
+                    mFlexboxHelper.calculateFlexLines(mFlexLinesResult, heightMeasureSpec,
+                            widthMeasureSpec, needsToFill, fromIndex, mAnchorInfo.mPosition,
+                            mFlexLines);
+                } else {
+                    mFlexboxHelper.ensureIndexToFlexLine(childCount);
+                    mFlexboxHelper
+                            .calculateVerticalFlexLines(mFlexLinesResult, widthMeasureSpec,
+                                    heightMeasureSpec, needsToFill, 0, mFlexLines);
+                }
+            }
+            mFlexLines = mFlexLinesResult.mFlexLines;
+            mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec,
+                    fromIndex);
+            // Unlike the FlexboxLayout not calling FlexboxHelper#determineCrossSize because
+            // the align content attribute (which is used to determine the cross size) is only
+            // effective
+            // when the size of flex line is equal or more than 2 and the parent height
+            // (length along the cross size) is fixed. But in RecyclerView, these two conditions
+            // can't
+            // be true at the same time. Because it's scrollable along the cross axis
+            // or even if not (when flex wrap is "nowrap") the size of the flex lines should be 1.
+            mFlexboxHelper.stretchViews(fromIndex);
+        }
+    }
+
+    @Override
+    public void onLayoutCompleted(RecyclerView.State state) {
+        super.onLayoutCompleted(state);
+        if (DEBUG) {
+            Log.d(TAG, "onLayoutCompleted. " + state);
+        }
+        mPendingSavedState = null;
+        mPendingScrollPosition = NO_POSITION;
+        mPendingScrollPositionOffset = INVALID_OFFSET;
+        mDirtyPosition = NO_POSITION;
+        mAnchorInfo.reset();
+        mViewCache.clear();
+    }
+
+    boolean isLayoutRtl() {
+        return mIsRtl;
+    }
+
+    private void resolveLayoutDirection() {
+        int layoutDirection = getLayoutDirection();
+        switch (mFlexDirection) {
+            case FlexDirection.ROW:
+                mIsRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                mFromBottomToTop = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                break;
+            case FlexDirection.ROW_REVERSE:
+                mIsRtl = layoutDirection != ViewCompat.LAYOUT_DIRECTION_RTL;
+                mFromBottomToTop = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                break;
+            case FlexDirection.COLUMN:
+                mIsRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    mIsRtl = !mIsRtl;
+                }
+                mFromBottomToTop = false;
+                break;
+            case FlexDirection.COLUMN_REVERSE:
+                mIsRtl = layoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL;
+                if (mFlexWrap == FlexWrap.WRAP_REVERSE) {
+                    mIsRtl = !mIsRtl;
+                }
+                mFromBottomToTop = true;
+                break;
+            default:
+                mIsRtl = false;
+                mFromBottomToTop = false;
+        }
+    }
+
+    private void updateAnchorInfoForLayout(RecyclerView.State state, AnchorInfo anchorInfo) {
+        if (updateAnchorFromPendingState(state, anchorInfo, mPendingSavedState)) {
+            if (DEBUG) {
+                Log.d(TAG, "updated anchor from the pending state");
+            }
+            return;
+        }
+        if (updateAnchorFromChildren(state, anchorInfo)) {
+            if (DEBUG) {
+                Log.d(TAG,
+                        String.format("updated anchor info from existing children. AnchorInfo: %s",
+                                anchorInfo));
+            }
+            return;
+        }
+        if (DEBUG) {
+            Log.d(TAG, "deciding anchor info for fresh state");
+        }
+        anchorInfo.assignCoordinateFromPadding();
+        anchorInfo.mPosition = 0;
+        anchorInfo.mFlexLinePosition = 0;
+    }
+
+    private boolean updateAnchorFromPendingState(RecyclerView.State state, AnchorInfo anchorInfo,
+            SavedState savedState) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        if (state.isPreLayout() || mPendingScrollPosition == NO_POSITION) {
+            return false;
+        }
+        if (mPendingScrollPosition < 0 || mPendingScrollPosition >= state.getItemCount()) {
+            mPendingScrollPosition = NO_POSITION;
+            mPendingScrollPositionOffset = INVALID_OFFSET;
+            if (DEBUG) {
+                Log.e(TAG, "ignoring invalid scroll position " + mPendingScrollPosition);
+            }
+            return false;
+        }
+
+        anchorInfo.mPosition = mPendingScrollPosition;
+        anchorInfo.mFlexLinePosition = mFlexboxHelper.mIndexToFlexLine[anchorInfo.mPosition];
+        if (mPendingSavedState != null && mPendingSavedState.hasValidAnchor(state.getItemCount())) {
+            anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding() +
+                    savedState.mAnchorOffset;
+            anchorInfo.mAssignedFromSavedState = true;
+            anchorInfo.mFlexLinePosition = NO_POSITION;
+            return true;
+        }
+
+        if (mPendingScrollPositionOffset == INVALID_OFFSET) {
+            View anchorView = findViewByPosition(mPendingScrollPosition);
+            if (anchorView != null) {
+                if (mOrientationHelper.getDecoratedMeasurement(anchorView) >
+                        mOrientationHelper.getTotalSpace()) {
+                    anchorInfo.assignCoordinateFromPadding();
+                    return true;
+                }
+                int startGap = mOrientationHelper.getDecoratedStart(anchorView)
+                        - mOrientationHelper.getStartAfterPadding();
+                if (startGap < 0) {
+                    anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding();
+                    anchorInfo.mLayoutFromEnd = false;
+                    return true;
+                }
+
+                int endGap = mOrientationHelper.getEndAfterPadding() -
+                        mOrientationHelper.getDecoratedEnd(anchorView);
+                if (endGap < 0) {
+                    anchorInfo.mCoordinate = mOrientationHelper.getEndAfterPadding();
+                    anchorInfo.mLayoutFromEnd = true;
+                    return true;
+                }
+                anchorInfo.mCoordinate = anchorInfo.mLayoutFromEnd ?
+                        (mOrientationHelper.getDecoratedEnd(anchorView) +
+                                mOrientationHelper.getTotalSpaceChange())
+                        : mOrientationHelper.getDecoratedStart(anchorView);
+            } else {
+                if (getChildCount() > 0) {
+                    View view = getChildAt(0);
+                    if (view != null) {
+                        int position = getPosition(view);
+                        anchorInfo.mLayoutFromEnd = mPendingScrollPosition < position;
+                    }
+                }
+                anchorInfo.assignCoordinateFromPadding();
+            }
+            return true;
+        }
+
+        // TODO: Support reverse layout when flex wrap == FlexWrap.WRAP_REVERSE
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            anchorInfo.mCoordinate = mPendingScrollPositionOffset
+                    - mOrientationHelper.getEndPadding();
+        } else {
+            anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding()
+                    + mPendingScrollPositionOffset;
+        }
+        return true;
+    }
+
+    /**
+     * Finds an anchor child from existing Views. Most of the time, this is the view closest to
+     * start or end that has a valid position (e.g. not removed).
+     * Large part refers to the same method from LinearLayout#updateAnchorFromChildren
+     */
+    private boolean updateAnchorFromChildren(RecyclerView.State state, AnchorInfo anchorInfo) {
+        if (getChildCount() == 0) {
+            return false;
+        }
+        // TODO: Consider the focused view
+
+        View referenceChild = anchorInfo.mLayoutFromEnd
+                ? findLastReferenceChild(state.getItemCount())
+                : findFirstReferenceChild(state.getItemCount());
+        if (referenceChild != null) {
+            anchorInfo.assignFromView(referenceChild);
+            // If all visible views are removed in 1 pass, reference child might be out of bounds.
+            // If that is the case, offset it back to 0 so that we use these pre-layout children.
+            if (!state.isPreLayout() && supportsPredictiveItemAnimations()) {
+                // validate this child is at least partially visible. if not, offset it to start
+                final boolean notVisible =
+                        mOrientationHelper.getDecoratedStart(referenceChild) >= mOrientationHelper
+                                .getEndAfterPadding()
+                                || mOrientationHelper.getDecoratedEnd(referenceChild)
+                                < mOrientationHelper.getStartAfterPadding();
+                if (notVisible) {
+                    anchorInfo.mCoordinate = anchorInfo.mLayoutFromEnd
+                            ? mOrientationHelper.getEndAfterPadding()
+                            : mOrientationHelper.getStartAfterPadding();
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Find the reference view to be used as an anchor. It tries to find the view who has the
+     * maximum/minimum start/end (differs depending on if the container if RTL and the main axis
+     * direction) coordinate in the first visible flex line.
+     *
+     * @param itemCount the number of the items in this layout including invisible items
+     * @return the reference view
+     */
+    private View findFirstReferenceChild(int itemCount) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        View firstFound = findReferenceChild(0, getChildCount(), itemCount);
+        if (firstFound == null) {
+            return null;
+        }
+        int firstFoundPosition = getPosition(firstFound);
+        int firstFoundLinePosition = mFlexboxHelper.mIndexToFlexLine[firstFoundPosition];
+        if (firstFoundLinePosition == NO_POSITION) {
+            return null;
+        }
+        FlexLine firstFoundLine = mFlexLines.get(firstFoundLinePosition);
+        return findFirstReferenceViewInLine(firstFound, firstFoundLine);
+    }
+
+    /**
+     * Find the reference view to be used as an anchor. It tries to find the view who has the
+     * maximum/minimum start/end (differs depending on if the container if RTL and the main axis
+     * direction) coordinate in the last visible flex line.
+     *
+     * @param itemCount the number of the items in this layout including invisible items
+     * @return the reference view
+     */
+    private View findLastReferenceChild(int itemCount) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        View lastFound = findReferenceChild(getChildCount() - 1, -1, itemCount);
+        if (lastFound == null) {
+            return null;
+        }
+        int lastFoundPosition = getPosition(lastFound);
+        int lastFoundLinePosition = mFlexboxHelper.mIndexToFlexLine[lastFoundPosition];
+        FlexLine lastFoundLine = mFlexLines.get(lastFoundLinePosition);
+        return findLastReferenceViewInLine(lastFound, lastFoundLine);
+    }
+
+    /**
+     * Find a visible (or less preferred invisible) view within the given start and end index.
+     * Large part refers to the same method in LinearLayoutManager#findReferenceChild
+     *
+     * @param start     the start index within the range to find a view
+     * @param end       the end index within the range to find a view
+     * @param itemCount the item count
+     * @return the found view within the range of the given start and
+     */
+    private View findReferenceChild(int start, int end, int itemCount) {
+        ensureOrientationHelper();
+        ensureLayoutState();
+        View invalidMatch = null;
+        View outOfBoundsMatch = null;
+        int boundStart = mOrientationHelper.getStartAfterPadding();
+        int boundEnd = mOrientationHelper.getEndAfterPadding();
+        int diff = end > start ? 1 : -1;
+        for (int i = start; i != end; i += diff) {
+            View view = getChildAt(i);
+            if (view == null) {
+                continue;
+            }
+            int position = getPosition(view);
+            if (position >= 0 && position < itemCount) {
+                if (((RecyclerView.LayoutParams) view.getLayoutParams()).isItemRemoved()) {
+                    if (invalidMatch == null) {
+                        invalidMatch = view;
+                    }
+                } else if (mOrientationHelper.getDecoratedStart(view) < boundStart ||
+                        mOrientationHelper.getDecoratedEnd(view) > boundEnd) {
+                    if (outOfBoundsMatch == null) {
+                        outOfBoundsMatch = view;
+                    }
+                } else {
+                    return view;
+                }
+            }
+        }
+        return outOfBoundsMatch != null ? outOfBoundsMatch : invalidMatch;
+    }
+
+    private View getChildClosestToStart() {
+        // TODO: Find from end when mFlexWrap == FlexWrap.WRAP_REVERSE
+        return getChildAt(0);
+    }
+
+    /**
+     * Fills the remaining space defined by the layoutState on
+     * how many pixels should be filled (defined by {@link LayoutState#mAvailable}.
+     * The large part refers to the LinearLayoutManager#fill method except for the fill direction.
+     * Because FlexboxLayoutManager needs to care two scrolling directions:
+     * <li>
+     * <ul>Along the cross axis - When flex wrap is set to either FlexWrap.WRAP or
+     * FlexWrap.WRAP_REVERSE, the layout needs to scroll along the cross axis.</ul>
+     * <ul>Along the main axis - When flex wrap is set t FlexWrap.NOWRAP, the layout needs
+     * to scroll along the main axis if there are overflowing flex items.</ul>
+     * </li>
+     *
+     * @return the amount of pixels filled
+     */
+    private int fill(RecyclerView.Recycler recycler, RecyclerView.State state,
+            LayoutState layoutState) {
+        if (layoutState.mScrollingOffset != LayoutState.SCROLLING_OFFSET_NaN) {
+            if (layoutState.mAvailable < 0) {
+                layoutState.mScrollingOffset += layoutState.mAvailable;
+            }
+            recycleByLayoutState(recycler, layoutState);
+        }
+        int start = layoutState.mAvailable;
+        int remainingSpace = layoutState.mAvailable;
+        int consumed = 0;
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+        while ((remainingSpace > 0 || mLayoutState.mInfinite) &&
+                layoutState.hasMore(state, mFlexLines)) {
+            FlexLine flexLine = mFlexLines.get(layoutState.mFlexLinePosition);
+            layoutState.mPosition = flexLine.mFirstIndex;
+            consumed += layoutFlexLine(flexLine, layoutState);
+
+            if (!mainAxisHorizontal && mIsRtl) {
+                layoutState.mOffset -= flexLine.getCrossSize() * layoutState.mLayoutDirection;
+            } else {
+                layoutState.mOffset += flexLine.getCrossSize() * layoutState.mLayoutDirection;
+            }
+
+            remainingSpace -= flexLine.getCrossSize();
+        }
+        layoutState.mAvailable -= consumed;
+        if (layoutState.mScrollingOffset != LayoutState.SCROLLING_OFFSET_NaN) {
+            layoutState.mScrollingOffset += consumed;
+            if (layoutState.mAvailable < 0) {
+                layoutState.mScrollingOffset += layoutState.mAvailable;
+            }
+            recycleByLayoutState(recycler, layoutState);
+        }
+        return start - layoutState.mAvailable;
+    }
+
+    private void recycleByLayoutState(RecyclerView.Recycler recycler, LayoutState layoutState) {
+        if (!layoutState.mShouldRecycle) {
+            return;
+        }
+        if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+            // TODO: Consider the case mFlexWrap is set to nowrap and view is recycled individually
+            recycleFlexLinesFromEnd(recycler, layoutState);
+        } else {
+            recycleFlexLinesFromStart(recycler, layoutState);
+        }
+    }
+
+    private void recycleFlexLinesFromStart(RecyclerView.Recycler recycler,
+            LayoutState layoutState) {
+        if (layoutState.mScrollingOffset < 0) {
+            return;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int childCount = getChildCount();
+        if (childCount == 0) {
+            return;
+        }
+        View firstView = getChildAt(0);
+        if (firstView == null) {
+            return;
+        }
+        int currentLineIndex = mFlexboxHelper.mIndexToFlexLine[getPosition(firstView)];
+        if (currentLineIndex == NO_POSITION) {
+            return;
+        }
+        FlexLine flexLine = mFlexLines.get(currentLineIndex);
+        int recycleTo = -1;
+        for (int i = 0; i < childCount; i++) {
+            View view = getChildAt(i);
+            if (view == null) {
+                continue;
+            }
+            if (canViewBeRecycledFromStart(view, layoutState.mScrollingOffset)) {
+                if (flexLine.mLastIndex == getPosition(view)) {
+                    // Recycle the views in a flex line if all views end positions are lower than
+                    // the scrolling offset because the views are laid out as a flex line unit.
+                    // We need to also recycle the views as an unit of a flex line
+                    recycleTo = i;
+                    if (currentLineIndex >= mFlexLines.size() - 1) {
+                        // Reached to the last line
+                        break;
+                    } else {
+                        currentLineIndex += layoutState.mLayoutDirection;
+                        flexLine = mFlexLines.get(currentLineIndex);
+                    }
+                }
+            } else {
+                break;
+            }
+        }
+        recycleChildren(recycler, 0, recycleTo);
+    }
+
+    private boolean canViewBeRecycledFromStart(View view, int scrollingOffset) {
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            return mOrientationHelper.getEnd() -
+                    mOrientationHelper.getDecoratedStart(view) <= scrollingOffset;
+        } else {
+            return mOrientationHelper.getDecoratedEnd(view) <= scrollingOffset;
+        }
+    }
+
+    private void recycleFlexLinesFromEnd(RecyclerView.Recycler recycler, LayoutState layoutState) {
+        if (layoutState.mScrollingOffset < 0) {
+            return;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int childCount = getChildCount();
+        if (childCount == 0) {
+            return;
+        }
+
+        View lastView = getChildAt(childCount - 1);
+        if (lastView == null) {
+            return;
+        }
+        int currentLineIndex = mFlexboxHelper.mIndexToFlexLine[getPosition(lastView)];
+        if (currentLineIndex == NO_POSITION) {
+            return;
+        }
+        int recycleTo = childCount - 1;
+        int recycleFrom = childCount;
+        FlexLine flexLine = mFlexLines.get(currentLineIndex);
+        for (int i = childCount - 1; i >= 0; i--) {
+            View view = getChildAt(i);
+            if (view == null) {
+                continue;
+            }
+            if (canViewBeRecycledFromEnd(view, layoutState.mScrollingOffset)) {
+                if (flexLine.mFirstIndex == getPosition(view)) {
+                    // Recycle the views in a flex line if all views start positions are beyond the
+                    // limit because the views are laid out as a flex line unit. We need to also
+                    // recycle the views as an unit of a flex line
+                    recycleFrom = i;
+                    if (currentLineIndex <= 0) {
+                        // Reached to the first flex line
+                        break;
+                    } else {
+                        currentLineIndex += layoutState.mLayoutDirection;
+                        flexLine = mFlexLines.get(currentLineIndex);
+                    }
+                }
+            } else {
+                break;
+            }
+        }
+        recycleChildren(recycler, recycleFrom, recycleTo);
+    }
+
+    private boolean canViewBeRecycledFromEnd(View view, int scrollingOffset) {
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            return mOrientationHelper.getDecoratedEnd(view) <= scrollingOffset;
+        } else {
+            return mOrientationHelper.getDecoratedStart(view) >=
+                    mOrientationHelper.getEnd() - scrollingOffset;
+        }
+    }
+
+    /**
+     * Recycles children between given indices.
+     *
+     * @param startIndex inclusive
+     * @param endIndex   inclusive
+     */
+    private void recycleChildren(RecyclerView.Recycler recycler, int startIndex, int endIndex) {
+        for (int i = endIndex; i >= startIndex; i--) {
+            removeAndRecycleViewAt(i, recycler);
+        }
+    }
+
+    private int layoutFlexLine(FlexLine flexLine, LayoutState layoutState) {
+        if (isMainAxisDirectionHorizontal()) {
+            return layoutFlexLineMainAxisHorizontal(flexLine, layoutState);
+        } else {
+            return layoutFlexLineMainAxisVertical(flexLine, layoutState);
+        }
+    }
+
+    private int layoutFlexLineMainAxisHorizontal(FlexLine flexLine, LayoutState layoutState) {
+        assert mFlexboxHelper.mMeasureSpecCache != null;
+
+        int paddingLeft = getPaddingLeft();
+        int paddingRight = getPaddingRight();
+        int parentWidth = getWidth();
+
+        int childTop = layoutState.mOffset;
+        if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+            childTop = childTop - flexLine.mCrossSize;
+        }
+        int startPosition = layoutState.mPosition;
+
+        float childLeft;
+
+        // Only used when mIsRtl is true
+        float childRight;
+        float spaceBetweenItem = 0f;
+        switch (mJustifyContent) {
+            case JustifyContent.FLEX_START:
+                childLeft = paddingLeft;
+                childRight = parentWidth - paddingRight;
+                break;
+            case JustifyContent.FLEX_END:
+                childLeft = parentWidth - flexLine.mMainSize + paddingRight;
+                childRight = flexLine.mMainSize - paddingLeft;
+                break;
+            case JustifyContent.CENTER:
+                childLeft = paddingLeft + (parentWidth - flexLine.mMainSize) / 2f;
+                childRight = parentWidth - paddingRight - (parentWidth - flexLine.mMainSize) / 2f;
+                break;
+            case JustifyContent.SPACE_AROUND:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentWidth - flexLine.mMainSize)
+                            / (float) flexLine.mItemCount;
+                }
+                childLeft = paddingLeft + spaceBetweenItem / 2f;
+                childRight = parentWidth - paddingRight - spaceBetweenItem / 2f;
+                break;
+            case JustifyContent.SPACE_BETWEEN:
+                childLeft = paddingLeft;
+                float denominator = flexLine.mItemCount != 1 ? flexLine.mItemCount - 1 : 1f;
+                spaceBetweenItem = (parentWidth - flexLine.mMainSize) / denominator;
+                childRight = parentWidth - paddingRight;
+                break;
+            case JustifyContent.SPACE_EVENLY:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentWidth - flexLine.mMainSize)
+                            / (float) (flexLine.mItemCount + 1);
+                }
+                childLeft = paddingLeft + spaceBetweenItem;
+                childRight = parentWidth - paddingRight - spaceBetweenItem;
+                break;
+            default:
+                throw new IllegalStateException(
+                        "Invalid justifyContent is set: " + mJustifyContent);
+        }
+        childLeft -= mAnchorInfo.mPerpendicularCoordinate;
+        childRight -= mAnchorInfo.mPerpendicularCoordinate;
+        spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+        // Used only when mLayoutDirection == LayoutState.LAYOUT_START to remember the index
+        // a flex item should be inserted
+        int indexInFlexLine = 0;
+        for (int i = startPosition, itemCount = flexLine.getItemCount();
+                i < startPosition + itemCount; i++) {
+            View view = getFlexItemAt(i);
+            if (view == null) {
+                continue;
+            }
+
+            if (layoutState.mLayoutDirection == LayoutState.LAYOUT_END) {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view);
+            } else {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view, indexInFlexLine);
+                indexInFlexLine++;
+            }
+
+            // Retrieve the measure spec from the cache because the view may be re-created when
+            // retrieved from Recycler, in that case measured width/height are set to 0 even
+            // each visible child should be measured at least once in the FlexboxHelper
+            long measureSpec = mFlexboxHelper.mMeasureSpecCache[i];
+            int widthSpec = mFlexboxHelper.extractLowerInt(measureSpec);
+            int heightSpec = mFlexboxHelper.extractHigherInt(measureSpec);
+            LayoutParams lp = (LayoutParams) view.getLayoutParams();
+            if (shouldMeasureChild(view, widthSpec, heightSpec, lp)) {
+                view.measure(widthSpec, heightSpec);
+            }
+
+            childLeft += (lp.leftMargin + getLeftDecorationWidth(view));
+            childRight -= (lp.rightMargin + getRightDecorationWidth(view));
+
+            int topWithDecoration = childTop + getTopDecorationHeight(view);
+            if (mIsRtl) {
+                mFlexboxHelper.layoutSingleChildHorizontal(view, flexLine,
+                        Math.round(childRight) - view.getMeasuredWidth(),
+                        topWithDecoration, Math.round(childRight),
+                        topWithDecoration + view.getMeasuredHeight());
+            } else {
+                mFlexboxHelper.layoutSingleChildHorizontal(view, flexLine,
+                        Math.round(childLeft), topWithDecoration,
+                        Math.round(childLeft) + view.getMeasuredWidth(),
+                        topWithDecoration + view.getMeasuredHeight());
+            }
+            childLeft += (view.getMeasuredWidth() + lp.rightMargin + getRightDecorationWidth(view)
+                    + spaceBetweenItem);
+            childRight -= (view.getMeasuredWidth() + lp.leftMargin + getLeftDecorationWidth(view)
+                    + spaceBetweenItem);
+        }
+        layoutState.mFlexLinePosition += mLayoutState.mLayoutDirection;
+        return flexLine.getCrossSize();
+    }
+
+    private int layoutFlexLineMainAxisVertical(FlexLine flexLine, LayoutState layoutState) {
+        assert mFlexboxHelper.mMeasureSpecCache != null;
+
+        int paddingTop = getPaddingTop();
+        int paddingBottom = getPaddingBottom();
+        int parentHeight = getHeight();
+
+        int childLeft = layoutState.mOffset;
+        // childRight is used only for the layout is RTL
+        int childRight = layoutState.mOffset;
+        if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+            childLeft = childLeft - flexLine.mCrossSize;
+            childRight = childRight + flexLine.mCrossSize;
+        }
+        int startPosition = layoutState.mPosition;
+
+        float childTop;
+
+        // Only used when mFromBottomToTop is true
+        float childBottom;
+        float spaceBetweenItem = 0f;
+        switch (mJustifyContent) {
+            case JustifyContent.FLEX_START:
+                childTop = paddingTop;
+                childBottom = parentHeight - paddingBottom;
+                break;
+            case JustifyContent.FLEX_END:
+                childTop = parentHeight - flexLine.mMainSize + paddingBottom;
+                childBottom = flexLine.mMainSize - paddingTop;
+                break;
+            case JustifyContent.CENTER:
+                childTop = paddingTop + (parentHeight - flexLine.mMainSize) / 2f;
+                childBottom = parentHeight - paddingBottom
+                        - (parentHeight - flexLine.mMainSize) / 2f;
+                break;
+            case JustifyContent.SPACE_AROUND:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentHeight - flexLine.mMainSize)
+                            / (float) flexLine.mItemCount;
+                }
+                childTop = paddingTop + spaceBetweenItem / 2f;
+                childBottom = parentHeight - paddingBottom - spaceBetweenItem / 2f;
+                break;
+            case JustifyContent.SPACE_BETWEEN:
+                childTop = paddingTop;
+                float denominator = flexLine.mItemCount != 1 ? flexLine.mItemCount - 1 : 1f;
+                spaceBetweenItem = (parentHeight - flexLine.mMainSize) / denominator;
+                childBottom = parentHeight - paddingBottom;
+                break;
+            case JustifyContent.SPACE_EVENLY:
+                if (flexLine.mItemCount != 0) {
+                    spaceBetweenItem = (parentHeight - flexLine.mMainSize)
+                            / (float) (flexLine.mItemCount + 1);
+                }
+                childTop = paddingTop + spaceBetweenItem;
+                childBottom = parentHeight - paddingBottom - spaceBetweenItem;
+                break;
+            default:
+                throw new IllegalStateException(
+                        "Invalid justifyContent is set: " + mJustifyContent);
+        }
+        childTop -= mAnchorInfo.mPerpendicularCoordinate;
+        childBottom -= mAnchorInfo.mPerpendicularCoordinate;
+        spaceBetweenItem = Math.max(spaceBetweenItem, 0);
+
+        // Used only when mLayoutDirection == LayoutState.LAYOUT_START to remember the index
+        // a flex item should be inserted
+        int indexInFlexLine = 0;
+        for (int i = startPosition, itemCount = flexLine.getItemCount();
+                i < startPosition + itemCount; i++) {
+            View view = getFlexItemAt(i);
+            if (view == null) {
+                continue;
+            }
+
+            // Retrieve the measure spec from the cache because the view may be re-created when
+            // retrieved from Recycler, in that case measured width/height are set to 0 even
+            // each visible child should be measured at least once in the FlexboxHelper
+            long measureSpec = mFlexboxHelper.mMeasureSpecCache[i];
+            int widthSpec = mFlexboxHelper.extractLowerInt(measureSpec);
+            int heightSpec = mFlexboxHelper.extractHigherInt(measureSpec);
+            LayoutParams lp = (LayoutParams) view.getLayoutParams();
+            if (shouldMeasureChild(view, widthSpec, heightSpec, lp)) {
+                view.measure(widthSpec, heightSpec);
+            }
+
+            childTop += (lp.topMargin + getTopDecorationHeight(view));
+            childBottom -= (lp.rightMargin + getBottomDecorationHeight(view));
+
+            if (layoutState.mLayoutDirection == LayoutState.LAYOUT_END) {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view);
+            } else {
+                calculateItemDecorationsForChild(view, TEMP_RECT);
+                addView(view, indexInFlexLine);
+                indexInFlexLine++;
+            }
+
+            int leftWithDecoration = childLeft + getLeftDecorationWidth(view);
+            int rightWithDecoration = childRight - getRightDecorationWidth(view);
+            if (mIsRtl) {
+                if (mFromBottomToTop) {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            rightWithDecoration - view.getMeasuredWidth(),
+                            Math.round(childBottom) - view.getMeasuredHeight(),
+                            rightWithDecoration, Math.round(childBottom));
+                } else {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            rightWithDecoration - view.getMeasuredWidth(),
+                            Math.round(childTop), rightWithDecoration,
+                            Math.round(childTop) + view.getMeasuredHeight());
+                }
+            } else {
+                if (mFromBottomToTop) {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            leftWithDecoration, Math.round(childBottom) - view.getMeasuredHeight(),
+                            leftWithDecoration + view.getMeasuredWidth(), Math.round(childBottom));
+                } else {
+                    mFlexboxHelper.layoutSingleChildVertical(view, flexLine, mIsRtl,
+                            leftWithDecoration, Math.round(childTop),
+                            leftWithDecoration + view.getMeasuredWidth(),
+                            Math.round(childTop) + view.getMeasuredHeight());
+                }
+            }
+            childTop += (view.getMeasuredHeight() + lp.topMargin + getBottomDecorationHeight(view)
+                    + spaceBetweenItem);
+            childBottom -= (view.getMeasuredHeight() + lp.bottomMargin +
+                    getTopDecorationHeight(view) + spaceBetweenItem);
+        }
+        layoutState.mFlexLinePosition += mLayoutState.mLayoutDirection;
+        return flexLine.getCrossSize();
+    }
+
+    @Override
+    public boolean isMainAxisDirectionHorizontal() {
+        return mFlexDirection == FlexDirection.ROW || mFlexDirection == FlexDirection.ROW_REVERSE;
+    }
+
+
+    /**
+     * Update the layout state based on the anchor information.
+     * The view holders are going to be filled toward the end position (bottom if the main axis
+     * direction is horizontal, right if the main axis direction if vertical).
+     *
+     * @param anchorInfo       the anchor information where layout should start
+     * @param fromNextLine     if set to {@code true}, layout starts from the next flex line set to
+     *                         the anchor information
+     * @param considerInfinite if set to {@code true}, the judgement if the infinite available
+     *                         space
+     *                         needs to be considered.
+     */
+    private void updateLayoutStateToFillEnd(AnchorInfo anchorInfo, boolean fromNextLine,
+            boolean considerInfinite) {
+        if (considerInfinite) {
+            resolveInfiniteAmount();
+        } else {
+            mLayoutState.mInfinite = false;
+        }
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            mLayoutState.mAvailable = anchorInfo.mCoordinate - getPaddingRight();
+        } else {
+            mLayoutState.mAvailable =
+                    mOrientationHelper.getEndAfterPadding() - anchorInfo.mCoordinate;
+        }
+        mLayoutState.mPosition = anchorInfo.mPosition;
+        mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+        mLayoutState.mLayoutDirection = LayoutState.LAYOUT_END;
+        mLayoutState.mOffset = anchorInfo.mCoordinate;
+        mLayoutState.mScrollingOffset = LayoutState.SCROLLING_OFFSET_NaN;
+        mLayoutState.mFlexLinePosition = anchorInfo.mFlexLinePosition;
+
+        if (fromNextLine
+                && mFlexLines.size() > 1
+                && anchorInfo.mFlexLinePosition >= 0
+                && anchorInfo.mFlexLinePosition < mFlexLines.size() - 1) {
+            FlexLine currentLine = mFlexLines.get(anchorInfo.mFlexLinePosition);
+            mLayoutState.mFlexLinePosition++;
+            mLayoutState.mPosition += currentLine.getItemCount();
+        }
+    }
+
+    /**
+     * Update the layout state based on the anchor information.
+     * The view holders are going to be filled toward the start position (top if the main axis
+     * direction is horizontal, left if the main axis direction if vertical).
+     *
+     * @param anchorInfo       the anchor information where layout should start
+     * @param fromPreviousLine if set to {@code true}, layout starts from the next flex line set to
+     *                         the anchor information
+     * @param considerInfinite if set to {@code true}, the judgement if the infinite available
+     *                         space
+     *                         needs to be considered.
+     */
+    private void updateLayoutStateToFillStart(AnchorInfo anchorInfo, boolean fromPreviousLine,
+            boolean considerInfinite) {
+        if (considerInfinite) {
+            resolveInfiniteAmount();
+        } else {
+            mLayoutState.mInfinite = false;
+        }
+        if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+            mLayoutState.mAvailable = mParent.getWidth() - anchorInfo.mCoordinate
+                    - mOrientationHelper.getStartAfterPadding();
+        } else {
+            mLayoutState.mAvailable = anchorInfo.mCoordinate - mOrientationHelper
+                    .getStartAfterPadding();
+        }
+        mLayoutState.mPosition = anchorInfo.mPosition;
+        mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+        mLayoutState.mLayoutDirection = LayoutState.LAYOUT_START;
+        mLayoutState.mOffset = anchorInfo.mCoordinate;
+        mLayoutState.mScrollingOffset = LayoutState.SCROLLING_OFFSET_NaN;
+        mLayoutState.mFlexLinePosition = anchorInfo.mFlexLinePosition;
+
+        if (fromPreviousLine && anchorInfo.mFlexLinePosition > 0
+                && mFlexLines.size() > anchorInfo.mFlexLinePosition) {
+            FlexLine currentLine = mFlexLines.get(anchorInfo.mFlexLinePosition);
+            mLayoutState.mFlexLinePosition--;
+            mLayoutState.mPosition -= currentLine.getItemCount();
+        }
+    }
+
+    private void resolveInfiniteAmount() {
+        int crossMode;
+        if (isMainAxisDirectionHorizontal()) {
+            crossMode = getHeightMode();
+        } else {
+            crossMode = getWidthMode();
+        }
+        // Setting the infinite flag so that the LayoutManager tries to fill the available space
+        // as much as possible. E.g. this is needed in the case RecyclerView is wrapped with another
+        // scrollable container (another RecyclerView or ScrollView) on the condition
+        // layout_height="wrap_content" and flexDirection="row". In such a case, the height of the
+        // inner RecyclerView (attached RecyclerView for this LayoutManager) is set to 0 at this
+        // moment, so the value of the mAvailable doesn't have enough value enough to put the
+        // already calculated flex lines.
+        mLayoutState.mInfinite =
+                crossMode == View.MeasureSpec.UNSPECIFIED || crossMode == View.MeasureSpec.AT_MOST;
+    }
+
+    private void ensureOrientationHelper() {
+        if (mOrientationHelper != null) {
+            return;
+        }
+        // There are two cases for each of main axis direction. In either case the scroll happens
+        // along the cross axis:
+        // -- Scroll vertically when mFlexWrap != FlexWrap.NOWRAP. In this case scroll happens
+        //    along the cross axis
+        //
+        // When scroll direction is vertical:
+        // -- Scroll horizontally when mFlexWrap != FlexWrap.NOWRAP. In this case scroll happens
+        //    along the cross axis
+        if (isMainAxisDirectionHorizontal()) {
+            if (mFlexWrap == FlexWrap.NOWRAP) {
+                mOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createVerticalHelper(this);
+            } else {
+                mOrientationHelper = OrientationHelper.createVerticalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+            }
+        } else {
+            if (mFlexWrap == FlexWrap.NOWRAP) {
+                mOrientationHelper = OrientationHelper.createVerticalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+            } else {
+                mOrientationHelper = OrientationHelper.createHorizontalHelper(this);
+                mSubOrientationHelper = OrientationHelper.createVerticalHelper(this);
+            }
+        }
+    }
+
+    private void ensureLayoutState() {
+        if (mLayoutState == null) {
+            mLayoutState = new LayoutState();
+        }
+    }
+
+    @Override
+    public void scrollToPosition(int position) {
+        mPendingScrollPosition = position;
+        mPendingScrollPositionOffset = INVALID_OFFSET;
+        if (mPendingSavedState != null) {
+            mPendingSavedState.invalidateAnchor();
+        }
+        requestLayout();
+    }
+
+    @Override
+    public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state,
+            int position) {
+        LinearSmoothScroller smoothScroller =
+                new LinearSmoothScroller(recyclerView.getContext());
+        smoothScroller.setTargetPosition(position);
+        startSmoothScroll(smoothScroller);
+    }
+
+    /**
+     * @return true if LayoutManager will recycle its children when it is detached from
+     * RecyclerView.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public boolean getRecycleChildrenOnDetach() {
+        return mRecycleChildrenOnDetach;
+    }
+
+    /**
+     * Set whether this LayoutManager will recycle its children when it is detached from
+     * RecyclerView.
+     * <p>
+     * If you are using a {@link RecyclerView.RecycledViewPool}, it might be a good idea to set
+     * this flag to <code>true</code> so that views will be available to other RecyclerViews
+     * immediately.
+     * <p>
+     * Note that, setting this flag will result in a performance drop if RecyclerView
+     * is restored.
+     *
+     * @param recycleChildrenOnDetach Whether children should be recycled in detach or not.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public void setRecycleChildrenOnDetach(boolean recycleChildrenOnDetach) {
+        mRecycleChildrenOnDetach = recycleChildrenOnDetach;
+    }
+
+    @Override
+    public void onAttachedToWindow(RecyclerView recyclerView) {
+        super.onAttachedToWindow(recyclerView);
+        mParent = (View) recyclerView.getParent();
+    }
+
+    @Override
+    public void onDetachedFromWindow(RecyclerView view, RecyclerView.Recycler recycler) {
+        super.onDetachedFromWindow(view, recycler);
+        if (mRecycleChildrenOnDetach) {
+            if (DEBUG) {
+                Log.d(TAG, "onDetachedFromWindow. Recycling children in the recycler");
+            }
+            removeAndRecycleAllViews(recycler);
+            recycler.clear();
+        }
+    }
+
+    @Override
+    public boolean canScrollHorizontally() {
+        if (mFlexWrap == FlexWrap.NOWRAP) {
+            return isMainAxisDirectionHorizontal();
+        } else {
+            return !isMainAxisDirectionHorizontal() || getWidth() > (mParent != null ? mParent.getWidth() : 0);
+        }
+    }
+
+    @Override
+    public boolean canScrollVertically() {
+        if (mFlexWrap == FlexWrap.NOWRAP) {
+            return !isMainAxisDirectionHorizontal();
+        } else {
+            return isMainAxisDirectionHorizontal() || getHeight() > (mParent != null ? mParent.getHeight() : 0);
+        }
+    }
+
+    @Override
+    public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler,
+            RecyclerView.State state) {
+        if (!isMainAxisDirectionHorizontal() || (mFlexWrap == FlexWrap.NOWRAP)) {
+            int scrolled = handleScrollingMainOrientation(dx, recycler, state);
+            mViewCache.clear();
+            return scrolled;
+        } else {
+            int scrolled = handleScrollingSubOrientation(dx);
+            mAnchorInfo.mPerpendicularCoordinate += scrolled;
+            mSubOrientationHelper.offsetChildren(-scrolled);
+            return scrolled;
+        }
+    }
+
+    @Override
+    public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler,
+            RecyclerView.State state) {
+        if (isMainAxisDirectionHorizontal() ||
+                (mFlexWrap == FlexWrap.NOWRAP && !isMainAxisDirectionHorizontal())) {
+            int scrolled = handleScrollingMainOrientation(dy, recycler, state);
+            mViewCache.clear();
+            return scrolled;
+        } else {
+            int scrolled = handleScrollingSubOrientation(dy);
+            mAnchorInfo.mPerpendicularCoordinate += scrolled;
+            mSubOrientationHelper.offsetChildren(-scrolled);
+            return scrolled;
+        }
+    }
+
+    /**
+     * Handle the scrolling along the direction of {@link #mOrientationHelper}.
+     *
+     * @param delta    the delta for the amount that is being scrolled
+     *                 (either horizontally or vertically)
+     * @param recycler the Recycler instance
+     * @param state    the Recycler.State instance
+     * @return the amount actually scrolled
+     */
+    private int handleScrollingMainOrientation(int delta, RecyclerView.Recycler recycler,
+            RecyclerView.State state) {
+        if (getChildCount() == 0 || delta == 0) {
+            return 0;
+        }
+        ensureOrientationHelper();
+        mLayoutState.mShouldRecycle = true;
+        int layoutDirection;
+        boolean columnAndRtl = !isMainAxisDirectionHorizontal() && mIsRtl;
+        if (columnAndRtl) {
+            layoutDirection = delta < 0 ? LayoutState.LAYOUT_END : LayoutState.LAYOUT_START;
+        } else {
+            layoutDirection = delta > 0 ? LayoutState.LAYOUT_END : LayoutState.LAYOUT_START;
+        }
+        int absDelta = Math.abs(delta);
+
+        updateLayoutState(layoutDirection, absDelta);
+
+        int freeScroll = mLayoutState.mScrollingOffset;
+        int consumed = freeScroll + fill(recycler, state, mLayoutState);
+        if (consumed < 0) {
+            return 0;
+        }
+        int scrolled;
+        if (columnAndRtl) {
+            scrolled = absDelta > consumed ? -layoutDirection * consumed : delta;
+        } else {
+            scrolled = absDelta > consumed ? layoutDirection * consumed : delta;
+        }
+        mOrientationHelper.offsetChildren(-scrolled);
+        mLayoutState.mLastScrollDelta = scrolled;
+        return scrolled;
+    }
+
+    /**
+     * Handle the scrolling along the direction of {@link #mSubOrientationHelper}.
+     *
+     * @param delta    the delta for the amount that is being scrolled
+     *                 (either horizontally or vertically)
+     * @return  the amount actually scrolled
+     */
+    private int handleScrollingSubOrientation(int delta) {
+        if (getChildCount() == 0 || delta == 0) {
+            return 0;
+        }
+        ensureOrientationHelper();
+        boolean isMainAxisHorizontal = isMainAxisDirectionHorizontal();
+        int parentLength = isMainAxisHorizontal ? mParent.getWidth() : mParent.getHeight();
+        int mainAxisLength = isMainAxisHorizontal ? getWidth() : getHeight();
+
+        boolean layoutRtl = getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL;
+        if (layoutRtl) {
+            int absDelta = Math.abs(delta);
+            if (delta < 0) {
+                delta = Math.min(mainAxisLength
+                        + mAnchorInfo.mPerpendicularCoordinate - parentLength, absDelta);
+                delta = -delta;
+            } else {
+                delta = mAnchorInfo.mPerpendicularCoordinate + delta > 0
+                        ? -mAnchorInfo.mPerpendicularCoordinate
+                        : delta;
+            }
+        } else {
+            if (delta > 0) {
+                delta = Math.min(mainAxisLength
+                        - mAnchorInfo.mPerpendicularCoordinate - parentLength, delta);
+            } else {
+                delta = mAnchorInfo.mPerpendicularCoordinate + delta >= 0 ? delta :
+                        -mAnchorInfo.mPerpendicularCoordinate;
+            }
+        }
+        return delta;
+    }
+
+    /**
+     * Update the layout state as part of the scrolling. This method also update the flex lines
+     * enough to display the view port including the delta of the scroll.
+     *
+     * @param layoutDirection the layout direction value. Either of {@link LayoutState#LAYOUT_END}
+     *                        or {@link LayoutState#LAYOUT_START}
+     * @param absDelta        the absolute value of the delta that is about to be scrolled.
+     */
+    private void updateLayoutState(int layoutDirection, int absDelta) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        mLayoutState.mLayoutDirection = layoutDirection;
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+
+        //noinspection ResourceType
+        int widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(getWidth(), getWidthMode());
+        //noinspection ResourceType
+        int heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(getHeight(), getHeightMode());
+        boolean columnAndRtl = !mainAxisHorizontal && mIsRtl;
+        if (layoutDirection == LayoutState.LAYOUT_END) {
+            View lastVisible = getChildAt(getChildCount() - 1);
+            if (lastVisible == null) {
+                return;
+            }
+            mLayoutState.mOffset = mOrientationHelper.getDecoratedEnd(lastVisible);
+            int lastVisiblePosition = getPosition(lastVisible);
+            int lastVisibleLinePosition = mFlexboxHelper.mIndexToFlexLine[lastVisiblePosition];
+            FlexLine lastVisibleLine = mFlexLines.get(lastVisibleLinePosition);
+
+            // The reference view which has the maximum end (or minimum if the layout is RTL and
+            // the main axis direction is horizontal) coordinate in  the last visible flex line.
+            View referenceView = findLastReferenceViewInLine(lastVisible, lastVisibleLine);
+            mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+            mLayoutState.mPosition = lastVisiblePosition + mLayoutState.mItemDirection;
+            if (mFlexboxHelper.mIndexToFlexLine.length <= mLayoutState.mPosition) {
+                mLayoutState.mFlexLinePosition = NO_POSITION;
+            } else {
+                mLayoutState.mFlexLinePosition
+                        = mFlexboxHelper.mIndexToFlexLine[mLayoutState.mPosition];
+            }
+
+            if (columnAndRtl) {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedStart(referenceView);
+                mLayoutState.mScrollingOffset = -mOrientationHelper.getDecoratedStart(referenceView)
+                        + mOrientationHelper.getStartAfterPadding();
+                mLayoutState.mScrollingOffset = Math.max(mLayoutState.mScrollingOffset, 0);
+            } else {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedEnd(referenceView);
+                mLayoutState.mScrollingOffset = mOrientationHelper.getDecoratedEnd(referenceView)
+                        - mOrientationHelper.getEndAfterPadding();
+            }
+
+            if ((mLayoutState.mFlexLinePosition == NO_POSITION
+                    || mLayoutState.mFlexLinePosition > mFlexLines.size() - 1) &&
+                    mLayoutState.mPosition <= getFlexItemCount()) {
+                // If the RecyclerView tries to scroll beyond the already calculated
+                // flex container, need to calculate beyond the amount that needs to be filled
+
+                int needsToFill = absDelta - mLayoutState.mScrollingOffset;
+                mFlexLinesResult.reset();
+                if (needsToFill > 0) {
+                    if (mainAxisHorizontal) {
+                        mFlexboxHelper.calculateHorizontalFlexLines(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec, needsToFill,
+                                mLayoutState.mPosition, mFlexLines);
+                    } else {
+                        mFlexboxHelper.calculateVerticalFlexLines(mFlexLinesResult,
+                                widthMeasureSpec, heightMeasureSpec, needsToFill,
+                                mLayoutState.mPosition, mFlexLines);
+                    }
+                    mFlexboxHelper.determineMainSize(widthMeasureSpec, heightMeasureSpec,
+                            mLayoutState.mPosition);
+                    mFlexboxHelper.stretchViews(mLayoutState.mPosition);
+                }
+            }
+        } else {
+            View firstVisible = getChildAt(0);
+            if (firstVisible == null) {
+                return;
+            }
+            mLayoutState.mOffset = mOrientationHelper.getDecoratedStart(firstVisible);
+            int firstVisiblePosition = getPosition(firstVisible);
+            int firstVisibleLinePosition = mFlexboxHelper.mIndexToFlexLine[firstVisiblePosition];
+            FlexLine firstVisibleLine = mFlexLines.get(firstVisibleLinePosition);
+
+            // The reference view which has the minimum start (or maximum if the layout is RTL and
+            // the main axis direction is horizontal) coordinate in the first visible flex line
+            View referenceView = findFirstReferenceViewInLine(firstVisible, firstVisibleLine);
+
+            mLayoutState.mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+            int flexLinePosition = mFlexboxHelper.mIndexToFlexLine[firstVisiblePosition];
+            if (flexLinePosition == NO_POSITION) {
+                flexLinePosition = 0;
+            }
+            if (flexLinePosition > 0) {
+                FlexLine previousLine = mFlexLines.get(flexLinePosition - 1);
+                // The position of the next item toward start should be on the next flex line,
+                // shifting the position by the number of the items in the previous line.
+                mLayoutState.mPosition = firstVisiblePosition - previousLine.getItemCount();
+            } else {
+                mLayoutState.mPosition = NO_POSITION;
+            }
+            mLayoutState.mFlexLinePosition = flexLinePosition > 0 ? flexLinePosition - 1 : 0;
+
+            if (columnAndRtl) {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedEnd(referenceView);
+                mLayoutState.mScrollingOffset = mOrientationHelper.getDecoratedEnd(referenceView)
+                        - mOrientationHelper.getEndAfterPadding();
+                mLayoutState.mScrollingOffset = Math.max(mLayoutState.mScrollingOffset, 0);
+            } else {
+                mLayoutState.mOffset = mOrientationHelper.getDecoratedStart(referenceView);
+                mLayoutState.mScrollingOffset = -mOrientationHelper.getDecoratedStart(referenceView)
+                        + mOrientationHelper.getStartAfterPadding();
+            }
+        }
+        mLayoutState.mAvailable = absDelta - mLayoutState.mScrollingOffset;
+    }
+
+    /**
+     * Loop through the first visible flex line to find the reference view, which has the minimum
+     * start (or maximum if the layout is RTL and main axis direction is horizontal) coordinate.
+     *
+     * @param firstView        the first visible view
+     * @param firstVisibleLine the first visible flex line
+     * @return the reference view
+     */
+    private View findFirstReferenceViewInLine(View firstView, FlexLine firstVisibleLine) {
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+        View referenceView = firstView;
+        for (int i = 1, to = firstVisibleLine.mItemCount;
+                i < to; i++) {
+            View viewInSameLine = getChildAt(i);
+            if (viewInSameLine == null || viewInSameLine.getVisibility() == View.GONE) {
+                continue;
+            }
+            if (mIsRtl && !mainAxisHorizontal) {
+                if (mOrientationHelper.getDecoratedEnd(referenceView)
+                        < mOrientationHelper.getDecoratedEnd(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            } else {
+                if (mOrientationHelper.getDecoratedStart(referenceView)
+                        > mOrientationHelper.getDecoratedStart(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            }
+        }
+        return referenceView;
+    }
+
+    /**
+     * Loop through the last visible flex line to find the reference view, which has the maximum
+     * end (or minimum if the layout is RTL and main axis direction is horizontal) coordinate.
+     *
+     * @param lastView        the last visible view
+     * @param lastVisibleLine the last visible flex line
+     * @return the reference view
+     */
+    private View findLastReferenceViewInLine(View lastView, FlexLine lastVisibleLine) {
+        boolean mainAxisHorizontal = isMainAxisDirectionHorizontal();
+        View referenceView = lastView;
+        for (int i = getChildCount() - 2, to = getChildCount() - lastVisibleLine.mItemCount - 1;
+                i > to; i--) {
+            View viewInSameLine = getChildAt(i);
+            if (viewInSameLine == null || viewInSameLine.getVisibility() == View.GONE) {
+                continue;
+            }
+            if (mIsRtl && !mainAxisHorizontal) {
+                // The end edge of the view is left, should be the minimum left edge
+                // where the next view should be placed
+                if (mOrientationHelper.getDecoratedStart(referenceView) >
+                        mOrientationHelper.getDecoratedStart(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            } else {
+                if (mOrientationHelper.getDecoratedEnd(referenceView) <
+                        mOrientationHelper.getDecoratedEnd(viewInSameLine)) {
+                    referenceView = viewInSameLine;
+                }
+            }
+        }
+        return referenceView;
+    }
+
+    @Override
+    public int computeHorizontalScrollExtent(@NonNull RecyclerView.State state) {
+        int scrollExtent = computeScrollExtent(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeHorizontalScrollExtent: " + scrollExtent);
+        }
+        return scrollExtent;
+    }
+
+    @Override
+    public int computeVerticalScrollExtent(@NonNull RecyclerView.State state) {
+        int scrollExtent = computeScrollExtent(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeVerticalScrollExtent: " + scrollExtent);
+        }
+        return scrollExtent;
+    }
+
+    private int computeScrollExtent(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        int allChildrenCount = state.getItemCount();
+        ensureOrientationHelper();
+        View firstReferenceView = findFirstReferenceChild(allChildrenCount);
+        View lastReferenceView = findLastReferenceChild(allChildrenCount);
+        if (state.getItemCount() == 0 || firstReferenceView == null || lastReferenceView == null) {
+            return 0;
+        }
+        // TODO: Need to consider the reverse pattern when flexWrap == wrap_reverse is implemented
+        int extend = mOrientationHelper.getDecoratedEnd(lastReferenceView) -
+                mOrientationHelper.getDecoratedStart(firstReferenceView);
+        return Math.min(mOrientationHelper.getTotalSpace(), extend);
+    }
+
+    @Override
+    public int computeHorizontalScrollOffset(@NonNull RecyclerView.State state) {
+        int scrollOffset = computeScrollOffset(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeHorizontalScrollOffset: " + scrollOffset);
+        }
+        return scrollOffset;
+    }
+
+    @Override
+    public int computeVerticalScrollOffset(@NonNull RecyclerView.State state) {
+        int scrollOffset = computeScrollOffset(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeVerticalScrollOffset: " + scrollOffset);
+        }
+        return scrollOffset;
+    }
+
+    private int computeScrollOffset(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        int allChildrenCount = state.getItemCount();
+        View firstReferenceView = findFirstReferenceChild(allChildrenCount);
+        View lastReferenceView = findLastReferenceChild(allChildrenCount);
+        if (state.getItemCount() == 0 || firstReferenceView == null || lastReferenceView == null) {
+            return 0;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int minPosition = getPosition(firstReferenceView);
+        int maxPosition = getPosition(lastReferenceView);
+        int laidOutArea = Math.abs(mOrientationHelper.getDecoratedEnd(lastReferenceView) -
+                mOrientationHelper.getDecoratedStart(firstReferenceView));
+        int firstLinePosition = mFlexboxHelper.mIndexToFlexLine[minPosition];
+        if (firstLinePosition == 0 || firstLinePosition == NO_POSITION) {
+            return 0;
+        }
+        int lastLinePosition = mFlexboxHelper.mIndexToFlexLine[maxPosition];
+        int lineRange = lastLinePosition - firstLinePosition + 1;
+        float averageSizePerLine = (float) laidOutArea / lineRange;
+        // The number of lines before the first line is equal to the value of firstLinePosition
+        return Math.round(
+                firstLinePosition * averageSizePerLine + (mOrientationHelper.getStartAfterPadding()
+                        - mOrientationHelper.getDecoratedStart(firstReferenceView)));
+    }
+
+    @Override
+    public int computeHorizontalScrollRange(@NonNull RecyclerView.State state) {
+        int scrollRange = computeScrollRange(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeHorizontalScrollRange: " + scrollRange);
+        }
+        return scrollRange;
+    }
+
+    @Override
+    public int computeVerticalScrollRange(@NonNull RecyclerView.State state) {
+        int scrollRange = computeScrollRange(state);
+        if (DEBUG) {
+            Log.d(TAG, "computeVerticalScrollRange: " + scrollRange);
+        }
+        return scrollRange;
+    }
+
+    /**
+     * @return the estimate total length of the flex container.
+     * Note that this method estimates the length by using the number of the visible items and the
+     * rest of the non-visible items. So the value returned by this method isn't the exact length
+     * of the container. So the scroll bar position may be slightly different from the actual
+     * expected position
+     */
+    private int computeScrollRange(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        int allItemCount = state.getItemCount();
+        View firstReferenceView = findFirstReferenceChild(allItemCount);
+        View lastReferenceView = findLastReferenceChild(allItemCount);
+        if (state.getItemCount() == 0 || firstReferenceView == null || lastReferenceView == null) {
+            return 0;
+        }
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        int firstVisiblePosition = findFirstVisibleItemPosition();
+        int lastVisiblePosition = findLastVisibleItemPosition();
+        int laidOutArea = Math.abs(mOrientationHelper.getDecoratedEnd(lastReferenceView) -
+                mOrientationHelper.getDecoratedStart(firstReferenceView));
+        int laidOutRange = lastVisiblePosition - firstVisiblePosition + 1;
+        return (int) ((float) laidOutArea / laidOutRange * state.getItemCount());
+    }
+
+    /**
+     * Copied from {@link RecyclerView.LayoutManager#shouldMeasureChild
+     * (View,
+     * int, int, RecyclerView.LayoutParams)}}
+     */
+    private boolean shouldMeasureChild(View child, int widthSpec, int heightSpec,
+            RecyclerView.LayoutParams lp) {
+        return child.isLayoutRequested()
+                || !isMeasurementCacheEnabled()
+                || !isMeasurementUpToDate(child.getWidth(), widthSpec, lp.width)
+                || !isMeasurementUpToDate(child.getHeight(), heightSpec, lp.height);
+    }
+
+    /**
+     * Copied from
+     * {@link RecyclerView.LayoutManager#isMeasurementUpToDate(int, int,
+     * int)}
+     */
+    private static boolean isMeasurementUpToDate(int childSize, int spec, int dimension) {
+        final int specMode = View.MeasureSpec.getMode(spec);
+        final int specSize = View.MeasureSpec.getSize(spec);
+        if (dimension > 0 && childSize != dimension) {
+            return false;
+        }
+        switch (specMode) {
+            case View.MeasureSpec.UNSPECIFIED:
+                return true;
+            case View.MeasureSpec.AT_MOST:
+                return specSize >= childSize;
+            case View.MeasureSpec.EXACTLY:
+                return specSize == childSize;
+        }
+        return false;
+    }
+
+    private void clearFlexLines() {
+        mFlexLines.clear();
+        mAnchorInfo.reset();
+        mAnchorInfo.mPerpendicularCoordinate = 0;
+    }
+
+    private int getChildLeft(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedLeft(view) - params.leftMargin;
+    }
+
+    private int getChildRight(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedRight(view) + params.rightMargin;
+    }
+
+    private int getChildTop(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedTop(view) - params.topMargin;
+    }
+
+    private int getChildBottom(View view) {
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                view.getLayoutParams();
+        return getDecoratedBottom(view) + params.bottomMargin;
+    }
+
+    /**
+     * @param view              the view to be examined if it's visible
+     * @param completelyVisible when passed as {@code true}, this method checks if the view bounds
+     *                          don't overlap the bounds of the RecyclerView. When passed as
+     *                          {@code false}, this method checks if the view bounds are partially
+     *                          visible within the RecyclerView.
+     * @return if the view passed as an argument is visible (view bounds are within the parent
+     * RecyclerView)
+     */
+    private boolean isViewVisible(View view, boolean completelyVisible) {
+        int left = getPaddingLeft();
+        int top = getPaddingTop();
+        int right = getWidth() - getPaddingRight();
+        int bottom = getHeight() - getPaddingBottom();
+        int childLeft = getChildLeft(view);
+        int childTop = getChildTop(view);
+        int childRight = getChildRight(view);
+        int childBottom = getChildBottom(view);
+
+        boolean horizontalCompletelyVisible = false;
+        boolean horizontalPartiallyVisible = false;
+        boolean verticalCompletelyVisible = false;
+        boolean verticalPartiallyVisible = false;
+        if (left <= childLeft && right >= childRight) {
+            horizontalCompletelyVisible = true;
+        }
+        if (childLeft >= right || childRight >= left) {
+            horizontalPartiallyVisible = true;
+        }
+
+        if (top <= childTop && bottom >= childBottom) {
+            verticalCompletelyVisible = true;
+        }
+        if (childTop >= bottom || childBottom >= top) {
+            verticalPartiallyVisible = true;
+        }
+        if (completelyVisible) {
+            return horizontalCompletelyVisible && verticalCompletelyVisible;
+        } else {
+            return horizontalPartiallyVisible && verticalPartiallyVisible;
+        }
+    }
+
+    /**
+     * Returns the adapter position of the first visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * If RecyclerView has item decorators, they will be considered in calculations as well.
+     * LayoutManager may pre-cache some views that are not necessarily visible. Those views
+     * are ignored in this method.
+     *
+     * @return The adapter position of the first visible item or {@link RecyclerView#NO_POSITION} if
+     * there aren't any visible items.
+     * @see #findFirstCompletelyVisibleItemPosition()
+     * @see #findLastVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findFirstVisibleItemPosition() {
+        final View child = findOneVisibleChild(0, getChildCount(), false);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the first fully visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * @return The adapter position of the first fully visible item or
+     * {@link RecyclerView#NO_POSITION} if there aren't any visible items.
+     * @see #findFirstVisibleItemPosition()
+     * @see #findLastCompletelyVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findFirstCompletelyVisibleItemPosition() {
+        final View child = findOneVisibleChild(0, getChildCount(), true);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the last visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * If RecyclerView has item decorators, they will be considered in calculations as well.
+     * LayoutManager may pre-cache some views that are not necessarily visible. Those views
+     * are ignored in this method.
+     *
+     * @return The adapter position of the last visible view or {@link RecyclerView#NO_POSITION} if
+     * there aren't any visible items.
+     * @see #findLastCompletelyVisibleItemPosition()
+     * @see #findFirstVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findLastVisibleItemPosition() {
+        final View child = findOneVisibleChild(getChildCount() - 1, -1, false);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the last fully visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     *
+     * @return The adapter position of the last fully visible view or
+     * {@link RecyclerView#NO_POSITION} if there aren't any visible items.
+     * @see #findLastVisibleItemPosition()
+     * @see #findFirstCompletelyVisibleItemPosition()
+     */
+    @SuppressWarnings("WeakerAccess")
+    public int findLastCompletelyVisibleItemPosition() {
+        final View child = findOneVisibleChild(getChildCount() - 1, -1, true);
+        return child == null ? NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the first child that is visible in the provided index range, i.e. either partially or
+     * fully visible depending on the arguments provided.
+     *
+     * @param fromIndex         the start index for searching the visible child
+     * @param toIndex           the last index for searching the visible child
+     * @param completelyVisible when passed as {@code true}, this method checks if the view bounds
+     *                          don't overlap the bounds of the RecyclerView. When passed as
+     *                          {@code false}, this method checks if the view bounds are partially
+     *                          visible within the RecyclerView.
+     * @return the first child that is visible.
+     */
+    private View findOneVisibleChild(int fromIndex, int toIndex, boolean completelyVisible) {
+        int next = toIndex > fromIndex ? 1 : -1;
+        for (int i = fromIndex; i != toIndex; i += next) {
+            View view = getChildAt(i);
+            if (isViewVisible(view, completelyVisible)) {
+                return view;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param position the index of the view
+     * @return the index of the {@link FlexLine}, which includes the view whose index is passed as
+     * the position argument.
+     */
+    int getPositionToFlexLineIndex(int position) {
+        assert mFlexboxHelper.mIndexToFlexLine != null;
+        return mFlexboxHelper.mIndexToFlexLine[position];
+    }
+
+    /**
+     * LayoutParams used by the {@link FlexboxLayoutManager}, which stores per-child information
+     * required for the Flexbox.
+     *
+     * Note that some parent fields (which are not primitive nor a class implements
+     * {@link Parcelable}) are not included as the stored/restored fields after this class
+     * is serialized/de-serialized as an {@link Parcelable}.
+     */
+    public static class LayoutParams extends RecyclerView.LayoutParams implements FlexItem {
+
+        /**
+         * @see FlexItem#getFlexGrow()
+         */
+        private float mFlexGrow = FlexItem.FLEX_GROW_DEFAULT;
+
+        /**
+         * @see FlexItem#getFlexShrink()
+         */
+        private float mFlexShrink = FlexItem.FLEX_SHRINK_DEFAULT;
+
+        /**
+         * @see FlexItem#getAlignSelf()
+         */
+        private int mAlignSelf = AlignSelf.AUTO;
+
+        /**
+         * @see FlexItem#getFlexBasisPercent()
+         */
+        private float mFlexBasisPercent = FlexItem.FLEX_BASIS_PERCENT_DEFAULT;
+
+        /**
+         * @see FlexItem#getMinWidth()
+         */
+        private int mMinWidth;
+
+        /**
+         * @see FlexItem#getMinHeight()
+         */
+        private int mMinHeight;
+
+        /**
+         * @see FlexItem#getMaxWidth()
+         */
+        private int mMaxWidth = MAX_SIZE;
+
+        /**
+         * @see FlexItem#getMaxHeight()
+         */
+        private int mMaxHeight = MAX_SIZE;
+
+        /**
+         * @see FlexItem#isWrapBefore()
+         */
+        private boolean mWrapBefore;
+
+        @Override
+        public int getWidth() {
+            return width;
+        }
+
+        @Override
+        public void setWidth(int width) {
+            this.width = width;
+        }
+
+        @Override
+        public int getHeight() {
+            return height;
+        }
+
+        @Override
+        public void setHeight(int height) {
+            this.height = height;
+        }
+
+        @Override
+        public float getFlexGrow() {
+            return mFlexGrow;
+        }
+
+        @Override
+        public void setFlexGrow(float flexGrow) {
+            this.mFlexGrow = flexGrow;
+        }
+
+        @Override
+        public float getFlexShrink() {
+            return mFlexShrink;
+        }
+
+        @Override
+        public void setFlexShrink(float flexShrink) {
+            this.mFlexShrink = flexShrink;
+        }
+
+        @AlignSelf
+        @Override
+        public int getAlignSelf() {
+            return mAlignSelf;
+        }
+
+        @Override
+        public void setAlignSelf(@AlignSelf int alignSelf) {
+            this.mAlignSelf = alignSelf;
+        }
+
+        @Override
+        public int getMinWidth() {
+            return mMinWidth;
+        }
+
+        @Override
+        public void setMinWidth(int minWidth) {
+            this.mMinWidth = minWidth;
+        }
+
+        @Override
+        public int getMinHeight() {
+            return mMinHeight;
+        }
+
+        @Override
+        public void setMinHeight(int minHeight) {
+            this.mMinHeight = minHeight;
+        }
+
+        @Override
+        public int getMaxWidth() {
+            return mMaxWidth;
+        }
+
+        @Override
+        public void setMaxWidth(int maxWidth) {
+            this.mMaxWidth = maxWidth;
+        }
+
+        @Override
+        public int getMaxHeight() {
+            return mMaxHeight;
+        }
+
+        @Override
+        public void setMaxHeight(int maxHeight) {
+            this.mMaxHeight = maxHeight;
+        }
+
+        @Override
+        public boolean isWrapBefore() {
+            return mWrapBefore;
+        }
+
+        @Override
+        public void setWrapBefore(boolean wrapBefore) {
+            this.mWrapBefore = wrapBefore;
+        }
+
+        @Override
+        public float getFlexBasisPercent() {
+            return mFlexBasisPercent;
+        }
+
+        @Override
+        public void setFlexBasisPercent(float flexBasisPercent) {
+            this.mFlexBasisPercent = flexBasisPercent;
+        }
+
+        @Override
+        public int getMarginLeft() {
+            return leftMargin;
+        }
+
+        @Override
+        public int getMarginTop() {
+            return topMargin;
+        }
+
+        @Override
+        public int getMarginRight() {
+            return rightMargin;
+        }
+
+        @Override
+        public int getMarginBottom() {
+            return bottomMargin;
+        }
+
+        public LayoutParams(Context c, AttributeSet attrs) {
+            super(c, attrs);
+        }
+
+        public LayoutParams(int width, int height) {
+            super(width, height);
+        }
+
+        public LayoutParams(ViewGroup.MarginLayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(ViewGroup.LayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(RecyclerView.LayoutParams source) {
+            super(source);
+        }
+
+        public LayoutParams(LayoutParams source) {
+            super(source);
+
+            mFlexGrow = source.mFlexGrow;
+            mFlexShrink = source.mFlexShrink;
+            mAlignSelf = source.mAlignSelf;
+            mFlexBasisPercent = source.mFlexBasisPercent;
+            mMinWidth = source.mMinWidth;
+            mMinHeight = source.mMinHeight;
+            mMaxWidth = source.mMaxWidth;
+            mMaxHeight = source.mMaxHeight;
+            mWrapBefore = source.mWrapBefore;
+        }
+
+        @Override
+        public int getOrder() {
+            return FlexItem.ORDER_DEFAULT;
+        }
+
+        @Override
+        public void setOrder(int order) {
+            // Unlike the FlexboxLayout, the order attribute is not supported, we don't calculate
+            // the order attribute because preparing the order attribute requires all
+            // view holders to be inflated at least once, which is inefficient if the number of
+            // items in the adapter is large
+            throw new UnsupportedOperationException("Setting the order in the "
+                    + "FlexboxLayoutManager is not supported. Use FlexboxLayout "
+                    + "if you need to reorder using the attribute.");
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeFloat(this.mFlexGrow);
+            dest.writeFloat(this.mFlexShrink);
+            dest.writeInt(this.mAlignSelf);
+            dest.writeFloat(this.mFlexBasisPercent);
+            dest.writeInt(this.mMinWidth);
+            dest.writeInt(this.mMinHeight);
+            dest.writeInt(this.mMaxWidth);
+            dest.writeInt(this.mMaxHeight);
+            dest.writeByte(this.mWrapBefore ? (byte) 1 : (byte) 0);
+            dest.writeInt(this.bottomMargin);
+            dest.writeInt(this.leftMargin);
+            dest.writeInt(this.rightMargin);
+            dest.writeInt(this.topMargin);
+            dest.writeInt(this.height);
+            dest.writeInt(this.width);
+        }
+
+        protected LayoutParams(Parcel in) {
+            super(WRAP_CONTENT, WRAP_CONTENT);
+            this.mFlexGrow = in.readFloat();
+            this.mFlexShrink = in.readFloat();
+            this.mAlignSelf = in.readInt();
+            this.mFlexBasisPercent = in.readFloat();
+            this.mMinWidth = in.readInt();
+            this.mMinHeight = in.readInt();
+            this.mMaxWidth = in.readInt();
+            this.mMaxHeight = in.readInt();
+            this.mWrapBefore = in.readByte() != 0;
+            this.bottomMargin = in.readInt();
+            this.leftMargin = in.readInt();
+            this.rightMargin = in.readInt();
+            this.topMargin = in.readInt();
+            this.height = in.readInt();
+            this.width = in.readInt();
+        }
+
+        public static final Parcelable.Creator<LayoutParams> CREATOR
+                = new Parcelable.Creator<LayoutParams>() {
+            @Override
+            public LayoutParams createFromParcel(Parcel source) {
+                return new LayoutParams(source);
+            }
+
+            @Override
+            public LayoutParams[] newArray(int size) {
+                return new LayoutParams[size];
+            }
+        };
+    }
+
+    /**
+     * A class that holds the information about an anchor position like from what pixels layout
+     * should start.
+     */
+    private class AnchorInfo {
+
+        private int mPosition;
+
+        private int mFlexLinePosition;
+
+        private int mCoordinate;
+
+        /**
+         * The anchor position of the main axis, which is the secondary scrolling direction.
+         */
+        private int mPerpendicularCoordinate = 0;
+
+        private boolean mLayoutFromEnd;
+
+        private boolean mValid;
+
+        private boolean mAssignedFromSavedState;
+
+        private void reset() {
+            mPosition = NO_POSITION;
+            mFlexLinePosition = NO_POSITION;
+            mCoordinate = INVALID_OFFSET;
+            mValid = false;
+            mAssignedFromSavedState = false;
+            if (isMainAxisDirectionHorizontal()) {
+                if (mFlexWrap == FlexWrap.NOWRAP) {
+                    mLayoutFromEnd = mFlexDirection == FlexDirection.ROW_REVERSE;
+                } else {
+                    mLayoutFromEnd = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                }
+            } else {
+                if (mFlexWrap == FlexWrap.NOWRAP) {
+                    mLayoutFromEnd = mFlexDirection == FlexDirection.COLUMN_REVERSE;
+                } else {
+                    mLayoutFromEnd = mFlexWrap == FlexWrap.WRAP_REVERSE;
+                }
+            }
+        }
+
+        private void assignCoordinateFromPadding() {
+            if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+                mCoordinate = mLayoutFromEnd ? mOrientationHelper.getEndAfterPadding()
+                        : getWidth() - mOrientationHelper.getStartAfterPadding();
+            } else {
+                mCoordinate = mLayoutFromEnd ? mOrientationHelper.getEndAfterPadding()
+                        : mOrientationHelper.getStartAfterPadding();
+            }
+        }
+
+        private void assignFromView(View anchor) {
+            OrientationHelper orientationHelper;
+            // When the flex wrap is nowrap, the orientation helper is changed to
+            // perpendicular. Need to use the mSubOrientationHelper to be consistent with
+            // when flex wrap is not nowrap.
+            if (mFlexWrap == FlexWrap.NOWRAP) {
+                orientationHelper = mSubOrientationHelper;
+            } else {
+                orientationHelper = mOrientationHelper;
+            }
+            if (!isMainAxisDirectionHorizontal() && mIsRtl) {
+                // We need to use the anchor view as starting from right if the flex direction is
+                // (column or column_reverse) and layout direction is RTL.
+                if (mLayoutFromEnd) {
+                    mCoordinate = orientationHelper.getDecoratedStart(anchor) +
+                        orientationHelper.getTotalSpaceChange();
+                } else {
+                    mCoordinate = orientationHelper.getDecoratedEnd(anchor);
+                }
+            } else {
+                if (mLayoutFromEnd) {
+                    mCoordinate = orientationHelper.getDecoratedEnd(anchor) +
+                        orientationHelper.getTotalSpaceChange();
+                } else {
+                    mCoordinate = orientationHelper.getDecoratedStart(anchor);
+                }
+            }
+            mPosition = getPosition(anchor);
+            mAssignedFromSavedState = false;
+            assert mFlexboxHelper.mIndexToFlexLine != null;
+            int flexLinePosition =
+                    mFlexboxHelper.mIndexToFlexLine[mPosition != NO_POSITION ? mPosition : 0];
+            mFlexLinePosition = flexLinePosition != NO_POSITION ? flexLinePosition : 0;
+            // It's likely that the view is the first item in a flex line, but if not get the
+            // index of the first item in the same line because the calculation of the flex lines
+            // expects that it starts from the first item in a flex line
+            if (mFlexLines.size() > mFlexLinePosition) {
+                mPosition = mFlexLines.get(mFlexLinePosition).mFirstIndex;
+            }
+        }
+
+        @Override
+        @NonNull
+        public String toString() {
+            return "AnchorInfo{" +
+                    "mPosition=" + mPosition +
+                    ", mFlexLinePosition=" + mFlexLinePosition +
+                    ", mCoordinate=" + mCoordinate +
+                    ", mPerpendicularCoordinate=" + mPerpendicularCoordinate +
+                    ", mLayoutFromEnd=" + mLayoutFromEnd +
+                    ", mValid=" + mValid +
+                    ", mAssignedFromSavedState=" + mAssignedFromSavedState +
+                    '}';
+        }
+    }
+
+    /**
+     * Helper class that keeps temporary state while the FlexboxLayoutManager is filling out the
+     * empty space.
+     */
+    private static class LayoutState {
+
+        private final static int SCROLLING_OFFSET_NaN = Integer.MIN_VALUE;
+
+        private static final int LAYOUT_START = -1;
+        private static final int LAYOUT_END = 1;
+
+        private static final int ITEM_DIRECTION_TAIL = 1;
+
+        /** Number of pixels that we should fill, in the layout direction. */
+        private int mAvailable;
+
+        /** If set to true, the value of {@link #mAvailable} is considered as infinite. */
+        private boolean mInfinite;
+
+        // TODO: Add mExtra to support better smooth scrolling
+
+        /** Current position on the flex lines being laid out in the layout call */
+        private int mFlexLinePosition;
+
+        /** Current position on the adapter to get the next item. */
+        private int mPosition;
+
+        /** Pixel offset where layout should start */
+        private int mOffset;
+
+        /**
+         * Used when LayoutState is constructed in a scrolling state.
+         * It should be set the amount of scrolling we can make without creating a new view.
+         * Settings this is required for efficient view recycling.
+         */
+        private int mScrollingOffset;
+
+        /**
+         * The most recent
+         * {@link #scrollVerticallyBy(int, RecyclerView.Recycler, RecyclerView.State)} or
+         * {@link #scrollHorizontallyBy(int, RecyclerView.Recycler, RecyclerView.State)} amount.
+         */
+        private int mLastScrollDelta;
+
+        private int mItemDirection = LayoutState.ITEM_DIRECTION_TAIL;
+
+        private int mLayoutDirection = LayoutState.LAYOUT_END;
+
+        private boolean mShouldRecycle;
+
+        /**
+         * @return {@code true} if there are more items to layout
+         */
+        private boolean hasMore(RecyclerView.State state, List<FlexLine> flexLines) {
+            return mPosition >= 0 && mPosition < state.getItemCount() &&
+                    mFlexLinePosition >= 0 && mFlexLinePosition < flexLines.size();
+        }
+
+        @Override
+        @NonNull
+        public String toString() {
+            return "LayoutState{" +
+                    "mAvailable=" + mAvailable +
+                    ", mFlexLinePosition=" + mFlexLinePosition +
+                    ", mPosition=" + mPosition +
+                    ", mOffset=" + mOffset +
+                    ", mScrollingOffset=" + mScrollingOffset +
+                    ", mLastScrollDelta=" + mLastScrollDelta +
+                    ", mItemDirection=" + mItemDirection +
+                    ", mLayoutDirection=" + mLayoutDirection +
+                    '}';
+        }
+    }
+
+    /**
+     * The saved state that needs to be restored after the RecyclerView is recreated.
+     */
+    private static class SavedState implements Parcelable {
+
+        /** The adapter position of the first visible view */
+        private int mAnchorPosition;
+
+        /**
+         * The offset of the first visible view.
+         * E.g. if this value is set as -30, the fist visible view's top is off screen by 30 pixels
+         */
+        private int mAnchorOffset;
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(this.mAnchorPosition);
+            dest.writeInt(this.mAnchorOffset);
+        }
+
+        SavedState() {
+        }
+
+        private SavedState(Parcel in) {
+            this.mAnchorPosition = in.readInt();
+            this.mAnchorOffset = in.readInt();
+        }
+
+        private SavedState(SavedState savedState) {
+            mAnchorPosition = savedState.mAnchorPosition;
+            mAnchorOffset = savedState.mAnchorOffset;
+        }
+
+        private void invalidateAnchor() {
+            mAnchorPosition = NO_POSITION;
+        }
+
+        private boolean hasValidAnchor(int itemCount) {
+            return mAnchorPosition >= 0 && mAnchorPosition < itemCount;
+        }
+
+        public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
+            @Override
+            public SavedState createFromParcel(Parcel source) {
+                return new SavedState(source);
+            }
+
+            @Override
+            public SavedState[] newArray(int size) {
+                return new SavedState[size];
+            }
+        };
+
+        @Override
+        @NonNull
+        public String toString() {
+            return "SavedState{" +
+                    "mAnchorPosition=" + mAnchorPosition +
+                    ", mAnchorOffset=" + mAnchorOffset +
+                    '}';
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/JustifyContent.java b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/JustifyContent.java
new file mode 100755
index 0000000..e6505b4
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/JustifyContent.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.flexbox;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import androidx.annotation.IntDef;
+
+/** This attribute controls the alignment along the main axis. */
+@IntDef({JustifyContent.FLEX_START, JustifyContent.FLEX_END, JustifyContent.CENTER,
+        JustifyContent.SPACE_BETWEEN, JustifyContent.SPACE_AROUND, JustifyContent.SPACE_EVENLY})
+@Retention(RetentionPolicy.SOURCE)
+public @interface JustifyContent {
+
+    /** Flex items are packed toward the start line. */
+    int FLEX_START = 0;
+
+    /** Flex items are packed toward the end line. */
+    int FLEX_END = 1;
+
+    /** Flex items are centered along the flex line where the flex items belong. */
+    int CENTER = 2;
+
+    /**
+     * Flex items are evenly distributed along the flex line, first flex item is on the
+     * start line, the last flex item is on the end line.
+     */
+    int SPACE_BETWEEN = 3;
+
+    /**
+     * Flex items are evenly distributed along the flex line with the same amount of spaces between
+     * the flex lines.
+     */
+    int SPACE_AROUND = 4;
+
+    /**
+     * Flex items are evenly distributed along the flex line. The difference between
+     * {@link #SPACE_AROUND} is that all the spaces between items should be the same as the
+     * space before the first item and after the last item.
+     * See
+     * <a href="https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content">the document on MDN</a>
+     * for more details.
+     */
+    int SPACE_EVENLY = 5;
+}
diff --git a/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/res/values/attrs.xml b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/res/values/attrs.xml
new file mode 100755
index 0000000..277f885
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/flexbox/src/main/res/values/attrs.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright 2016 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+    <declare-styleable name="FlexboxLayout">
+        <attr name="flexDirection">
+            <enum name="row" value="0" />
+            <enum name="row_reverse" value="1" />
+            <enum name="column" value="2" />
+            <enum name="column_reverse" value="3" />
+        </attr>
+
+        <attr name="flexWrap">
+            <enum name="nowrap" value="0" />
+            <enum name="wrap" value="1" />
+            <enum name="wrap_reverse" value="2" />
+        </attr>
+
+        <!--
+            Omitting flex-flow property since it's reflected in the parent flex container.
+            Set the flexDirection and/or flexWrap to the parent flex container explicitly if you
+            want to use the flex-flow similar way to the web.
+         -->
+
+        <attr name="justifyContent">
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="space_between" value="3" />
+            <enum name="space_around" value="4" />
+            <enum name="space_evenly" value="5" />
+        </attr>
+
+        <attr name="alignItems">
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="baseline" value="3" />
+            <enum name="stretch" value="4" />
+        </attr>
+
+        <attr name="alignContent">
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="space_between" value="3" />
+            <enum name="space_around" value="4" />
+            <enum name="stretch" value="5" />
+        </attr>
+
+        <attr name="dividerDrawable" format="reference" />
+        <attr name="dividerDrawableHorizontal" format="reference" />
+        <attr name="dividerDrawableVertical" format="reference" />
+
+        <attr name="showDivider">
+            <flag name="none" value="0" />
+            <flag name="beginning" value="1" />
+            <flag name="middle" value="2" />
+            <flag name="end" value="4" />
+        </attr>
+        <attr name="showDividerHorizontal">
+            <flag name="none" value="0" />
+            <flag name="beginning" value="1" />
+            <flag name="middle" value="2" />
+            <flag name="end" value="4" />
+        </attr>
+        <attr name="showDividerVertical">
+            <flag name="none" value="0" />
+            <flag name="beginning" value="1" />
+            <flag name="middle" value="2" />
+            <flag name="end" value="4" />
+        </attr>
+
+        <!--
+            The attribute that specifies the maximum number of flex lines. This attribute is
+            effective only when the flexWrap attribute is "wrap" or "wrap_reverse".
+        -->
+        <attr name="maxLine" format="integer" />
+
+    </declare-styleable>
+
+    <declare-styleable name="FlexboxLayout_Layout">
+        <attr name="layout_order" format="integer" />
+
+        <!-- Negative numbers are invalid. -->
+        <attr name="layout_flexGrow" format="float" />
+
+        <!-- Negative numbers are invalid. -->
+        <attr name="layout_flexShrink" format="float" />
+
+        <!--
+            The initial length in a percentage format relative to its parent. This is similar to the
+            flex-basis property in the original CSS specification.
+            (https://www.w3.org/TR/css-flexbox-1/#flex-basis-property)
+            But unlike the flex-basis property, this attribute only accepts a value in fraction
+            (percentage), whereas flex-basis property accepts width values such as 1em, 10px and
+            the 'content' string.
+            But specifying initial fixed width values can be done by specifying width values in
+            layout_width (or layout_height, varies depending on the flexDirection). Also the same
+            effect can be done by specifying "wrap_content" in layout_width (or layout_height) if
+            developers want to achieve the same effect as 'content'.
+            Thus, this attribute only accepts fraction values, which can't be done through
+            layout_width (or layout_height) for simplicity.
+        -->
+        <attr name="layout_flexBasisPercent" format="fraction" />
+
+        <!--
+            Omitting flex property since it's a shorthand for layout_flexGrow and layout_flexShrink
+            and layout_percentInParent (flex-basis in the original CSS spec).
+        -->
+
+        <attr name="layout_alignSelf">
+            <enum name="auto" value="-1" />
+            <!-- The values below need to match the values of alignItems -->
+            <enum name="flex_start" value="0" />
+            <enum name="flex_end" value="1" />
+            <enum name="center" value="2" />
+            <enum name="baseline" value="3" />
+            <enum name="stretch" value="4" />
+        </attr>
+
+        <attr name="layout_minWidth" format="dimension" />
+        <attr name="layout_minHeight" format="dimension" />
+        <attr name="layout_maxWidth" format="dimension" />
+        <attr name="layout_maxHeight" format="dimension" />
+
+        <!--
+            This attribute forces a flex line wrapping. i.e. if this is set to true for a
+            flex item, the item will become the first item of a flex line. (A wrapping happens
+            regardless of the flex items being processed in the the previous flex line)
+            This attribute is ignored if the flex_wrap attribute is set to nowrap.
+            The equivalent attribute isn't defined in the original CSS Flexible Box Module
+            specification, but having this attribute is useful for Android developers to flatten
+            the layouts when building a grid like layout or for a situation where developers want
+            to put a new flex line to make a semantic difference from the previous one, etc.
+        -->
+        <attr name="layout_wrapBefore" format="boolean" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/gradle.properties b/OnTime_User_live/lib/flexbox-layout/gradle.properties
new file mode 100755
index 0000000..1f0a9ed
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/gradle.properties
@@ -0,0 +1,37 @@
+#
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/OnTime_User_live/lib/flexbox-layout/gradle/wrapper/gradle-wrapper.properties b/OnTime_User_live/lib/flexbox-layout/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..52aa872
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Mar 02 14:58:35 WIB 2026
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_User_live/lib/flexbox-layout/gradlew b/OnTime_User_live/lib/flexbox-layout/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/OnTime_User_live/lib/flexbox-layout/gradlew.bat b/OnTime_User_live/lib/flexbox-layout/gradlew.bat
new file mode 100755
index 0000000..e95643d
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/OnTime_User_live/lib/flexbox-layout/settings.gradle b/OnTime_User_live/lib/flexbox-layout/settings.gradle
new file mode 100755
index 0000000..8d26cda
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/settings.gradle
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2016 Google Inc. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+include ':demo-playground', ':demo-cat-gallery', ':flexbox'
diff --git a/OnTime_User_live/lib/flexbox-layout/tool/codeStyleSettings.xml b/OnTime_User_live/lib/flexbox-layout/tool/codeStyleSettings.xml
new file mode 100755
index 0000000..bfd09bd
--- /dev/null
+++ b/OnTime_User_live/lib/flexbox-layout/tool/codeStyleSettings.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="FIELD_NAME_PREFIX" value="m" />
+        <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
+        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
+        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
+        <option name="IMPORT_LAYOUT_TABLE">
+          <value>
+            <package name="android" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="com.android" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="dalvik" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="libcore" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="com" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="gov" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="junit" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="net" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="org" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="java" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="javax" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="true" />
+            <emptyLine />
+            <package name="android" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com.android" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="dalvik" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="libcore" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="com" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="gov" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="junit" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="net" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="org" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="java" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="javax" withSubpackages="true" static="false" />
+            <emptyLine />
+            <package name="" withSubpackages="true" static="false" />
+          </value>
+        </option>
+        <option name="RIGHT_MARGIN" value="100" />
+        <option name="JD_P_AT_EMPTY_LINES" value="false" />
+        <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+        <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+        <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
+        <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+        <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
+        <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+        <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+        <option name="BLANK_LINES_AROUND_FIELD" value="1" />
+        <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+        <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+        <option name="ALIGN_MULTILINE_FOR" value="false" />
+        <option name="CALL_PARAMETERS_WRAP" value="1" />
+        <option name="METHOD_PARAMETERS_WRAP" value="1" />
+        <option name="EXTENDS_LIST_WRAP" value="1" />
+        <option name="THROWS_LIST_WRAP" value="1" />
+        <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+        <option name="THROWS_KEYWORD_WRAP" value="1" />
+        <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+        <option name="BINARY_OPERATION_WRAP" value="1" />
+        <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+        <option name="TERNARY_OPERATION_WRAP" value="1" />
+        <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+        <option name="FOR_STATEMENT_WRAP" value="1" />
+        <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+        <option name="ASSIGNMENT_WRAP" value="1" />
+        <option name="PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE" value="true" />
+        <option name="WRAP_COMMENTS" value="true" />
+        <option name="IF_BRACE_FORCE" value="3" />
+        <option name="DOWHILE_BRACE_FORCE" value="3" />
+        <option name="WHILE_BRACE_FORCE" value="3" />
+        <option name="FOR_BRACE_FORCE" value="3" />
+        <Objective-C-extensions>
+          <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
+          <option name="RELEASE_STYLE" value="IVAR" />
+          <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" />
+          <file>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+          </file>
+          <class>
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+          </class>
+          <extensions>
+            <pair source="cpp" header="h" />
+            <pair source="c" header="h" />
+          </extensions>
+        </Objective-C-extensions>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <ADDITIONAL_INDENT_OPTIONS fileType="java">
+          <option name="TAB_SIZE" value="8" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="js">
+          <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <codeStyleSettings language="JAVA">
+          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+          <option name="ALIGN_MULTILINE_FOR" value="false" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="PREFER_PARAMETERS_WRAP" value="true" />
+          <option name="METHOD_PARAMETERS_WRAP" value="1" />
+          <option name="RESOURCE_LIST_WRAP" value="1" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="THROWS_LIST_WRAP" value="1" />
+          <option name="THROWS_KEYWORD_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="1" />
+          <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+          <option name="TERNARY_OPERATION_WRAP" value="1" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="1" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="WRAP_LONG_LINES" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="XML">
+          <option name="FORCE_REARRANGE_MODE" value="1" />
+          <indentOptions>
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+          </indentOptions>
+          <arrangement>
+            <rules>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>xmlns:android</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>xmlns:.*</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:id</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:name</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>name</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>style</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_width</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_height</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_.*</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:width</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:height</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>.*</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+            </rules>
+          </arrangement>
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="AndroidStyle" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/overscroll-decor/.gitignore b/OnTime_User_live/lib/overscroll-decor/.gitignore
new file mode 100755
index 0000000..5df5e83
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/.gitignore
@@ -0,0 +1,9 @@
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+/.idea
+*iml
diff --git a/OnTime_User_live/lib/overscroll-decor/LICENSE b/OnTime_User_live/lib/overscroll-decor/LICENSE
new file mode 100755
index 0000000..2772b5d
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2015, DoAT Media Ltd.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/OnTime_User_live/lib/overscroll-decor/README.md b/OnTime_User_live/lib/overscroll-decor/README.md
new file mode 100755
index 0000000..3c552fc
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/README.md
@@ -0,0 +1,266 @@
+> **Announcement**
+>
+> An update regarding Bintray's shutdown: The library has been successfuly republished onto maven central, but with a different Group ID; Please update your Gradle dependencies as follows:
+>
+> ```diff
+> -implementation 'me.everything:overscroll-decor-android:1.1.0'
+> +implementation 'io.github.everythingme:overscroll-decor-android:1.1.1'
+> ```
+
+# Over-Scroll Support For Android's RecyclerView, ListView, GridView, ScrollView ...
+
+The library provides an iOS-like over-scrolling effect applicable over almost all Android native scrollable views. It is also built to allow for very easy adaptation to support custom views.
+
+The core effect classes are loose-[decorators](https://en.wikipedia.org/wiki/Decorator_pattern) of Android views, and are thus decoupled from the actual view classes' implementations. That allows developers to apply the effect over views while keeping them as untampered 'black-boxes'. Namely, it allows for keeping important optimizations such as view-recycling intact.
+
+![RecyclerView demo](recyclerview_demo.gif)
+
+# Gradle Dependency
+
+Add the following to your module's `build.gradle` file:
+
+```groovy
+dependencies {
+    // ...
+    
+    implementation 'io.github.everythingme:overscroll-decor-android:1.1.1'
+}
+```
+
+# Usage
+
+### RecyclerView
+
+Supports both linear and staggered-grid layout managers (i.e. all native Android layouts).
+Can be easily adapted to support custom layout managers.
+
+```java
+RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+    
+// Horizontal
+OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+// Vertical
+OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+```
+
+### RecyclerView with items swiping / dragging
+See _Advanced Usage_.
+
+
+### ListView
+
+```java
+ListView listView = (ListView) findViewById(R.id.list_view);
+OverScrollDecoratorHelper.setUpOverScroll(listView);
+```
+
+### GridView
+
+```java
+GridView gridView = (GridView) findViewById(R.id.grid_view);
+OverScrollDecoratorHelper.setUpOverScroll(gridView);
+```
+
+### ViewPager
+
+```java
+ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
+OverScrollDecoratorHelper.setUpOverScroll(viewPager);
+```
+
+### ScrollView, HorizontalScrollView
+
+```java
+ScrollView scrollView = (ScrollView) findViewById(R.id.scroll_view);
+OverScrollDecoratorHelper.setUpOverScroll(scrollView);
+    
+HorizontalScrollView horizontalScrollView = (HorizontalScrollView) findViewById(R.id.horizontal_scroll_view);
+OverScrollDecoratorHelper.setUpOverScroll(horizontalScrollView);
+```
+
+### Any View - Text, Image... (Always Over-Scroll Ready)
+
+```java
+View view = findViewById(R.id.demo_view);
+    
+// Horizontal
+OverScrollDecoratorHelper.setUpStaticOverScroll(view, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+// Vertical
+OverScrollDecoratorHelper.setUpStaticOverScroll(view, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+```
+
+# Advanced Usage
+
+```java
+// Horizontal RecyclerView
+RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+new HorizontalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView));
+
+// ListView (vertical)
+ListView listView = (ListView) findViewById(R.id.list_view);
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(listView));
+
+// GridView (vertical)
+GridView gridView = (GridView) findViewById(R.id.grid_view);
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(gridView));
+
+// ViewPager
+ViewPager viewPager = (ViewPager) findViewById(R.id.view_pager);
+new HorizontalOverScrollBounceEffectDecorator(new ViewPagerOverScrollDecorAdapter(viewPager));
+
+// A simple TextView - horizontal
+View textView = findViewById(R.id.title);
+new HorizontalOverScrollBounceEffectDecorator(new StaticOverScrollDecorAdapter(view));
+```
+
+### RecyclerView with [ItemTouchHelper](http://developer.android.com/reference/android/support/v7/widget/helper/ItemTouchHelper.html) based swiping / dragging
+As of version 1.0.1, the effect can work smoothly with the RecyclerView's built-in mechanism for items swiping and dragging (based on [ItemTouchHelper](http://developer.android.com/reference/android/support/v7/widget/helper/ItemTouchHelper.html)). BUT, it requires some (very little) explicit configuration work:
+
+```java
+// Normally you would attach an ItemTouchHelper & a callback to a RecyclerView, this way:
+RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+ItemTouchHelper.Callback myCallback = new ItemTouchHelper.Callback() {
+	...
+};
+ItemTouchHelper myHelper = new ItemTouchHelper(myCallback);
+myHelper.attachToRecyclerView(recyclerView);
+
+// INSTEAD of attaching the helper yourself, simply use the dedicated adapter c'tor, e.g.:
+new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView, myCallback));
+
+```
+
+For more info on the swiping / dragging mechanism, try [this useful tutorial](https://medium.com/@ipaulpro/drag-and-swipe-with-recyclerview-b9456d2b1aaf).
+
+### Over-Scroll Listeners
+As of version 1.0.2, the effect provides a means for registering listeners of over-scroll related events. There are two types of listeners, as follows.
+
+#### State-Change Listener
+The over-scroll manager dispatches events onto a state-change listener denoting transitions in the effect's state:
+
+```java
+
+// Note: over-scroll is set-up using the helper method.
+IOverScrollDecor decor = OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+
+decor.setOverScrollStateListener(new IOverScrollStateListener() {
+    @Override
+	public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) {
+	    switch (newState) {
+	        case STATE_IDLE:
+	            // No over-scroll is in effect.
+	            break;
+	        case STATE_DRAG_START_SIDE:
+	            // Dragging started at the left-end.
+	            break;
+	        case STATE_DRAG_END_SIDE:
+	            // Dragging started at the right-end.
+	            break;
+	        case STATE_BOUNCE_BACK:
+	            if (oldState == STATE_DRAG_START_SIDE) {
+	                // Dragging stopped -- view is starting to bounce back from the *left-end* onto natural position.
+	            } else { // i.e. (oldState == STATE_DRAG_END_SIDE)
+	                // View is starting to bounce back from the *right-end*.
+	            }
+	            break;
+	    }
+	}
+}
+```
+
+#### Real-time Updates Listener
+The over-scroll manager can also dispatch *real-time*, as-it-happens over-scroll events denoting the current offset resulting due to an over-scroll being in-effect (the offset thus denotes the current 'intensity').
+
+```java
+// Note: over-scroll is set-up by explicity instantiating a decorator rather than using the helper; The two methods can be used interchangeably for registering listeners.
+VerticalOverScrollBounceEffectDecorator decor = new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView, itemTouchHelperCallback));
+
+decor.setOverScrollUpdateListener(new IOverScrollUpdateListener() {
+    @Override
+    public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) {
+    	final View view = decor.getView();
+    	if (offset > 0) {
+    		// 'view' is currently being over-scrolled from the top.
+    	} else if (offset < 0) {
+    		// 'view' is currently being over-scrolled from the bottom.
+    	} else {
+    		// No over-scroll is in-effect.
+    		// This is synonymous with having (state == STATE_IDLE).
+    	}
+    }
+});
+
+```
+
+
+The two type of listeners can be used either separately or in conjunction, depending on your needs. Refer to the demo project's RecyclerView-demo section for actual concrete usage.
+    
+### Custom Views
+
+```java
+public class CustomView extends View {
+    // ...
+}
+    
+final CustomView view = (CustomView) findViewById(R.id.custom_view);
+new VerticalOverScrollBounceEffectDecorator(new IOverScrollDecoratorAdapter() {
+
+    @Override
+    public View getView() {
+        return view;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+	    // canScrollUp() is an example of a method you must implement
+        return !view.canScrollUp();
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+	     // canScrollDown() is an example of a method you must implement
+        return !view.canScrollDown();
+    }
+});
+```
+
+### Effect Behavior Configuration
+
+```java
+/// Make over-scroll applied over a list-view feel more 'stiff'
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(view),
+        5f, // Default is 3
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK,
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_DECELERATE_FACTOR);
+                
+// Make over-scroll applied over a list-view bounce-back more softly
+new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(view),
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD,
+        VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK,
+        -1f // Default is -2
+        );
+```
+
+### Dynamic Effect Disabling
+
+As of version 1.0.4, the effect can be dynamically disabled (detached) and reenabled (attached) at runtime:
+
+```java
+IOverScrollDecor decor = OverScrollDecoratorHelper.setUpOverScroll(view);
+
+// Detach. You are strongly encouraged to only call this when overscroll isn't
+// in-effect: Either add getCurrentState()==STATE_IDLE as a precondition,
+// or use a state-change listener.
+decor.detach();
+// Attach.
+decor.attach();
+```
+
+`attach()` and `detach()` can be used repeatedly - as necessary, as can be seen in the demo project (refer to action-bar menu in recycler-view demo).
+
+## Credits
+
+App icons by <a href="http://somerandomdude.com/work/iconic/">P.J. Onori</a>,
+<a href="http://graphicriver.net/item/wirecons-vector-icons/4586710?ref=tmthymllr">Timothy Miller</a>,
+<a href="http://icons4android.com">Icons4Android</a>, 
+<a href="http://icons8.com/android-icons">Icons8.com</a>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/.gitignore b/OnTime_User_live/lib/overscroll-decor/app/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_User_live/lib/overscroll-decor/app/build.gradle b/OnTime_User_live/lib/overscroll-decor/app/build.gradle
new file mode 100755
index 0000000..74329bd
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion '29.0.3'
+
+    defaultConfig {
+        applicationId 'me.everything.overscrolldemo'
+        minSdkVersion 14
+        targetSdkVersion 30
+        versionCode 1
+        versionName '1.0'
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation project(':liboverscroll')
+//    implementation 'io.github.everythingme:overscroll-decor-android:1.1.1'
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/proguard-rules.pro b/OnTime_User_live/lib/overscroll-decor/app/proguard-rules.pro
new file mode 100755
index 0000000..8e4e143
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/amit/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/AndroidManifest.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..b452bdf
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="me.everything.overscrolldemo" >
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/app_icon"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name=".OverScrollDemoActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/OverScrollDemoActivity.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/OverScrollDemoActivity.java
new file mode 100755
index 0000000..3d162b5
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/OverScrollDemoActivity.java
@@ -0,0 +1,105 @@
+package me.everything.overscrolldemo;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import com.google.android.material.navigation.NavigationView;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import android.view.MenuItem;
+
+import me.everything.overscrolldemo.view.GridViewDemoFragment;
+import me.everything.overscrolldemo.view.ListViewDemoFragment;
+import me.everything.overscrolldemo.view.MiscViewsDemoFragment;
+import me.everything.overscrolldemo.view.NestedScrollViewDemoFragment;
+import me.everything.overscrolldemo.view.RecyclerViewDemoFragment;
+import me.everything.overscrolldemo.view.RecyclerViewStaggeredGridDemoFragment;
+import me.everything.overscrolldemo.view.ScrollViewDemoFragment;
+import me.everything.overscrolldemo.view.ViewPagerDemoFragment;
+
+public class OverScrollDemoActivity extends AppCompatActivity
+        implements NavigationView.OnNavigationItemSelectedListener {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_overscroll_demo);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        toolbar.setTitle(R.string.recycler_view_demo_title);
+        setSupportActionBar(toolbar);
+
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+        drawer.addDrawerListener(toggle);
+        toggle.syncState();
+
+        NavigationView navigationView = (NavigationView) findViewById(R.id.drawer_nav);
+        navigationView.setNavigationItemSelectedListener(this);
+
+        if (savedInstanceState == null) {
+            getSupportFragmentManager().beginTransaction()
+                    .add(R.id.fragment_placeholder, new RecyclerViewDemoFragment())
+                    .commit();
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        if (drawer.isDrawerOpen(GravityCompat.START)) {
+            drawer.closeDrawer(GravityCompat.START);
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+    @Override
+    public boolean onNavigationItemSelected(MenuItem item) {
+        final int id = item.getItemId();
+        item.setChecked(true);
+
+        switch (id) {
+            case R.id.drawer_item_recyclerview_demo:
+                replaceMainFragment(new RecyclerViewDemoFragment(), R.string.recycler_view_demo_title);
+                break;
+            case R.id.drawer_item_gridview_demo:
+                replaceMainFragment(new GridViewDemoFragment(), R.string.grid_view_demo_title);
+                break;
+            case R.id.drawer_item_listview_demo:
+                replaceMainFragment(new ListViewDemoFragment(), R.string.list_view_demo_title);
+                break;
+            case R.id.drawer_item_recyclerview_staggered_grid_demo:
+                replaceMainFragment(new RecyclerViewStaggeredGridDemoFragment(), R.string.recycler_view_staggered_grid_demo_title);
+                break;
+            case R.id.drawer_item_scrollview_demo:
+                replaceMainFragment(new ScrollViewDemoFragment(), R.string.scroll_view_demo_title);
+                break;
+            case R.id.drawer_item_viewpager_demo:
+                replaceMainFragment(new ViewPagerDemoFragment(),R.string.viewpager_demo_title);
+                break;
+            case R.id.drawer_item_nested_scrollview_demo:
+                replaceMainFragment(new NestedScrollViewDemoFragment(), R.string.nested_scrollview_demo_title);
+                break;
+            case R.id.drawer_item_misc_demo:
+                replaceMainFragment(new MiscViewsDemoFragment(), R.string.misc_views_demo_title);
+                break;
+        }
+
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        drawer.closeDrawer(GravityCompat.START);
+        return true;
+    }
+
+    private void replaceMainFragment(Fragment fragment, int titleResId) {
+        getSupportFragmentManager().beginTransaction()
+                .setCustomAnimations(R.animator.fade_in_slow, R.animator.fade_out_quick)
+                .replace(R.id.fragment_placeholder, fragment)
+                .commit();
+        getSupportActionBar().setTitle(titleResId);
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoContentHelper.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoContentHelper.java
new file mode 100755
index 0000000..87213f1
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoContentHelper.java
@@ -0,0 +1,52 @@
+package me.everything.overscrolldemo.control;
+
+import android.content.res.Resources;
+
+import java.util.Arrays;
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+
+public class DemoContentHelper {
+
+    private static List<DemoItem> sSpectrumItemsVioletToRed;
+    private static List<DemoItem> sSpectrumItemsRedToViolet;
+
+    public static List<DemoItem> getSpectrumItems(Resources res) {
+        if (sSpectrumItemsVioletToRed == null) {
+            sSpectrumItemsVioletToRed = Arrays.asList(
+                    new DemoItem(res.getColor(android.R.color.holo_purple), "PURPLE"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_dark), "BLUE"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_light), "LIGHT BLUE"),
+                    new DemoItem(res.getColor(R.color.spectrum_cyan), "CYAN"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_dark), "GREEN"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_light), "LIGHT GREEN"),
+                    new DemoItem(res.getColor(R.color.spectrum_yellow), "YELLOW"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_light), "LIGHT ORANGE"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_dark), "ORANGE"),
+                    new DemoItem(res.getColor(android.R.color.holo_red_light), "LIGHT RED"),
+                    new DemoItem(res.getColor(android.R.color.holo_red_dark), "RED")
+            );
+        }
+        return sSpectrumItemsVioletToRed;
+    }
+
+    public static List<DemoItem> getReverseSpectrumItems(Resources res) {
+        if (sSpectrumItemsRedToViolet == null) {
+            sSpectrumItemsRedToViolet = Arrays.asList(
+                    new DemoItem(res.getColor(android.R.color.holo_red_dark), "RED"),
+                    new DemoItem(res.getColor(android.R.color.holo_red_light), "LIGHT RED"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_dark), "ORANGE"),
+                    new DemoItem(res.getColor(android.R.color.holo_orange_light), "LIGHT ORANGE"),
+                    new DemoItem(res.getColor(R.color.spectrum_yellow), "YELLOW"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_light), "LIGHT GREEN"),
+                    new DemoItem(res.getColor(android.R.color.holo_green_dark), "GREEN"),
+                    new DemoItem(res.getColor(R.color.spectrum_cyan), "CYAN"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_light), "LIGHT BLUE"),
+                    new DemoItem(res.getColor(android.R.color.holo_blue_dark), "BLUE"),
+                    new DemoItem(res.getColor(android.R.color.holo_purple), "PURPLE")
+            );
+        }
+        return sSpectrumItemsRedToViolet;
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoItem.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoItem.java
new file mode 100755
index 0000000..c9927a5
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoItem.java
@@ -0,0 +1,32 @@
+package me.everything.overscrolldemo.control;
+
+public class DemoItem {
+
+    private int mColor;
+    private String mColorName;
+
+    public DemoItem() {
+    }
+
+    public DemoItem(int color, String colorName) {
+        mColorName = colorName;
+        mColor = color;
+    }
+
+    public int getColor() {
+        return mColor;
+    }
+
+    public void setColor(int color) {
+        mColor = color;
+    }
+
+    public String getColorName() {
+        return mColorName;
+    }
+
+    public void setColorName(String colorName) {
+        mColorName = colorName;
+    }
+
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoGridAdapter.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoGridAdapter.java
new file mode 100755
index 0000000..aa16470
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoGridAdapter.java
@@ -0,0 +1,25 @@
+package me.everything.overscrolldemo.view;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class DemoGridAdapter extends DemoListAdapterBase {
+
+    protected DemoGridAdapter(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoGridAdapter(LayoutInflater inflater, List<DemoItem> items) {
+        super(inflater, items);
+    }
+
+    @Override
+    protected DemoViewHolder createViewHolder(ViewGroup parent) {
+        return new DemoViewHolder(R.layout.grid_item, parent, mInflater);
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapter.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapter.java
new file mode 100755
index 0000000..58c8bfd
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapter.java
@@ -0,0 +1,25 @@
+package me.everything.overscrolldemo.view;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class DemoListAdapter extends DemoListAdapterBase {
+
+    protected DemoListAdapter(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoListAdapter(LayoutInflater inflater, List<DemoItem> items) {
+        super(inflater, items);
+    }
+
+    @Override
+    protected DemoViewHolder createViewHolder(ViewGroup parent) {
+        return new DemoViewHolder(R.layout.vertical_list_item, parent, mInflater);
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapterBase.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapterBase.java
new file mode 100755
index 0000000..cb322b0
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapterBase.java
@@ -0,0 +1,104 @@
+package me.everything.overscrolldemo.view;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.control.DemoItem;
+
+public abstract class DemoListAdapterBase extends BaseAdapter {
+
+    private static final int COLOR_VIEW_TYPE = 0;
+
+    public static class DemoViewHolder {
+
+        TextView mTextView;
+
+        public DemoViewHolder(int resId, ViewGroup parent, LayoutInflater inflater) {
+            mTextView = (TextView) inflater.inflate(resId, parent, false);
+            mTextView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Toast.makeText(mTextView.getContext(), "Tapped on: "+mTextView.getText(), Toast.LENGTH_SHORT).show();
+                }
+            });
+            mTextView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    Toast.makeText(mTextView.getContext(), "Long-tapped on: "+mTextView.getText(), Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            });
+        }
+
+        public void init(DemoItem item) {
+            mTextView.setText(item.getColorName());
+
+            int color = item.getColor();
+            mTextView.setBackgroundColor(color);
+        }
+
+        public View getView() {
+            return mTextView;
+        }
+    }
+
+    protected final LayoutInflater mInflater;
+    protected List<DemoItem> mItems;
+
+    protected DemoListAdapterBase(LayoutInflater inflater) {
+        mInflater = inflater;
+    }
+
+    public DemoListAdapterBase(LayoutInflater inflater, List<DemoItem> items) {
+        mInflater = inflater;
+        mItems = items;
+    }
+
+    public void setItems(List items) {
+        mItems = items;
+    }
+
+    @Override
+    public int getCount() {
+        return mItems.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return mItems.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+
+        DemoViewHolder holder;
+        if (convertView == null) {
+            holder = createViewHolder(parent);
+            holder.getView().setTag(holder);
+        } else {
+            holder = (DemoViewHolder) convertView.getTag();
+        }
+
+        holder.init((DemoItem) getItem(position));
+        return holder.getView();
+    }
+
+    protected abstract DemoViewHolder createViewHolder(ViewGroup parent);
+
+    @Override
+    public int getItemViewType(int position) {
+        return COLOR_VIEW_TYPE;
+    }
+
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterBase.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterBase.java
new file mode 100755
index 0000000..5e4eaf1
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterBase.java
@@ -0,0 +1,85 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.control.DemoItem;
+
+public abstract class DemoRecyclerAdapterBase extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private static final int COLOR_VIEW_TYPE = 0;
+
+    public static class DemoViewHolder extends RecyclerView.ViewHolder {
+
+        public DemoViewHolder(int resId, ViewGroup parent, LayoutInflater inflater) {
+            super(inflater.inflate(resId, parent, false));
+
+            getTextView().setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Toast.makeText(getTextView().getContext(), "Tapped on: "+getTextView().getText(), Toast.LENGTH_SHORT).show();
+                }
+            });
+            getTextView().setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    Toast.makeText(getTextView().getContext(), "Long-tapped on: "+getTextView().getText(), Toast.LENGTH_SHORT).show();
+                    return false;
+                }
+            });
+        }
+
+        public void init(DemoItem item) {
+            TextView textView = getTextView();
+            textView.setText(item.getColorName());
+
+            int color = item.getColor();
+            textView.setBackgroundColor(color);
+        }
+
+        private TextView getTextView() {
+            return (TextView) itemView;
+        }
+    }
+
+    protected final LayoutInflater mInflater;
+    protected List<DemoItem> mItems;
+
+    protected DemoRecyclerAdapterBase(LayoutInflater inflater) {
+        mInflater = inflater;
+    }
+
+    public DemoRecyclerAdapterBase(LayoutInflater inflater, List<DemoItem> items) {
+        mInflater = inflater;
+        mItems = items;
+    }
+
+    public void setItems(List items) {
+        mItems = items;
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        DemoItem item = mItems.get(position);
+
+        DemoViewHolder demoHolder = (DemoViewHolder) holder;
+        demoHolder.init(item);
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return COLOR_VIEW_TYPE;
+    }
+
+    @Override
+    public int getItemCount() {
+        return mItems.size();
+    }
+
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterHorizontal.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterHorizontal.java
new file mode 100755
index 0000000..88baed5
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterHorizontal.java
@@ -0,0 +1,28 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+
+public class DemoRecyclerAdapterHorizontal extends DemoRecyclerAdapterBase {
+
+    public DemoRecyclerAdapterHorizontal(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoRecyclerAdapterHorizontal(List items, LayoutInflater inflater) {
+        super(inflater, items);
+    }
+
+    @Override
+    @NonNull
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new DemoViewHolder(R.layout.horizontal_list_item, parent, mInflater);
+    }
+
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterVertical.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterVertical.java
new file mode 100755
index 0000000..4956e76
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterVertical.java
@@ -0,0 +1,27 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import java.util.List;
+
+import me.everything.overscrolldemo.R;
+
+public class DemoRecyclerAdapterVertical extends DemoRecyclerAdapterBase {
+
+    public DemoRecyclerAdapterVertical(LayoutInflater inflater) {
+        super(inflater);
+    }
+
+    public DemoRecyclerAdapterVertical(List items, LayoutInflater inflater) {
+        super(inflater, items);
+    }
+
+    @Override
+    @NonNull
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new DemoViewHolder(R.layout.vertical_list_item, parent, mInflater);
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/GridViewDemoFragment.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/GridViewDemoFragment.java
new file mode 100755
index 0000000..c93bab1
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/GridViewDemoFragment.java
@@ -0,0 +1,34 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.GridView;
+import android.widget.ListAdapter;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class GridViewDemoFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.gridview_overscroll_demo, null, false);
+        initVerticalGridView(DemoContentHelper.getSpectrumItems(getResources()), (GridView) fragmentView.findViewById(R.id.grid_view));
+        return fragmentView;
+    }
+
+    private void initVerticalGridView(List<DemoItem> content, GridView gridView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        ListAdapter adapter = new DemoGridAdapter(appInflater, content);
+        gridView.setAdapter(adapter);
+
+        OverScrollDecoratorHelper.setUpOverScroll(gridView);
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ListViewDemoFragment.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ListViewDemoFragment.java
new file mode 100755
index 0000000..d4b4f9d
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ListViewDemoFragment.java
@@ -0,0 +1,36 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class ListViewDemoFragment extends Fragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.listview_overscroll_demo, null, false);
+        initVerticalListView(DemoContentHelper.getSpectrumItems(getResources()), (ListView) fragmentView.findViewById(R.id.list_view));
+        return fragmentView;
+    }
+
+    private void initVerticalListView(List<DemoItem> content, ListView listView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        ListAdapter adapter = new DemoListAdapter(appInflater, content);
+        listView.setAdapter(adapter);
+
+        OverScrollDecoratorHelper.setUpOverScroll(listView);
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/MiscViewsDemoFragment.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/MiscViewsDemoFragment.java
new file mode 100755
index 0000000..bca35af
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/MiscViewsDemoFragment.java
@@ -0,0 +1,45 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Chronometer;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+
+public class MiscViewsDemoFragment extends Fragment {
+
+    private static final String CHRONO_TIME_SAVE_ID = "chronoTime";
+
+    private Chronometer mChrono;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.misc_overscroll_demo, null, false);
+
+        View textView = fragmentView.findViewById(R.id.demo_text);
+        OverScrollDecoratorHelper.setUpStaticOverScroll(textView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+
+        View imageView = fragmentView.findViewById(R.id.demo_image);
+        OverScrollDecoratorHelper.setUpStaticOverScroll(imageView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+
+        mChrono = (Chronometer) fragmentView.findViewById(R.id.demo_chronometer);
+        if (savedInstanceState != null) {
+            mChrono.setBase(savedInstanceState.getLong(CHRONO_TIME_SAVE_ID));
+        }
+        OverScrollDecoratorHelper.setUpStaticOverScroll(mChrono, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+        mChrono.start();
+
+        return fragmentView;
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putLong(CHRONO_TIME_SAVE_ID, mChrono.getBase());
+
+        super.onSaveInstanceState(outState);
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/NestedScrollViewDemoFragment.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/NestedScrollViewDemoFragment.java
new file mode 100755
index 0000000..f57d411
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/NestedScrollViewDemoFragment.java
@@ -0,0 +1,21 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+
+public class NestedScrollViewDemoFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final ScrollView rootView = (ScrollView) inflater.inflate(R.layout.nested_scrollview_demo, null, false);
+        OverScrollDecoratorHelper.setUpOverScroll(rootView);
+        return rootView;
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewDemoFragment.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewDemoFragment.java
new file mode 100755
index 0000000..ad656eb
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewDemoFragment.java
@@ -0,0 +1,190 @@
+package me.everything.overscrolldemo.view;
+
+import android.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+import me.everything.android.ui.overscroll.IOverScrollDecor;
+import me.everything.android.ui.overscroll.IOverScrollStateListener;
+import me.everything.android.ui.overscroll.IOverScrollUpdateListener;
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.adapters.RecyclerViewOverScrollDecorAdapter;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+
+public class RecyclerViewDemoFragment extends Fragment {
+
+    private TextView mHorizScrollMeasure;
+    private TextView mVertScrollMeasure;
+
+    private IOverScrollDecor mHorizOverScrollEffect;
+    private IOverScrollDecor mVertOverScrollEffect;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        setHasOptionsMenu(true);
+
+        View fragmentView = inflater.inflate(R.layout.recyclerview_overscroll_demo, null, false);
+
+        mHorizScrollMeasure = (TextView) fragmentView.findViewById(R.id.horizontal_scroll_measure);
+        mVertScrollMeasure = (TextView) fragmentView.findViewById(R.id.vertical_scroll_measure);
+
+        initHorizontalRecyclerView((RecyclerView) fragmentView.findViewById(R.id.horizontal_recycler_view));
+        initVerticalRecyclerView((RecyclerView) fragmentView.findViewById(R.id.vertical_recycler_view));
+        return fragmentView;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        final MenuItem detachMenuItem = menu.add("Detach over-scroll").setVisible(true);
+        final MenuItem attachMenuItem = menu.add("Attach over-scroll").setVisible(false);
+        detachMenuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                detachMenuItem.setVisible(false);
+                attachMenuItem.setVisible(true);
+                mHorizOverScrollEffect.detach();
+                mVertOverScrollEffect.detach();
+                return true;
+            }
+        });
+        attachMenuItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem item) {
+                detachMenuItem.setVisible(true);
+                attachMenuItem.setVisible(false);
+                initHorizontalRecyclerView((RecyclerView) getView().findViewById(R.id.horizontal_recycler_view));
+                initVerticalRecyclerView((RecyclerView) getView().findViewById(R.id.vertical_recycler_view));
+                return true;
+            }
+        });
+
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    private void initHorizontalRecyclerView(RecyclerView recyclerView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        RecyclerView.Adapter adapter = new DemoRecyclerAdapterHorizontal(DemoContentHelper.getSpectrumItems(getResources()), appInflater);
+        recyclerView.setAdapter(adapter);
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false));
+
+        // Apply over-scroll in 'standard form' - i.e. using the helper.
+        mHorizOverScrollEffect = OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_HORIZONTAL);
+
+        // Over-scroll listeners can be applied in standard form as well.
+        mHorizOverScrollEffect.setOverScrollUpdateListener(new IOverScrollUpdateListener() {
+            @Override
+            public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) {
+                mHorizScrollMeasure.setText(String.valueOf((int) offset));
+            }
+        });
+        mHorizOverScrollEffect.setOverScrollStateListener(new IOverScrollStateListener() {
+
+            private final int mDragColorLeft = getResources().getColor(android.R.color.holo_purple);
+            private final int mBounceBackColorLeft = getResources().getColor(android.R.color.holo_blue_light);
+            private final int mDragColorRight = getResources().getColor(android.R.color.holo_red_light);
+            private final int mBounceBackColorRight = getResources().getColor(android.R.color.holo_orange_dark);
+            private final int mClearColor = mHorizScrollMeasure.getCurrentTextColor();
+
+            @Override
+            public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) {
+                if (newState == STATE_DRAG_START_SIDE) {
+                    mHorizScrollMeasure.setTextColor(mDragColorLeft);
+                } else if (newState == STATE_DRAG_END_SIDE) {
+                    mHorizScrollMeasure.setTextColor(mDragColorRight);
+                } else if (newState == STATE_BOUNCE_BACK) {
+                    mHorizScrollMeasure.setTextColor((oldState == STATE_DRAG_START_SIDE) ? mBounceBackColorLeft : mBounceBackColorRight);
+                } else {
+                    mHorizScrollMeasure.setTextColor(mClearColor);
+                }
+            }
+        });
+    }
+
+    private void initVerticalRecyclerView(RecyclerView recyclerView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        final DemoRecyclerAdapterBase adapter = new DemoRecyclerAdapterVertical(new ArrayList<>(DemoContentHelper.getReverseSpectrumItems(getResources())), appInflater);
+        recyclerView.setAdapter(adapter);
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+
+        // Set-up of recycler-view's native item swiping.
+        ItemTouchHelper.Callback itemTouchHelperCallback = new ItemTouchHelper.Callback() {
+            @Override
+            public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+                return makeMovementFlags(0, ItemTouchHelper.RIGHT);
+            }
+
+            @Override
+            public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+                return false;
+            }
+
+            @Override
+            public void onSwiped(final RecyclerView.ViewHolder viewHolder, int direction) {
+                AlertDialog dialog = new AlertDialog.Builder(getActivity())
+                        .setTitle("Item swiping is supported!")
+                        .setMessage("Recycler-view's native item swiping and the over-scrolling effect can co-exist! But, to get them to work WELL -- please apply the effect using the dedicated helper method!")
+                        .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                adapter.notifyDataSetChanged();
+                            }
+                        })
+                        .create();
+                dialog.show();
+            }
+        };
+
+        // Apply over-scroll in 'advanced form' - i.e. create an instance manually.
+        mVertOverScrollEffect = new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView, itemTouchHelperCallback));
+
+        // Over-scroll listeners are applied here via the mVertOverScrollEffect explicitly.
+        mVertOverScrollEffect.setOverScrollUpdateListener(new IOverScrollUpdateListener() {
+            @Override
+            public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) {
+                mVertScrollMeasure.setText(String.valueOf((int) offset));
+            }
+        });
+        mVertOverScrollEffect.setOverScrollStateListener(new IOverScrollStateListener() {
+            private final int mDragColorTop = getResources().getColor(android.R.color.holo_red_light);
+            private final int mBounceBackColorTop = getResources().getColor(android.R.color.holo_orange_dark);
+            private final int mDragColorBottom = getResources().getColor(android.R.color.holo_purple);
+            private final int mBounceBackColorBottom = getResources().getColor(android.R.color.holo_blue_light);
+            private final int mClearColor = mHorizScrollMeasure.getCurrentTextColor();
+
+            @Override
+            public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) {
+                if (newState == STATE_DRAG_START_SIDE) {
+                    mVertScrollMeasure.setTextColor(mDragColorTop);
+                } else if (newState == STATE_DRAG_END_SIDE) {
+                    mVertScrollMeasure.setTextColor(mDragColorBottom);
+                } else if (newState == STATE_BOUNCE_BACK) {
+                    mVertScrollMeasure.setTextColor(oldState == STATE_DRAG_START_SIDE ? mBounceBackColorTop : mBounceBackColorBottom);
+                } else {
+                    mVertScrollMeasure.setTextColor(mClearColor);
+                }
+            }
+        });
+    }
+
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewStaggeredGridDemoFragment.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewStaggeredGridDemoFragment.java
new file mode 100755
index 0000000..bbbc314
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewStaggeredGridDemoFragment.java
@@ -0,0 +1,39 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import java.util.ArrayList;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+
+public class RecyclerViewStaggeredGridDemoFragment extends Fragment {
+
+    private static final int GRID_SPAN_COUNT = 2;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.recyclerview_stgrid_overscroll_demo, null, false);
+        initVerticalRecyclerView((RecyclerView) fragmentView.findViewById(R.id.vertical_recycler_view));
+        return fragmentView;
+    }
+
+    private void initVerticalRecyclerView(RecyclerView recyclerView) {
+        LayoutInflater appInflater = LayoutInflater.from(getActivity().getApplicationContext());
+        final DemoRecyclerAdapterBase adapter = new DemoRecyclerAdapterVertical(new ArrayList<>(DemoContentHelper.getReverseSpectrumItems(getResources())), appInflater);
+        recyclerView.setAdapter(adapter);
+
+        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(GRID_SPAN_COUNT, StaggeredGridLayoutManager.VERTICAL));
+        OverScrollDecoratorHelper.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
+    }
+
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ScrollViewDemoFragment.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ScrollViewDemoFragment.java
new file mode 100755
index 0000000..2557eb2
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ScrollViewDemoFragment.java
@@ -0,0 +1,34 @@
+package me.everything.overscrolldemo.view;
+
+import androidx.fragment.app.Fragment;
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.HorizontalScrollView;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+
+public class ScrollViewDemoFragment extends Fragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.scrollview_overscroll_demo, null, false);
+        initHorizontalScrollView((HorizontalScrollView) fragmentView.findViewById(R.id.horizontal_scroll_view));
+        initVerticalScrollView((ScrollView) fragmentView.findViewById(R.id.vertical_scroll_view));
+        return fragmentView;
+    }
+
+    private void initHorizontalScrollView(HorizontalScrollView scrollView) {
+        OverScrollDecoratorHelper.setUpOverScroll(scrollView);
+    }
+
+    private void initVerticalScrollView(ScrollView scrollView) {
+        OverScrollDecoratorHelper.setUpOverScroll(scrollView);
+    }
+
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ViewPagerDemoFragment.java b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ViewPagerDemoFragment.java
new file mode 100755
index 0000000..fd81c12
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ViewPagerDemoFragment.java
@@ -0,0 +1,78 @@
+package me.everything.overscrolldemo.view;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
+import me.everything.overscrolldemo.R;
+import me.everything.overscrolldemo.control.DemoContentHelper;
+import me.everything.overscrolldemo.control.DemoItem;
+
+public class ViewPagerDemoFragment extends Fragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.viewpager_overscroll_demo,null,false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        initHorizontalViewPager(DemoContentHelper.getSpectrumItems(getResources()), ((ViewPager) view.findViewById(R.id.view_pager)));
+    }
+
+    private void initHorizontalViewPager(List<DemoItem> items, ViewPager viewPager) {
+
+        ViewPagerAdapter adapter = new ViewPagerAdapter(items);
+        viewPager.setAdapter(adapter);
+        OverScrollDecoratorHelper.setUpOverScroll(viewPager);
+    }
+
+    public static class ViewPagerAdapter extends PagerAdapter{
+
+        private List<DemoItem> items;
+        public ViewPagerAdapter(List<DemoItem> items){
+            this.items = items;
+        }
+
+        @Override
+        public int getCount() {
+            return items.size();
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object object) {
+            return view == object;
+        }
+
+        @Override
+        @NonNull
+        public Object instantiateItem(ViewGroup container, int position) {
+            TextView textView = new TextView(container.getContext());
+            textView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+            textView.setText(items.get(position).getColorName());
+            textView.setBackgroundColor(items.get(position).getColor());
+            textView.setGravity(Gravity.CENTER);
+            container.addView(textView);
+            return textView;
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            container.removeView((View) object);
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/animator/fade_in_slow.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/animator/fade_in_slow.xml
new file mode 100755
index 0000000..aa48445
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/animator/fade_in_slow.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/linear"
+    android:valueFrom="0.0"
+    android:valueTo="1.0"
+    android:propertyName="alpha"
+    android:duration="500"
+    />
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/animator/fade_out_quick.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/animator/fade_out_quick.xml
new file mode 100755
index 0000000..ea03297
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/animator/fade_out_quick.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/linear"
+    android:valueFrom="1.0"
+    android:valueTo="0.0"
+    android:propertyName="alpha"
+    android:duration="80"
+    />
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/color/drawer_items_text.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/color/drawer_items_text.xml
new file mode 100755
index 0000000..1c5b9ac
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/color/drawer_items_text.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:color="@android:color/white"
+        android:state_checked="true"
+        />
+    <item android:color="@android:color/darker_gray"/>
+</selector>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/app_icon.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/app_icon.png
new file mode 100755
index 0000000..1a06c30
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/app_icon.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_grid.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_grid.png
new file mode 100755
index 0000000..f1f6910
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_grid.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_list.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_list.png
new file mode 100755
index 0000000..1748953
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_list.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_misc.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_misc.png
new file mode 100755
index 0000000..60e5851
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_misc.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_recycler.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_recycler.png
new file mode 100755
index 0000000..be5e74d
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_recycler.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_scroller.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_scroller.png
new file mode 100755
index 0000000..43dd039
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_scroller.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_view_pager.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_view_pager.png
new file mode 100755
index 0000000..8003b4f
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_view_pager.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/app_icon.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/app_icon.png
new file mode 100755
index 0000000..b2d0ecd
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/app_icon.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_grid.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_grid.png
new file mode 100755
index 0000000..2ed88db
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_grid.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_list.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_list.png
new file mode 100755
index 0000000..43bd9d1
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_list.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_misc.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_misc.png
new file mode 100755
index 0000000..8a70585
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_misc.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_recycler.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_recycler.png
new file mode 100755
index 0000000..24826a0
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_recycler.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_scroller.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_scroller.png
new file mode 100755
index 0000000..a48a974
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_scroller.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_view_pager.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_view_pager.png
new file mode 100755
index 0000000..c7fcd53
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_view_pager.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/app_icon.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/app_icon.png
new file mode 100755
index 0000000..cb9e95e
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/app_icon.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_grid.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_grid.png
new file mode 100755
index 0000000..2ed2556
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_grid.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_list.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_list.png
new file mode 100755
index 0000000..52e0e49
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_list.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_misc.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_misc.png
new file mode 100755
index 0000000..d64883a
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_misc.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_recycler.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_recycler.png
new file mode 100755
index 0000000..7bf67b2
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_recycler.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_scroller.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_scroller.png
new file mode 100755
index 0000000..57689f0
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_scroller.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_view_pager.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_view_pager.png
new file mode 100755
index 0000000..61ec65e
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_view_pager.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/app_icon.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/app_icon.png
new file mode 100755
index 0000000..ff550d4
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/app_icon.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_grid.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_grid.png
new file mode 100755
index 0000000..051283b
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_grid.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_list.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_list.png
new file mode 100755
index 0000000..d24bc35
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_list.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_misc.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_misc.png
new file mode 100755
index 0000000..88eed60
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_misc.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_recycler.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_recycler.png
new file mode 100755
index 0000000..02291e8
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_recycler.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_scroller.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_scroller.png
new file mode 100755
index 0000000..cc3d3b1
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_scroller.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_view_pager.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_view_pager.png
new file mode 100755
index 0000000..edb43dc
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_view_pager.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/app_icon.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/app_icon.png
new file mode 100755
index 0000000..f9b9466
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/app_icon.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_grid.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_grid.png
new file mode 100755
index 0000000..003d111
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_grid.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_list.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_list.png
new file mode 100755
index 0000000..a499fff
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_list.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_misc.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_misc.png
new file mode 100755
index 0000000..c40b9fb
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_misc.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_recycler.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_recycler.png
new file mode 100755
index 0000000..17bd8fa
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_recycler.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_scroller.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_scroller.png
new file mode 100755
index 0000000..96d5ce4
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_scroller.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_view_pager.png b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_view_pager.png
new file mode 100755
index 0000000..e179580
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_view_pager.png differ
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_header_bkg.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_header_bkg.xml
new file mode 100755
index 0000000..99cea19
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_header_bkg.xml
@@ -0,0 +1,10 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <gradient
+        android:startColor="@android:color/holo_red_dark"
+        android:centerColor="@android:color/holo_green_light"
+        android:endColor="@android:color/holo_blue_dark"
+        android:type="linear"
+        android:angle="135"
+        />
+</shape>
\ No newline at end of file
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_items_bkg.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_items_bkg.xml
new file mode 100755
index 0000000..b8d7c41
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/drawable/drawer_items_bkg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@android:color/darker_gray"
+        android:state_checked="true"
+        />
+</selector>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo.xml
new file mode 100755
index 0000000..963e14f
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.drawerlayout.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start"
+    >
+
+    <include layout="@layout/activity_overscroll_demo_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/drawer_nav"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+
+        app:headerLayout="@layout/drawer_header_overscroll_demo"
+        app:menu="@menu/activity_overscroll_demo_drawer_items"
+
+        app:itemBackground="@drawable/drawer_items_bkg"
+        />
+
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo_content.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo_content.xml
new file mode 100755
index 0000000..d860284
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo_content.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".OverscrollDemo"
+    >
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:theme="@style/AppTheme.AppBarOverlay"
+        >
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/fragment_placeholder"
+        android:layout_below="@id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        />
+
+</RelativeLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/drawer_header_overscroll_demo.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/drawer_header_overscroll_demo.xml
new file mode 100755
index 0000000..a8a57cc
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/drawer_header_overscroll_demo.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/nav_header_height"
+    android:background="@color/colorPrimary"
+    android:padding="16dp"
+    android:theme="@style/ThemeOverlay.AppCompat.Dark"
+    android:orientation="horizontal"
+    android:gravity="fill_horizontal"
+    >
+
+    <ImageView
+        android:layout_height="64dp"
+        android:layout_width="64dp"
+        android:src="@drawable/app_icon"
+        android:layout_gravity="center_vertical"
+        />
+
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:gravity="center_vertical"
+        android:paddingLeft="16dp"
+        >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:text="@string/drawer_title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+            android:textSize="18dp"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/drawer_subtitle"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/grid_item.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/grid_item.xml
new file mode 100755
index 0000000..130584a
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/grid_item.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_width="match_parent"
+    android:layout_height="200dp"
+    android:textSize="30dp"
+    android:textColor="@android:color/black"
+    android:gravity="center"
+    />
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/gridview_overscroll_demo.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/gridview_overscroll_demo.xml
new file mode 100755
index 0000000..b0f93e1
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/gridview_overscroll_demo.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/vert_drag_label"
+        android:lines="1"
+        />
+    <!--
+      When over-scrolling is applied over views that don't stretch over the entire vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:layout_weight="1"
+        >
+        <GridView
+            android:id="@+id/grid_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:numColumns="auto_fit"
+            android:stretchMode="columnWidth"
+            android:verticalSpacing="10dp"
+            android:horizontalSpacing="10dp"
+            android:gravity="center"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/horizontal_list_item.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/horizontal_list_item.xml
new file mode 100755
index 0000000..8b9fa98
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/horizontal_list_item.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_height="match_parent"
+    android:layout_width="100dp"
+    android:paddingTop="20dp"
+    android:paddingBottom="20dp"
+    android:paddingLeft="5dp"
+    android:paddingRight="5dp"
+    android:textSize="18dp"
+    android:textColor="@android:color/black"
+    android:gravity="center"
+    />
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/list_item.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/list_item.xml
new file mode 100755
index 0000000..53d3109
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/list_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="20dp"
+    android:paddingBottom="20dp"
+    android:textSize="40dp"
+    android:gravity="center"
+    android:clickable="true"
+    android:background="@android:color/black"
+    />
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/listview_overscroll_demo.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/listview_overscroll_demo.xml
new file mode 100755
index 0000000..d2dcc87
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/listview_overscroll_demo.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/vert_drag_label"
+        android:lines="1"
+        />
+    <!--
+      When over-scrolling is applied over views that don't stretch over the entire vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:layout_weight="1"
+        >
+        <ListView
+            android:id="@+id/list_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/misc_overscroll_demo.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/misc_overscroll_demo.xml
new file mode 100755
index 0000000..9c86bf9
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/misc_overscroll_demo.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:id="@+id/demo_text"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:clickable="true"
+        android:text="Practically any clickable widget can be over-scrolled.\nTry it!"
+        android:textSize="30sp"
+        android:layout_gravity="center"
+        android:gravity="center"
+        />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        >
+        <ImageView
+            android:id="@+id/demo_image"
+            android:layout_width="128dp"
+            android:layout_height="128dp"
+            android:layout_gravity="center"
+            android:clickable="true"
+            android:background="@drawable/app_icon"
+            />
+    </FrameLayout>
+
+    <Chronometer
+        android:id="@+id/demo_chronometer"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:textSize="30sp"
+        />
+
+</LinearLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/nested_scrollview_demo.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/nested_scrollview_demo.xml
new file mode 100755
index 0000000..0f7b172
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/nested_scrollview_demo.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbars="none"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center_horizontal"
+        >
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/nested_scrollview_root"
+            android:layout_width="match_parent"
+            android:layout_height="180dp"
+            android:padding="14dp"
+            android:paddingTop="0dp"
+            >
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/nested_scrollview_text"
+                android:textSize="19sp"
+                android:textStyle="bold"
+                />
+        </androidx.core.widget.NestedScrollView>
+
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+        <include layout="@layout/scrollview_vertical_item"/>
+    </LinearLayout>
+
+</ScrollView>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_overscroll_demo.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_overscroll_demo.xml
new file mode 100755
index 0000000..7ef1872
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_overscroll_demo.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+        <TextView
+            android:id="@+id/horizontal_recycler_view_header"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:textSize="@dimen/default_label_size"
+            android:text="@string/horiz_drag_label"
+            android:lines="1"
+            />
+        <TextView
+            android:id="@+id/horizontal_scroll_measure"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:textSize="@dimen/default_subtitle_size"
+            android:text="0"
+            android:textStyle="bold"
+            />
+    </LinearLayout>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/horizontal_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:layout_weight="3"
+        />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+        <TextView
+            android:id="@+id/vertical_recycler_view_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:textSize="@dimen/default_label_size"
+            android:text="@string/vert_drag_label"
+            android:lines="1"
+            />
+        <TextView
+            android:id="@+id/vertical_scroll_measure"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:textSize="@dimen/default_subtitle_size"
+            android:text="0"
+            android:textStyle="bold"
+            />
+    </LinearLayout>
+    <!--
+      When over-scrolling is applied over views that don't stretch though the full vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:layout_weight="7"
+        >
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/vertical_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_stgrid_overscroll_demo.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_stgrid_overscroll_demo.xml
new file mode 100755
index 0000000..9374ae6
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/recyclerview_stgrid_overscroll_demo.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:id="@+id/vertical_recycler_view_header"
+        >
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:textSize="@dimen/default_label_size"
+            android:text="@string/vert_drag_label"
+            android:lines="1"
+            />
+    </LinearLayout>
+    <!--
+      When over-scrolling is applied over views that don't stretch though the full vertical region,
+      an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+      in effect.
+      -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="10dp"
+        >
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/vertical_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            />
+    </FrameLayout>
+</LinearLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_horizontal_item.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_horizontal_item.xml
new file mode 100755
index 0000000..b211fd8
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_horizontal_item.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:layout_marginRight="20dp"
+    >
+
+    <ImageView
+        android:layout_height="64dp"
+        android:layout_width="64dp"
+        android:src="@drawable/app_icon"
+        android:layout_gravity="center"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="EverythingMe"
+        />
+
+</LinearLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_overscroll_demo.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_overscroll_demo.xml
new file mode 100755
index 0000000..909b58f
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_overscroll_demo.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/horiz_drag_label"
+        android:lines="1"
+        />
+    <HorizontalScrollView
+        android:id="@+id/horizontal_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:layout_weight="3"
+        >
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            >
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+            <include layout="@layout/scrollview_horizontal_item"/>
+        </LinearLayout>
+    </HorizontalScrollView>
+
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="@dimen/default_label_size"
+        android:text="@string/vert_drag_label"
+        android:lines="1"
+        />
+
+    <!--
+     When over-scrolling is applied over views that don't stretch over the full vertical region,
+     an artificial parent must be introduced so that bounds are clipped while over-scrolling is
+     in effect.
+     -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:paddingTop="10dp"
+        android:layout_weight="7"
+        >
+        <ScrollView
+            android:id="@+id/vertical_scroll_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                >
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+                <include layout="@layout/scrollview_vertical_item"/>
+            </LinearLayout>
+        </ScrollView>
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_vertical_item.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_vertical_item.xml
new file mode 100755
index 0000000..b059e38
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/scrollview_vertical_item.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginBottom="10dp"
+    >
+
+    <ImageView
+        android:layout_height="64dp"
+        android:layout_width="64dp"
+        android:src="@drawable/app_icon"
+        />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:text="EverythingMe"
+        android:textSize="21dp"
+        android:gravity="left|center_vertical"
+        android:layout_gravity="center"
+        />
+
+</LinearLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/vert_recycler.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/vert_recycler.xml
new file mode 100755
index 0000000..d0da0f3
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/vert_recycler.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:showIn="@layout/app_bar_overscroll_demo"
+    tools:context=".OverscrollDemo"
+    >
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
+
+    </androidx.recyclerview.widget.RecyclerView>
+
+</RelativeLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/vertical_list_item.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/vertical_list_item.xml
new file mode 100755
index 0000000..adbd570
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/vertical_list_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/color_name"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="20dp"
+    android:paddingBottom="20dp"
+    android:textSize="40dp"
+    android:textColor="@android:color/black"
+    android:gravity="center"
+    />
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/viewpager_overscroll_demo.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/viewpager_overscroll_demo.xml
new file mode 100755
index 0000000..400fa2f
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/layout/viewpager_overscroll_demo.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    >
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/menu/activity_overscroll_demo_drawer_items.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/menu/activity_overscroll_demo_drawer_items.xml
new file mode 100755
index 0000000..c74bb49
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/menu/activity_overscroll_demo_drawer_items.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <group
+        android:checkableBehavior="single">
+
+        <item
+            android:id="@+id/drawer_item_recyclerview_demo"
+            android:icon="@drawable/ic_recycler"
+            android:title="RecyclerView Demo"
+            android:checked="true"
+            />
+        <item
+            android:id="@+id/drawer_item_recyclerview_staggered_grid_demo"
+            android:icon="@drawable/ic_recycler"
+            android:title="RecyclerView - St.Grid Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_gridview_demo"
+            android:icon="@drawable/ic_grid"
+            android:title="GridView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_listview_demo"
+            android:icon="@drawable/ic_list"
+            android:title="ListView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_scrollview_demo"
+            android:icon="@drawable/ic_scroller"
+            android:title="ScrollView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_viewpager_demo"
+            android:icon="@drawable/ic_view_pager"
+            android:title="ViewPager Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_nested_scrollview_demo"
+            android:title="NestedScrollView Demo"
+            />
+        <item
+            android:id="@+id/drawer_item_misc_demo"
+            android:icon="@drawable/ic_misc"
+            android:title="Misc-Views Demo"
+            />
+
+    </group>
+
+</menu>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values-v21/styles.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values-v21/styles.xml
new file mode 100755
index 0000000..65d0c39
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,8 @@
+<resources>>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values-w820dp/dimens.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values-w820dp/dimens.xml
new file mode 100755
index 0000000..63fc816
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/colors.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/colors.xml
new file mode 100755
index 0000000..bf11420
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/colors.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">@android:color/holo_orange_light</color>
+    <color name="colorPrimaryDark">@android:color/holo_orange_dark</color>
+    <color name="colorAccent">#FF4081</color>
+
+    <color name="spectrum_cyan">#00e0e0</color>
+    <color name="spectrum_yellow">#f0e000</color>
+</resources>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/dimens.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/dimens.xml
new file mode 100755
index 0000000..730a34b
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/dimens.xml
@@ -0,0 +1,9 @@
+<resources>
+    <dimen name="nav_header_vertical_spacing">16dp</dimen>
+    <dimen name="nav_header_height">140dp</dimen>
+
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="default_label_size">26sp</dimen>
+    <dimen name="default_subtitle_size">22sp</dimen>
+</resources>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/strings.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/strings.xml
new file mode 100755
index 0000000..6fb15cf
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/strings.xml
@@ -0,0 +1,23 @@
+<resources>
+    <string name="app_name">OverscrollDemo</string>
+
+    <string name="drawer_title">Over-Scroll Demo App</string>
+    <string name="drawer_subtitle">EverythingMe</string>
+
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+
+    <string name="grid_view_demo_title">GridView Over-Scroll Demo</string>
+    <string name="list_view_demo_title">ListView Over-Scroll Demo</string>
+    <string name="recycler_view_demo_title">RecyclerView Over-Scroll Demo</string>
+    <string name="recycler_view_staggered_grid_demo_title">RecyclerView St.Grid Over-Scroll Demo</string>
+    <string name="scroll_view_demo_title">ScrollView Over-Scroll Demo</string>
+    <string name="viewpager_demo_title">ViewPager Over-Scroll Demo</string>
+    <string name="nested_scrollview_demo_title">NestedScrollView Over-Scroll Demo</string>
+    <string name="misc_views_demo_title">Misc. Over-Scroll Demo</string>
+    <string name="nested_scrollview_text">This text box is scrollable thanks to being situated inside a nested scroll view. That makes it scrollable regardless of the scrolling of the content of the entire screen, which can be scrolled independently.\nThe point here is to demonstrate how the over-scroll effect can work in the presence of nested scroll-views, provided it is applied over the parent (root) view, regardless of having inner nested scroll-views as children.\nIn this demo, the root view is merely a ScrollView, and therefore applying the effect over it is straightforward (i.e. using the OverScrollHelper).</string>
+
+    <string name="horiz_drag_label">⇔ Drag Horizontally</string>
+    <string name="vert_drag_label">⇳ Drag Vertically</string>
+
+</resources>
diff --git a/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/styles.xml b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/styles.xml
new file mode 100755
index 0000000..44f664f
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/app/src/main/res/values/styles.xml
@@ -0,0 +1,17 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+</resources>
diff --git a/OnTime_User_live/lib/overscroll-decor/build.gradle b/OnTime_User_live/lib/overscroll-decor/build.gradle
new file mode 100755
index 0000000..6270b01
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/build.gradle
@@ -0,0 +1,26 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext {
+        _isOverscrollDecor = true
+    }
+
+    repositories {
+        mavenCentral()
+        google()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.0.2'
+    }
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+        google()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/gradle.properties b/OnTime_User_live/lib/overscroll-decor/gradle.properties
new file mode 100755
index 0000000..915f0e6
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/gradle.properties
@@ -0,0 +1,20 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# 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.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/OnTime_User_live/lib/overscroll-decor/gradle/wrapper/gradle-wrapper.properties b/OnTime_User_live/lib/overscroll-decor/gradle/wrapper/gradle-wrapper.properties
new file mode 100755
index 0000000..5a4891d
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Mar 02 14:56:48 WIB 2026
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/OnTime_User_live/lib/overscroll-decor/gradlew b/OnTime_User_live/lib/overscroll-decor/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/.gitignore b/OnTime_User_live/lib/overscroll-decor/liboverscroll/.gitignore
new file mode 100755
index 0000000..796b96d
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/build.gradle b/OnTime_User_live/lib/overscroll-decor/liboverscroll/build.gradle
new file mode 100755
index 0000000..755b956
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/build.gradle
@@ -0,0 +1,33 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'me.everything.android.ui.overscroll'
+    compileSdk 33
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName '1.0'
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:3.1.0'
+    testImplementation 'org.robolectric:robolectric:4.3.1'
+}
+
+// Enable publishing
+if (rootProject.hasProperty('_isOverscrollDecor')) {
+    apply from: './publishing.gradle'
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/publish-pom.gradle b/OnTime_User_live/lib/overscroll-decor/liboverscroll/publish-pom.gradle
new file mode 100755
index 0000000..0710b48
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/publish-pom.gradle
@@ -0,0 +1,39 @@
+// Based on https://stackoverflow.com/a/42160584/453052
+
+project.ext.buildPomXmlDependencies = { pom, configurations ->
+    pom.withXml {
+        final rootNode = asNode().appendNode('dependencies')
+        addConfigurationDependencies(rootNode, configurations.api, 'compile')
+        addConfigurationDependencies(rootNode, configurations.compile, 'compile')
+        addConfigurationDependencies(rootNode, configurations.implementation, 'runtime')
+    }
+}
+
+private static def addConfigurationDependencies(rootNode, Configuration configuration, String scope) {
+    configuration.dependencies.each { dep -> addChildDependency(rootNode, dep, scope) }
+}
+
+private static def addChildDependency(rootNode, Dependency dep, String scope) {
+    if (dep.group == null || dep.version == null || dep.name == null || dep.name == "unspecified")
+        return
+
+    final childNode = rootNode.appendNode('dependency')
+    childNode.appendNode('groupId', dep.group)
+    childNode.appendNode('artifactId', dep.name)
+    childNode.appendNode('version', dep.version)
+    childNode.appendNode('scope', scope)
+
+    if (!dep.transitive) {
+        // If this dependency is transitive, we should force exclude all its dependencies them from the POM
+        final exclusionNode = childNode.appendNode('exclusions').appendNode('exclusion')
+        exclusionNode.appendNode('groupId', '*')
+        exclusionNode.appendNode('artifactId', '*')
+    } else if (!dep.properties.excludeRules.empty) {
+        // Otherwise add specified exclude rules
+        final exclusionNode = childNode.appendNode('exclusions').appendNode('exclusion')
+        dep.properties.excludeRules.each { ExcludeRule rule ->
+            exclusionNode.appendNode('groupId', rule.group ?: '*')
+            exclusionNode.appendNode('artifactId', rule.module ?: '*')
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/publishing.gradle b/OnTime_User_live/lib/overscroll-decor/liboverscroll/publishing.gradle
new file mode 100755
index 0000000..1eafeda
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/publishing.gradle
@@ -0,0 +1,205 @@
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+apply from: './publish-pom.gradle'
+
+String TARGET_MAVEN_CENTRAL_URL = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
+
+List DEVELOPERS = [
+    [name: 'd4vidi', email: 'amit.d4vidi@gmail.com'],
+]
+
+String _sonatypeUsername = 'd4vidi'
+String _sonatypePassword = System.getProperty('sonatypePassword')
+String _versionName = System.getProperty('version')
+String _mavenRepoUrl = TARGET_MAVEN_CENTRAL_URL
+Map _mavenCredentials = [
+        username: _sonatypeUsername,
+        password: _sonatypePassword,
+]
+def _selectedVariant = null
+
+def onPrePublish = {
+    assertDefined(_versionName, "Publishing: Version not specified (run 'gradle publish' with a -Dversion=1.2.3 argument)")
+    assertDefined(_sonatypePassword, "Publishing: Please specify the password to use for sonatype (run 'gradle publish' with a -DsonatypePassword=<pw> argument)")
+    logger.lifecycle("Publishing is now in session! 📣\n  Version: $_versionName\n  Target URL: ${_mavenRepoUrl}\n  Build-variant: '${_selectedVariant.name}'")
+}
+
+def declareArchive = { target ->
+    project.artifacts {
+        archives target
+    }
+}
+
+// Running from Gradle tab in IDE would create liboverscroll/build/libs/liboverscroll-sources.jar
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+
+task javadoc(type: Javadoc) {
+    failOnError false
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+// Running from Gradle tab in IDE would create liboverscroll/build/libs/liboverscroll-javadoc.jar
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+/*
+ * Signing configuration
+ * https://docs.gradle.org/current/userguide/signing_plugin.html
+ */
+
+// Tell signing task to sign everything current and future we set as a project archive...
+signing {
+    sign configurations.archives
+}
+
+/*
+ * Plumbing work for actually having the publishing task work properly, if executed
+ */
+
+project.afterEvaluate {
+    project.tasks.all { Task task ->
+        android.libraryVariants.all { variant ->
+            String variantName = variant.name.capitalize()
+            if (task.name == "publishMaven${variantName}AarPublicationToMavenRepository") {
+                task.dependsOn "assemble${variantName}"
+                task.dependsOn project.tasks.signArchives
+                task.doFirst {
+                    onPrePublish()
+                }
+            }
+        }
+    }
+}
+
+/*
+ * Publishing configuration
+ */
+
+publishing {
+    repositories {
+        maven {
+            url _mavenRepoUrl
+            if (_mavenCredentials != null) {
+                credentials {
+                    username _mavenCredentials.username
+                    password _mavenCredentials.password
+                }
+            }
+        }
+    }
+
+    publications {
+        android.libraryVariants.all { variant ->
+            if (isReleaseVariant(variant)) {
+                _selectedVariant = variant
+
+                String variantNameCapitalized = variant.name.capitalize()
+
+                "maven${variantNameCapitalized}Aar"(MavenPublication) {
+                    groupId 'io.github.everythingme'
+                    artifactId 'overscroll-decor-android'
+                    version "$_versionName"
+
+                    // Register built .aar as published artifact (as a file, explicitly)
+                    variant.outputs.forEach { output ->
+                        artifact output.outputFile
+
+                        // Also register as an archive-artifact, for signing (via equivalent task's output)
+                        declareArchive project.tasks["bundle${variantNameCapitalized}Aar"]
+                    }
+
+                    // Register sources, javadoc as published artifacts (via equivalent tasks' output)
+                    artifact sourcesJar
+                    artifact javadocJar
+
+                    // Also register source, javadoc as archive-artifacts, for signing
+                    declareArchive sourcesJar
+                    declareArchive javadocJar
+
+                    // Add package metadata to the .pom
+                    pom {
+                        name = 'Overscroll-Decor'
+                        description = 'iOS-like over-scrolling effect for Android'
+                        url = 'https://github.com/EverythingMe/overscroll-decor'
+                        packaging 'aar' // Oh so important - or apps would ignore our code!!!!!
+                        scm {
+                            connection = 'scm:git:git://github.com/EverythingMe/overscroll-decor'
+                            developerConnection = 'scm:git:git@github.com/EverythingMe/overscroll-decor.git'
+                            url = 'https://github.com/EverythingMe/overscroll-decor'
+                        }
+                        licenses {
+                            license {
+                                name = 'BSD-2'
+                                url = 'https://github.com/EverythingMe/overscroll-decor/blob/master/LICENSE'
+                            }
+                        }
+                        developers {
+                            DEVELOPERS.each { d ->
+                                developer {
+                                    name = d.name
+                                    email = d.email
+                                }
+                            }
+                        }
+                    }
+
+                    // Add dependencies to the .pom
+                    buildPomXmlDependencies(pom, configurations)
+
+                    // Register pom.xml's signature file (pom.xml.asc) as published artifact
+                    // Note: this is done manually, instead of registering the pom as an archived artifact
+                    pom.withXml {
+                        def pomFile = file("${project.buildDir}/generated-pom.xml")
+                        writeTo(pomFile) // Need to force-write so as to have the signature generated over the finalized content
+
+                        def pomAscFile = signing.sign(pomFile).signatureFiles[0]
+                        artifact(pomAscFile) {
+                            classifier = null
+                            extension = 'pom.asc'
+                        }
+                    }
+
+                    // Register all artifacts we've previously registered as archives (i.e. .jar.asc's, .aar.asc's) as published artifacts.
+                    // Note: this relies on preregistering the equivalent generator-tasks as archive artifacts
+                    // inside a project.artifacts { ... } clause.
+                    project.tasks.signArchives.signatureFiles.each {
+                        artifact(it) {
+                            def matcherSrcDocs = (it.file =~ /-(sources|javadoc)\.jar\.asc$/)
+                            def matcherAAR = (it.file =~ /\.aar\.asc$/)
+                            if (matcherSrcDocs.find()) {
+                                classifier = matcherSrcDocs.group(1)
+                                extension = 'jar.asc'
+                            } else if (matcherAAR.find()) {
+                                classifier = null
+                                extension = 'aar.asc'
+                            } else {
+                                classifier = null
+                                extension = null
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+/*
+ * Utils
+ */
+
+private static def isReleaseVariant(variant) {
+    return variant.buildType.name == 'release'
+}
+
+private static def assertDefined(target, message) {
+    if (target == null) {
+        throw new IllegalArgumentException(message)
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/AndroidManifest.xml b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/AndroidManifest.xml
new file mode 100755
index 0000000..8bdb7e1
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecorator.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecorator.java
new file mode 100755
index 0000000..8d23793
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecorator.java
@@ -0,0 +1,97 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+/**
+ * A concrete implementation of {@link OverScrollBounceEffectDecoratorBase} for a horizontal orientation.
+ */
+public class HorizontalOverScrollBounceEffectDecorator extends OverScrollBounceEffectDecoratorBase {
+
+    protected static class MotionAttributesHorizontal extends MotionAttributes {
+
+        public boolean init(View view, MotionEvent event) {
+
+            // We must have history available to calc the dx. Normally it's there - if it isn't temporarily,
+            // we declare the event 'invalid' and expect it in consequent events.
+            if (event.getHistorySize() == 0) {
+                return false;
+            }
+
+            // Allow for counter-orientation-direction operations (e.g. item swiping) to run fluently.
+            final float dy = event.getY(0) - event.getHistoricalY(0, 0);
+            final float dx = event.getX(0) - event.getHistoricalX(0, 0);
+            if (Math.abs(dx) < Math.abs(dy)) {
+                return false;
+            }
+
+            mAbsOffset = view.getTranslationX();
+            mDeltaOffset = dx;
+            mDir = mDeltaOffset > 0;
+
+            return true;
+        }
+    }
+
+    protected static class AnimationAttributesHorizontal extends AnimationAttributes {
+
+        public AnimationAttributesHorizontal() {
+            mProperty = View.TRANSLATION_X;
+        }
+
+        @Override
+        protected void init(View view) {
+            mAbsOffset = view.getTranslationX();
+            mMaxOffset = view.getWidth();
+        }
+    }
+
+    /**
+     * C'tor, creating the effect with default arguments:
+     * <br/>Touch-drag ratio in 'forward' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD.
+     * <br/>Touch-drag ratio in 'backwards' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK.
+     * <br/>Deceleration factor (for the bounce-back effect) will be set to DEFAULT_DECELERATE_FACTOR.
+     *
+     * @param viewAdapter The view's encapsulation.
+     */
+    public HorizontalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter) {
+        this(viewAdapter, DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD, DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK, DEFAULT_DECELERATE_FACTOR);
+    }
+
+    /**
+     * C'tor, creating the effect with explicit arguments.
+     * @param viewAdapter The view's encapsulation.
+     * @param touchDragRatioFwd Ratio of touch distance to actual drag distance when in 'forward' direction.
+     * @param touchDragRatioBck Ratio of touch distance to actual drag distance when in 'backward'
+     *                          direction (opposite to initial one).
+     * @param decelerateFactor Deceleration factor used when decelerating the motion to create the
+     *                         bounce-back effect.
+     */
+    public HorizontalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter,
+                                                     float touchDragRatioFwd, float touchDragRatioBck, float decelerateFactor) {
+        super(viewAdapter, decelerateFactor, touchDragRatioFwd, touchDragRatioBck);
+    }
+
+    @Override
+    protected MotionAttributes createMotionAttributes() {
+        return new MotionAttributesHorizontal();
+    }
+
+    @Override
+    protected AnimationAttributes createAnimationAttributes() {
+        return new AnimationAttributesHorizontal();
+    }
+
+    @Override
+    protected void translateView(View view, float offset) {
+        view.setTranslationX(offset);
+    }
+
+    @Override
+    protected void translateViewAndEvent(View view, float offset, MotionEvent event) {
+        view.setTranslationX(offset);
+        event.offsetLocation(offset - event.getX(0), 0f);
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollDecor.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollDecor.java
new file mode 100755
index 0000000..a662b99
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollDecor.java
@@ -0,0 +1,30 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.View;
+
+public interface IOverScrollDecor {
+    View getView();
+
+    void setOverScrollStateListener(IOverScrollStateListener listener);
+    void setOverScrollUpdateListener(IOverScrollUpdateListener listener);
+
+    /**
+     * Get the current decorator's runtime state, i.e. one of the values specified by {@link IOverScrollState}.
+     * @return The state.
+     */
+    int getCurrentState();
+
+    /**
+     * Detach the decorator from its associated view, thus disabling it entirely.
+     *
+     * <p>It is best to call this only when over-scroll isn't currently in-effect - i.e. verify that
+     * <code>getCurrentState()==IOverScrollState.STATE_IDLE</code> as a precondition, or otherwise
+     * use a state listener previously installed using
+     * {@link #setOverScrollStateListener(IOverScrollStateListener)}.</p>
+     *
+     * <p>Note: Upon detachment completion, the view in question will return to the default
+     * Android over-scroll configuration (i.e. {@link View.OVER_SCROLL_ALWAYS} mode). This can be
+     * overridden by calling <code>View.setOverScrollMode(mode)</code> immediately thereafter.</p>
+     */
+    void detach();
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollState.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollState.java
new file mode 100755
index 0000000..919ab00
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollState.java
@@ -0,0 +1,16 @@
+package me.everything.android.ui.overscroll;
+
+public interface IOverScrollState {
+
+    /** No over-scroll is in-effect. */
+    int STATE_IDLE = 0;
+
+    /** User is actively touch-dragging, thus enabling over-scroll at the view's <i>start</i> side. */
+    int STATE_DRAG_START_SIDE = 1;
+
+    /** User is actively touch-dragging, thus enabling over-scroll at the view's <i>end</i> side. */
+    int STATE_DRAG_END_SIDE = 2;
+
+    /** User has released their touch, thus throwing the view back into place via bounce-back animation. */
+    int STATE_BOUNCE_BACK = 3;
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollStateListener.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollStateListener.java
new file mode 100755
index 0000000..5493f07
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollStateListener.java
@@ -0,0 +1,23 @@
+package me.everything.android.ui.overscroll;
+
+/**
+ * A callback-listener enabling over-scroll effect clients to be notified of effect state transitions.
+ * <br/>Invoked whenever state is transitioned onto one of {@link IOverScrollState#STATE_IDLE},
+ * {@link IOverScrollState#STATE_DRAG_START_SIDE}, {@link IOverScrollState#STATE_DRAG_END_SIDE}
+ * or {@link IOverScrollState#STATE_BOUNCE_BACK}.
+ *
+ * @see IOverScrollUpdateListener
+ */
+public interface IOverScrollStateListener {
+
+    /**
+     * The invoked callback.
+     *
+     * @param decor The associated over-scroll 'decorator'.
+     * @param oldState The old over-scroll state; ID's specified by {@link IOverScrollState}, e.g.
+     *                 {@link IOverScrollState#STATE_IDLE}.
+     * @param newState The <b>new</b> over-scroll state; ID's specified by {@link IOverScrollState},
+     *                 e.g. {@link IOverScrollState#STATE_IDLE}.
+     */
+    void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState);
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollUpdateListener.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollUpdateListener.java
new file mode 100755
index 0000000..f435d01
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollUpdateListener.java
@@ -0,0 +1,20 @@
+package me.everything.android.ui.overscroll;
+
+/**
+ * A callback-listener enabling over-scroll effect clients to subscribe to <b>real-time</b> updates
+ * of over-scrolling intensity, provided as the view-translation offset from pre-scroll position.
+ *
+ * @see IOverScrollStateListener
+ */
+public interface IOverScrollUpdateListener {
+
+    /**
+     * The invoked callback.
+     *
+     * @param decor The associated over-scroll 'decorator'.
+     * @param state One of: {@link IOverScrollState#STATE_IDLE}, {@link IOverScrollState#STATE_DRAG_START_SIDE},
+     *              {@link IOverScrollState#STATE_DRAG_START_SIDE} or {@link IOverScrollState#STATE_BOUNCE_BACK}.
+     * @param offset The currently visible offset created due to over-scroll.
+     */
+    void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset);
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/ListenerStubs.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/ListenerStubs.java
new file mode 100755
index 0000000..4feaaec
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/ListenerStubs.java
@@ -0,0 +1,14 @@
+package me.everything.android.ui.overscroll;
+
+public interface ListenerStubs {
+
+    class OverScrollStateListenerStub implements IOverScrollStateListener {
+        @Override
+        public void onOverScrollStateChange(IOverScrollDecor decor, int oldState, int newState) { }
+    }
+
+    class OverScrollUpdateListenerStub implements IOverScrollUpdateListener {
+        @Override
+        public void onOverScrollUpdate(IOverScrollDecor decor, int state, float offset) { }
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollBounceEffectDecoratorBase.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollBounceEffectDecoratorBase.java
new file mode 100755
index 0000000..5ca6b6d
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollBounceEffectDecoratorBase.java
@@ -0,0 +1,481 @@
+package me.everything.android.ui.overscroll;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.util.Log;
+import android.util.Property;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.Interpolator;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+import me.everything.android.ui.overscroll.adapters.RecyclerViewOverScrollDecorAdapter;
+
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+import static me.everything.android.ui.overscroll.ListenerStubs.*;
+
+/**
+ * A standalone view decorator adding over-scroll with a smooth bounce-back effect to (potentially) any view -
+ * provided that an appropriate {@link IOverScrollDecoratorAdapter} implementation exists / can be written
+ * for that view type (e.g. {@link RecyclerViewOverScrollDecorAdapter}).
+ *
+ * <p>Design-wise, being a standalone class, this decorator powerfully provides the ability to add
+ * the over-scroll effect over any view without adjusting the view's implementation. In essence, this
+ * eliminates the need to repeatedly implement the effect per each view type (list-view,
+ * recycler-view, image-view, etc.). Therefore, using it is highly recommended compared to other
+ * more intrusive solutions.</p>
+ *
+ * <p>Note that this class is abstract, having {@link HorizontalOverScrollBounceEffectDecorator} and
+ * {@link VerticalOverScrollBounceEffectDecorator} providing concrete implementations that are
+ * view-orientation specific.</p>
+ *
+ * <hr width="97%"/>
+ * <h2>Implementation Notes</h2>
+ *
+ * <p>At it's core, the class simply registers itself as a touch-listener over the decorated view and
+ * intercepts touch events as needed.</p>
+ *
+ * <p>Internally, it delegates the over-scrolling calculations onto 3 state-based classes:
+ * <ol>
+ *     <li><b>Idle state</b> - monitors view state and touch events to intercept over-scrolling initiation
+ *     (in which case it hands control over to the Over-scrolling state).</li>
+ *     <li><b>Over-scrolling state</b> - handles motion events to apply the over-scroll effect as users
+ *     interact with the view.</li>
+ *     <li><b>Bounce-back state</b> - runs the bounce-back animation, all-the-while blocking all
+ *     touch events till the animation completes (in which case it hands control back to the idle
+ *     state).</li>
+ * </ol>
+ * </p>
+ *
+ * @see RecyclerViewOverScrollDecorAdapter
+ * @see IOverScrollDecoratorAdapter
+ */
+public abstract class OverScrollBounceEffectDecoratorBase implements IOverScrollDecor, View.OnTouchListener {
+
+    public static final String TAG = "OverScrollDecor";
+
+    public static final float DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD = 3f;
+    public static final float DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK = 1f;
+    public static final float DEFAULT_DECELERATE_FACTOR = -2f;
+
+    protected static final int MAX_BOUNCE_BACK_DURATION_MS = 800;
+    protected static final int MIN_BOUNCE_BACK_DURATION_MS = 200;
+
+    protected final OverScrollStartAttributes mStartAttr = new OverScrollStartAttributes();
+    protected final IOverScrollDecoratorAdapter mViewAdapter;
+
+    protected final IdleState mIdleState;
+    protected final OverScrollingState mOverScrollingState;
+    protected final BounceBackState mBounceBackState;
+    protected IDecoratorState mCurrentState;
+
+    protected IOverScrollStateListener mStateListener = new OverScrollStateListenerStub();
+    protected IOverScrollUpdateListener mUpdateListener = new OverScrollUpdateListenerStub();
+
+    /**
+     * When in over-scroll mode, keep track of dragging velocity to provide a smooth slow-down
+     * for the bounce-back effect.
+     */
+    protected float mVelocity;
+
+    /**
+     * Motion attributes: keeps data describing current motion event.
+     * <br/>Orientation agnostic: subclasses provide either horizontal or vertical
+     * initialization of the agnostic attributes.
+     */
+    protected abstract static class MotionAttributes {
+        public float mAbsOffset;
+        public float mDeltaOffset;
+        public boolean mDir; // True = 'forward', false = 'backwards'.
+
+        protected abstract boolean init(View view, MotionEvent event);
+    }
+
+    protected static class OverScrollStartAttributes {
+        protected int mPointerId;
+        protected float mAbsOffset;
+        protected boolean mDir; // True = 'forward', false = 'backwards'.
+    }
+
+    protected abstract static class AnimationAttributes {
+        public Property<View, Float> mProperty;
+        public float mAbsOffset;
+        public float mMaxOffset;
+
+        protected abstract void init(View view);
+    }
+
+    /**
+     * Interface of decorator-state delegation classes. Defines states as handles of two fundamental
+     * touch events: actual movement, up/cancel.
+     */
+    protected interface IDecoratorState {
+
+        /**
+         * Handle a motion (touch) event.
+         *
+         * @param event The event from onTouch.
+         * @return Return value for onTouch.
+         */
+        boolean handleMoveTouchEvent(MotionEvent event);
+
+        /**
+         * Handle up / touch-cancel events.
+         *
+         * @param event The event from onTouch.
+         * @return Return value for onTouch.
+         */
+        boolean handleUpOrCancelTouchEvent(MotionEvent event);
+
+        /**
+         * Handle a transition onto this state, as it becomes 'current' state.
+         * @param fromState
+         */
+        void handleEntryTransition(IDecoratorState fromState);
+
+        /**
+         * The client-perspective ID of the state associated with this (internal) one. ID's
+         * are as specified in {@link IOverScrollState}.
+         *
+         * @return The ID, e.g. {@link IOverScrollState#STATE_IDLE}.
+         */
+        int getStateId();
+    }
+
+    /**
+     * Idle state: monitors move events, trying to figure out whether over-scrolling should be
+     * initiated (i.e. when scrolled further when the view is at one of its displayable ends).
+     * <br/>When such is the case, it hands over control to the over-scrolling state.
+     */
+    protected class IdleState implements IDecoratorState {
+
+        final MotionAttributes mMoveAttr;
+
+        public IdleState() {
+            mMoveAttr = createMotionAttributes();
+        }
+
+        @Override
+        public int getStateId() {
+            return STATE_IDLE;
+        }
+
+        @Override
+        public boolean handleMoveTouchEvent(MotionEvent event) {
+
+            final View view = mViewAdapter.getView();
+            if (!mMoveAttr.init(view, event)) {
+                return false;
+            }
+
+            // Has over-scrolling officially started?
+            if ((mViewAdapter.isInAbsoluteStart() && mMoveAttr.mDir) ||
+                (mViewAdapter.isInAbsoluteEnd() && !mMoveAttr.mDir)) {
+
+                // Save initial over-scroll attributes for future reference.
+                mStartAttr.mPointerId = event.getPointerId(0);
+                mStartAttr.mAbsOffset = mMoveAttr.mAbsOffset;
+                mStartAttr.mDir = mMoveAttr.mDir;
+
+                issueStateTransition(mOverScrollingState);
+                return mOverScrollingState.handleMoveTouchEvent(event);
+            }
+
+            return false;
+        }
+
+        @Override
+        public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
+            return false;
+        }
+
+        @Override
+        public void handleEntryTransition(IDecoratorState fromState) {
+            mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
+        }
+    }
+
+    /**
+     * Handles the actual over-scrolling: thus translating the view according to configuration
+     * and user interactions, dynamically.
+     *
+     * <br/><br/>The state is exited - thus completing over-scroll handling, in one of two cases:
+     * <br/>When user lets go of the view, it transitions control to the bounce-back state.
+     * <br/>When user moves the view back onto a potential 'under-scroll' state, it abruptly
+     * transitions control to the idle-state, so as to return touch-events management to the
+     * normal over-scroll-less environment (thus preventing under-scrolling and potentially regaining
+     * regular scrolling).
+     */
+    protected class OverScrollingState implements IDecoratorState {
+
+        protected final float mTouchDragRatioFwd;
+        protected final float mTouchDragRatioBck;
+
+        final MotionAttributes mMoveAttr;
+        int mCurrDragState;
+
+        public OverScrollingState(float touchDragRatioFwd, float touchDragRatioBck) {
+            mMoveAttr = createMotionAttributes();
+            mTouchDragRatioFwd = touchDragRatioFwd;
+            mTouchDragRatioBck = touchDragRatioBck;
+        }
+
+        @Override
+        public int getStateId() {
+            // This is really a single class that implements 2 states, so our ID depends on what
+            // it was during the last invocation.
+            return mCurrDragState;
+        }
+
+        @Override
+        public boolean handleMoveTouchEvent(MotionEvent event) {
+
+            // Switching 'pointers' (e.g. fingers) on-the-fly isn't supported -- abort over-scroll
+            // smoothly using the default bounce-back animation in this case.
+            if (mStartAttr.mPointerId != event.getPointerId(0)) {
+                issueStateTransition(mBounceBackState);
+                return true;
+            }
+
+            final View view = mViewAdapter.getView();
+            if (!mMoveAttr.init(view, event)) {
+                // Keep intercepting the touch event as long as we're still over-scrolling...
+                return true;
+            }
+
+            float deltaOffset = mMoveAttr.mDeltaOffset / (mMoveAttr.mDir == mStartAttr.mDir ? mTouchDragRatioFwd : mTouchDragRatioBck);
+            float newOffset = mMoveAttr.mAbsOffset + deltaOffset;
+
+            // If moved in counter direction onto a potential under-scroll state -- don't. Instead, abort
+            // over-scrolling abruptly, thus returning control to which-ever touch handlers there
+            // are waiting (e.g. regular scroller handlers).
+            if ( (mStartAttr.mDir && !mMoveAttr.mDir && (newOffset <= mStartAttr.mAbsOffset)) ||
+                 (!mStartAttr.mDir && mMoveAttr.mDir && (newOffset >= mStartAttr.mAbsOffset)) ) {
+                translateViewAndEvent(view, mStartAttr.mAbsOffset, event);
+                mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, mCurrDragState, 0);
+
+                issueStateTransition(mIdleState);
+                return true;
+            }
+
+            if (view.getParent() != null) {
+                view.getParent().requestDisallowInterceptTouchEvent(true);
+            }
+
+            long dt = event.getEventTime() - event.getHistoricalEventTime(0);
+            if (dt > 0) { // Sometimes (though rarely) dt==0 cause originally timing is in nanos, but is presented in millis.
+                mVelocity = deltaOffset / dt;
+            }
+
+            translateView(view, newOffset);
+            mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, mCurrDragState, newOffset);
+
+            return true;
+        }
+
+        @Override
+        public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
+            issueStateTransition(mBounceBackState);
+            return false;
+        }
+
+        @Override
+        public void handleEntryTransition(IDecoratorState fromState) {
+            mCurrDragState = (mStartAttr.mDir ? STATE_DRAG_START_SIDE : STATE_DRAG_END_SIDE);
+            mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
+        }
+    }
+
+    /**
+     * When entered, starts the bounce-back animation.
+     * <br/>Upon animation completion, transitions control onto the idle state; Does so by
+     * registering itself as an animation listener.
+     * <br/>In the meantime, blocks (intercepts) all touch events.
+     */
+    protected class BounceBackState implements IDecoratorState, Animator.AnimatorListener, ValueAnimator.AnimatorUpdateListener {
+
+        protected final Interpolator mBounceBackInterpolator = new DecelerateInterpolator();
+        protected final float mDecelerateFactor;
+        protected final float mDoubleDecelerateFactor;
+
+        protected final AnimationAttributes mAnimAttributes;
+
+        public BounceBackState(float decelerateFactor) {
+            mDecelerateFactor = decelerateFactor;
+            mDoubleDecelerateFactor = 2f * decelerateFactor;
+
+            mAnimAttributes = createAnimationAttributes();
+        }
+
+        @Override
+        public int getStateId() {
+            return STATE_BOUNCE_BACK;
+        }
+
+        @Override
+        public void handleEntryTransition(IDecoratorState fromState) {
+
+            mStateListener.onOverScrollStateChange(OverScrollBounceEffectDecoratorBase.this, fromState.getStateId(), this.getStateId());
+
+            Animator bounceBackAnim = createAnimator();
+            bounceBackAnim.addListener(this);
+
+            bounceBackAnim.start();
+        }
+
+        @Override
+        public boolean handleMoveTouchEvent(MotionEvent event) {
+            // Flush all touches down the drain till animation is over.
+            return true;
+        }
+
+        @Override
+        public boolean handleUpOrCancelTouchEvent(MotionEvent event) {
+            // Flush all touches down the drain till animation is over.
+            return true;
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            issueStateTransition(mIdleState);
+        }
+
+        @Override
+        public void onAnimationUpdate(ValueAnimator animation) {
+            mUpdateListener.onOverScrollUpdate(OverScrollBounceEffectDecoratorBase.this, STATE_BOUNCE_BACK, (Float) animation.getAnimatedValue());
+        }
+
+        @Override public void onAnimationStart(Animator animation) {}
+        @Override public void onAnimationCancel(Animator animation) {}
+        @Override public void onAnimationRepeat(Animator animation) {}
+
+        protected Animator createAnimator() {
+
+            final View view = mViewAdapter.getView();
+
+            mAnimAttributes.init(view);
+
+            // Set up a low-duration slow-down animation IN the drag direction.
+
+            // Exception: If wasn't dragging in 'forward' direction (or velocity=0 -- i.e. not dragging at all),
+            // skip slow-down anim directly to the bounce-back.
+            if (mVelocity == 0f || (mVelocity < 0 && mStartAttr.mDir) || (mVelocity > 0 && !mStartAttr.mDir)) {
+                return createBounceBackAnimator(mAnimAttributes.mAbsOffset);
+            }
+
+            // dt = (Vt - Vo) / a; Vt=0 ==> dt = -Vo / a
+            float slowdownDuration = -mVelocity / mDecelerateFactor;
+            slowdownDuration = (slowdownDuration < 0 ? 0 : slowdownDuration); // Happens in counter-direction dragging
+
+            // dx = (Vt^2 - Vo^2) / 2a; Vt=0 ==> dx = -Vo^2 / 2a
+            float slowdownDistance = -mVelocity * mVelocity / mDoubleDecelerateFactor;
+            float slowdownEndOffset = mAnimAttributes.mAbsOffset + slowdownDistance;
+
+            ObjectAnimator slowdownAnim = createSlowdownAnimator(view, (int) slowdownDuration, slowdownEndOffset);
+
+            // Set up the bounce back animation, bringing the view back into the original, pre-overscroll position (translation=0).
+
+            ObjectAnimator bounceBackAnim = createBounceBackAnimator(slowdownEndOffset);
+
+            // Play the 2 animations as a sequence.
+            AnimatorSet wholeAnim = new AnimatorSet();
+            wholeAnim.playSequentially(slowdownAnim, bounceBackAnim);
+            return wholeAnim;
+        }
+
+        protected ObjectAnimator createSlowdownAnimator(View view, int slowdownDuration, float slowdownEndOffset) {
+            ObjectAnimator slowdownAnim = ObjectAnimator.ofFloat(view, mAnimAttributes.mProperty, slowdownEndOffset);
+            slowdownAnim.setDuration(slowdownDuration);
+            slowdownAnim.setInterpolator(mBounceBackInterpolator);
+            slowdownAnim.addUpdateListener(this);
+            return slowdownAnim;
+        }
+
+        protected ObjectAnimator createBounceBackAnimator(float startOffset) {
+
+            final View view = mViewAdapter.getView();
+
+            // Duration is proportional to the view's size.
+            float bounceBackDuration = (Math.abs(startOffset) / mAnimAttributes.mMaxOffset) * MAX_BOUNCE_BACK_DURATION_MS;
+            ObjectAnimator bounceBackAnim = ObjectAnimator.ofFloat(view, mAnimAttributes.mProperty, mStartAttr.mAbsOffset);
+            bounceBackAnim.setDuration(Math.max((int) bounceBackDuration, MIN_BOUNCE_BACK_DURATION_MS));
+            bounceBackAnim.setInterpolator(mBounceBackInterpolator);
+            bounceBackAnim.addUpdateListener(this);
+            return bounceBackAnim;
+        }
+    }
+
+    public OverScrollBounceEffectDecoratorBase(IOverScrollDecoratorAdapter viewAdapter, float decelerateFactor, float touchDragRatioFwd, float touchDragRatioBck) {
+        mViewAdapter = viewAdapter;
+
+        mBounceBackState = new BounceBackState(decelerateFactor);
+        mOverScrollingState = new OverScrollingState(touchDragRatioFwd, touchDragRatioBck);
+        mIdleState = new IdleState();
+
+        mCurrentState = mIdleState;
+
+        attach();
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_MOVE:
+                return mCurrentState.handleMoveTouchEvent(event);
+
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP:
+                return mCurrentState.handleUpOrCancelTouchEvent(event);
+        }
+
+        return false;
+    }
+
+    @Override
+    public void setOverScrollStateListener(IOverScrollStateListener listener) {
+        mStateListener = (listener != null ? listener : new OverScrollStateListenerStub());
+    }
+
+    @Override
+    public void setOverScrollUpdateListener(IOverScrollUpdateListener listener) {
+        mUpdateListener = (listener != null ? listener : new OverScrollUpdateListenerStub());
+    }
+
+    @Override
+    public int getCurrentState() {
+        return mCurrentState.getStateId();
+    }
+
+    @Override
+    public View getView() {
+        return mViewAdapter.getView();
+    }
+
+    protected void issueStateTransition(IDecoratorState state) {
+        IDecoratorState oldState = mCurrentState;
+        mCurrentState = state;
+        mCurrentState.handleEntryTransition(oldState);
+    }
+
+    protected void attach() {
+        getView().setOnTouchListener(this);
+        getView().setOverScrollMode(View.OVER_SCROLL_NEVER);
+    }
+
+    @Override
+    public void detach() {
+        if (mCurrentState != mIdleState) {
+            Log.w(TAG, "Decorator detached while over-scroll is in effect. You might want to add a precondition of that getCurrentState()==STATE_IDLE, first.");
+        }
+        getView().setOnTouchListener(null);
+        getView().setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    protected abstract MotionAttributes createMotionAttributes();
+    protected abstract AnimationAttributes createAnimationAttributes();
+    protected abstract void translateView(View view, float offset);
+    protected abstract void translateViewAndEvent(View view, float offset, MotionEvent event);
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollDecoratorHelper.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollDecoratorHelper.java
new file mode 100755
index 0000000..25b246a
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollDecoratorHelper.java
@@ -0,0 +1,90 @@
+package me.everything.android.ui.overscroll;
+
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+import android.view.View;
+import android.widget.GridView;
+import android.widget.HorizontalScrollView;
+import android.widget.ListView;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.adapters.AbsListViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.HorizontalScrollViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.RecyclerViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.ScrollViewOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.StaticOverScrollDecorAdapter;
+import me.everything.android.ui.overscroll.adapters.ViewPagerOverScrollDecorAdapter;
+
+public class OverScrollDecoratorHelper {
+
+    public static final int ORIENTATION_VERTICAL = 0;
+    public static final int ORIENTATION_HORIZONTAL = 1;
+
+    /**
+     * Set up the over-scroll effect over a specified {@link RecyclerView} view.
+     * <br/>Only recycler-views using <b>native</b> Android layout managers (i.e. {@link LinearLayoutManager},
+     * {@link GridLayoutManager} and {@link StaggeredGridLayoutManager}) are currently supported
+     * by this convenience method.
+     *
+     * @param recyclerView The view.
+     * @param orientation Either {@link #ORIENTATION_HORIZONTAL} or {@link #ORIENTATION_VERTICAL}.
+     *
+     * @return The over-scroll effect 'decorator', enabling further effect configuration.
+     */
+    public static IOverScrollDecor setUpOverScroll(RecyclerView recyclerView, int orientation) {
+        switch (orientation) {
+            case ORIENTATION_HORIZONTAL:
+                return new HorizontalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView));
+            case ORIENTATION_VERTICAL:
+                return new VerticalOverScrollBounceEffectDecorator(new RecyclerViewOverScrollDecorAdapter(recyclerView));
+            default:
+                throw new IllegalArgumentException("orientation");
+        }
+    }
+
+    public static IOverScrollDecor setUpOverScroll(ListView listView) {
+        return new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(listView));
+    }
+
+    public static IOverScrollDecor setUpOverScroll(GridView gridView) {
+        return new VerticalOverScrollBounceEffectDecorator(new AbsListViewOverScrollDecorAdapter(gridView));
+    }
+
+    public static IOverScrollDecor setUpOverScroll(ScrollView scrollView) {
+        return new VerticalOverScrollBounceEffectDecorator(new ScrollViewOverScrollDecorAdapter(scrollView));
+    }
+
+    public static IOverScrollDecor setUpOverScroll(HorizontalScrollView scrollView) {
+        return new HorizontalOverScrollBounceEffectDecorator(new HorizontalScrollViewOverScrollDecorAdapter(scrollView));
+    }
+
+    /**
+     * Set up the over-scroll over a generic view, assumed to always be over-scroll ready (e.g.
+     * a plain text field, image view).
+     *
+     * @param view The view.
+     * @param orientation One of {@link #ORIENTATION_HORIZONTAL} or {@link #ORIENTATION_VERTICAL}.
+     *
+     * @return The over-scroll effect 'decorator', enabling further effect configuration.
+     */
+    public static IOverScrollDecor setUpStaticOverScroll(View view, int orientation) {
+        switch (orientation) {
+            case ORIENTATION_HORIZONTAL:
+                return new HorizontalOverScrollBounceEffectDecorator(new StaticOverScrollDecorAdapter(view));
+
+            case ORIENTATION_VERTICAL:
+                return new VerticalOverScrollBounceEffectDecorator(new StaticOverScrollDecorAdapter(view));
+
+            default:
+                throw new IllegalArgumentException("orientation");
+        }
+    }
+
+    public static IOverScrollDecor setUpOverScroll(ViewPager viewPager) {
+        return new HorizontalOverScrollBounceEffectDecorator(new ViewPagerOverScrollDecorAdapter(viewPager));
+    }
+
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecorator.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecorator.java
new file mode 100755
index 0000000..5d10f73
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecorator.java
@@ -0,0 +1,97 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+/**
+ * A concrete implementation of {@link OverScrollBounceEffectDecoratorBase} for a vertical orientation.
+ */
+public class VerticalOverScrollBounceEffectDecorator extends OverScrollBounceEffectDecoratorBase {
+
+    protected static class MotionAttributesVertical extends MotionAttributes {
+
+        public boolean init(View view, MotionEvent event) {
+
+            // We must have history available to calc the dx. Normally it's there - if it isn't temporarily,
+            // we declare the event 'invalid' and expect it in consequent events.
+            if (event.getHistorySize() == 0) {
+                return false;
+            }
+
+            // Allow for counter-orientation-direction operations (e.g. item swiping) to run fluently.
+            final float dy = event.getY(0) - event.getHistoricalY(0, 0);
+            final float dx = event.getX(0) - event.getHistoricalX(0, 0);
+            if (Math.abs(dx) > Math.abs(dy)) {
+                return false;
+            }
+
+            mAbsOffset = view.getTranslationY();
+            mDeltaOffset = dy;
+            mDir = mDeltaOffset > 0;
+
+            return true;
+        }
+    }
+
+    protected static class AnimationAttributesVertical extends AnimationAttributes {
+
+        public AnimationAttributesVertical() {
+            mProperty = View.TRANSLATION_Y;
+        }
+
+        @Override
+        protected void init(View view) {
+            mAbsOffset = view.getTranslationY();
+            mMaxOffset = view.getHeight();
+        }
+    }
+
+    /**
+     * C'tor, creating the effect with default arguments:
+     * <br/>Touch-drag ratio in 'forward' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD.
+     * <br/>Touch-drag ratio in 'backwards' direction will be set to DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK.
+     * <br/>Deceleration factor (for the bounce-back effect) will be set to DEFAULT_DECELERATE_FACTOR.
+     *
+     * @param viewAdapter The view's encapsulation.
+     */
+    public VerticalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter) {
+        this(viewAdapter, DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD, DEFAULT_TOUCH_DRAG_MOVE_RATIO_BCK, DEFAULT_DECELERATE_FACTOR);
+    }
+
+    /**
+     * C'tor, creating the effect with explicit arguments.
+     * @param viewAdapter The view's encapsulation.
+     * @param touchDragRatioFwd Ratio of touch distance to actual drag distance when in 'forward' direction.
+     * @param touchDragRatioBck Ratio of touch distance to actual drag distance when in 'backward'
+     *                          direction (opposite to initial one).
+     * @param decelerateFactor Deceleration factor used when decelerating the motion to create the
+     *                         bounce-back effect.
+     */
+    public VerticalOverScrollBounceEffectDecorator(IOverScrollDecoratorAdapter viewAdapter,
+                                                   float touchDragRatioFwd, float touchDragRatioBck, float decelerateFactor) {
+        super(viewAdapter, decelerateFactor, touchDragRatioFwd, touchDragRatioBck);
+    }
+
+    @Override
+    protected MotionAttributes createMotionAttributes() {
+        return new MotionAttributesVertical();
+    }
+
+    @Override
+    protected AnimationAttributes createAnimationAttributes() {
+        return new AnimationAttributesVertical();
+    }
+
+    @Override
+    protected void translateView(View view, float offset) {
+        view.setTranslationY(offset);
+    }
+
+    @Override
+    protected void translateViewAndEvent(View view, float offset, MotionEvent event) {
+        view.setTranslationY(offset);
+        event.offsetLocation(offset - event.getY(0), 0f);
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/AbsListViewOverScrollDecorAdapter.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/AbsListViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..d873ad4
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/AbsListViewOverScrollDecorAdapter.java
@@ -0,0 +1,55 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+import android.widget.AbsListView;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter to enable over-scrolling over object of {@link AbsListView}, namely {@link
+ * android.widget.ListView} and it's extensions, and {@link android.widget.GridView}.
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class AbsListViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final AbsListView mView;
+
+    public AbsListViewOverScrollDecorAdapter(AbsListView view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return mView.getChildCount() > 0 && !canScrollListUp();
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return mView.getChildCount() > 0 && !canScrollListDown();
+    }
+
+    public boolean canScrollListUp() {
+        // Ported from AbsListView#canScrollList() which isn't compatible to all API levels
+        final int firstTop = mView.getChildAt(0).getTop();
+        final int firstPosition = mView.getFirstVisiblePosition();
+        return firstPosition > 0 || firstTop < mView.getListPaddingTop();
+    }
+
+    public boolean canScrollListDown() {
+        // Ported from AbsListView#canScrollList() which isn't compatible to all API levels
+        final int childCount = mView.getChildCount();
+        final int itemsCount = mView.getCount();
+        final int firstPosition = mView.getFirstVisiblePosition();
+        final int lastPosition = firstPosition + childCount;
+        final int lastBottom = mView.getChildAt(childCount - 1).getBottom();
+        return lastPosition < itemsCount || lastBottom > mView.getHeight() - mView.getListPaddingBottom();
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/HorizontalScrollViewOverScrollDecorAdapter.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/HorizontalScrollViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..3377f53
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/HorizontalScrollViewOverScrollDecorAdapter.java
@@ -0,0 +1,39 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+import android.widget.HorizontalScrollView;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter that enables over-scrolling support over a {@link HorizontalScrollView}.
+ * <br/>Seeing that {@link HorizontalScrollView} only supports horizontal scrolling, this adapter
+ * should only be used with a {@link HorizontalOverScrollBounceEffectDecorator}.
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class HorizontalScrollViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final HorizontalScrollView mView;
+
+    public HorizontalScrollViewOverScrollDecorAdapter(HorizontalScrollView view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return !mView.canScrollHorizontally(-1);
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return !mView.canScrollHorizontally(1);
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/IOverScrollDecoratorAdapter.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/IOverScrollDecoratorAdapter.java
new file mode 100755
index 0000000..ed0c0f2
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/IOverScrollDecoratorAdapter.java
@@ -0,0 +1,31 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+
+/**
+ * @see HorizontalOverScrollBounceEffectDecorator
+ */
+public interface IOverScrollDecoratorAdapter {
+
+    View getView();
+
+    /**
+     * Is view in it's absolute start position - such that a negative over-scroll can potentially
+     * be initiated. For example, in list-views, this is synonymous with the first item being
+     * fully visible.
+     *
+     * @return Whether in absolute start position.
+     */
+    boolean isInAbsoluteStart();
+
+    /**
+     * Is view in it's absolute end position - such that an over-scroll can potentially
+     * be initiated. For example, in list-views, this is synonymous with the last item being
+     * fully visible.
+     *
+     * @return Whether in absolute end position.
+     */
+    boolean isInAbsoluteEnd();
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/RecyclerViewOverScrollDecorAdapter.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/RecyclerViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..08959d1
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/RecyclerViewOverScrollDecorAdapter.java
@@ -0,0 +1,226 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.graphics.Canvas;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import android.view.View;
+
+import java.util.List;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class RecyclerViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    /**
+     * A delegation of the adapter implementation of this view that should provide the processing
+     * of {@link #isInAbsoluteStart()} and {@link #isInAbsoluteEnd()}. Essentially needed simply
+     * because the implementation depends on the layout manager implementation being used.
+     */
+    protected interface Impl {
+        boolean isInAbsoluteStart();
+        boolean isInAbsoluteEnd();
+    }
+
+    protected final RecyclerView mRecyclerView;
+    protected final Impl mImpl;
+
+    protected boolean mIsItemTouchInEffect = false;
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView) {
+
+        mRecyclerView = recyclerView;
+
+        final RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
+        if (layoutManager instanceof LinearLayoutManager ||
+            layoutManager instanceof StaggeredGridLayoutManager)
+        {
+            final int orientation =
+                    (layoutManager instanceof LinearLayoutManager
+                        ? ((LinearLayoutManager) layoutManager).getOrientation()
+                        : ((StaggeredGridLayoutManager) layoutManager).getOrientation());
+
+            if (orientation == LinearLayoutManager.HORIZONTAL) {
+                mImpl = new ImplHorizLayout();
+            } else {
+                mImpl = new ImplVerticalLayout();
+            }
+        }
+        else
+        {
+            throw new IllegalArgumentException("Recycler views with custom layout managers are not supported by this adapter out of the box." +
+                    "Try implementing and providing an explicit 'impl' parameter to the other c'tors, or otherwise create a custom adapter subclass of your own.");
+        }
+    }
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, Impl impl) {
+        mRecyclerView = recyclerView;
+        mImpl = impl;
+    }
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, ItemTouchHelper.Callback itemTouchHelperCallback) {
+        this(recyclerView);
+        setUpTouchHelperCallback(itemTouchHelperCallback);
+    }
+
+    public RecyclerViewOverScrollDecorAdapter(RecyclerView recyclerView, Impl impl, ItemTouchHelper.Callback itemTouchHelperCallback) {
+        this(recyclerView, impl);
+        setUpTouchHelperCallback(itemTouchHelperCallback);
+    }
+
+    protected void setUpTouchHelperCallback(final ItemTouchHelper.Callback itemTouchHelperCallback) {
+        new ItemTouchHelper(new ItemTouchHelperCallbackWrapper(itemTouchHelperCallback) {
+            @Override
+            public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
+                mIsItemTouchInEffect = actionState != 0;
+                super.onSelectedChanged(viewHolder, actionState);
+            }
+        }).attachToRecyclerView(mRecyclerView);
+    }
+
+    @Override
+    public View getView() {
+        return mRecyclerView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return !mIsItemTouchInEffect && mImpl.isInAbsoluteStart();
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return !mIsItemTouchInEffect && mImpl.isInAbsoluteEnd();
+    }
+
+    protected class ImplHorizLayout implements Impl {
+
+        @Override
+        public boolean isInAbsoluteStart() {
+            return !mRecyclerView.canScrollHorizontally(-1);
+        }
+
+        @Override
+        public boolean isInAbsoluteEnd() {
+            return !mRecyclerView.canScrollHorizontally(1);
+        }
+    }
+
+    protected class ImplVerticalLayout implements Impl {
+
+        @Override
+        public boolean isInAbsoluteStart() {
+            return !mRecyclerView.canScrollVertically(-1);
+        }
+
+        @Override
+        public boolean isInAbsoluteEnd() {
+            return !mRecyclerView.canScrollVertically(1);
+        }
+    }
+
+    private static class ItemTouchHelperCallbackWrapper extends ItemTouchHelper.Callback {
+
+        final ItemTouchHelper.Callback mCallback;
+
+        private ItemTouchHelperCallbackWrapper(ItemTouchHelper.Callback callback) {
+            mCallback = callback;
+        }
+
+        @Override
+        public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+            return mCallback.getMovementFlags(recyclerView, viewHolder);
+        }
+
+        @Override
+        public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+            return mCallback.onMove(recyclerView, viewHolder, target);
+        }
+
+        @Override
+        public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+            mCallback.onSwiped(viewHolder, direction);
+        }
+
+        @Override
+        public int convertToAbsoluteDirection(int flags, int layoutDirection) {
+            return mCallback.convertToAbsoluteDirection(flags, layoutDirection);
+        }
+
+        @Override
+        public boolean canDropOver(RecyclerView recyclerView, RecyclerView.ViewHolder current, RecyclerView.ViewHolder target) {
+            return mCallback.canDropOver(recyclerView, current, target);
+        }
+
+        @Override
+        public boolean isLongPressDragEnabled() {
+            return mCallback.isLongPressDragEnabled();
+        }
+
+        @Override
+        public boolean isItemViewSwipeEnabled() {
+            return mCallback.isItemViewSwipeEnabled();
+        }
+
+        @Override
+        public int getBoundingBoxMargin() {
+            return mCallback.getBoundingBoxMargin();
+        }
+
+        @Override
+        public float getSwipeThreshold(RecyclerView.ViewHolder viewHolder) {
+            return mCallback.getSwipeThreshold(viewHolder);
+        }
+
+        @Override
+        public float getMoveThreshold(RecyclerView.ViewHolder viewHolder) {
+            return mCallback.getMoveThreshold(viewHolder);
+        }
+
+        @Override
+        public RecyclerView.ViewHolder chooseDropTarget(RecyclerView.ViewHolder selected, List<RecyclerView.ViewHolder> dropTargets, int curX, int curY) {
+            return mCallback.chooseDropTarget(selected, dropTargets, curX, curY);
+        }
+
+        @Override
+        public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
+            mCallback.onSelectedChanged(viewHolder, actionState);
+        }
+
+        @Override
+        public void onMoved(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, int fromPos, RecyclerView.ViewHolder target, int toPos, int x, int y) {
+            mCallback.onMoved(recyclerView, viewHolder, fromPos, target, toPos, x, y);
+        }
+
+        @Override
+        public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+            mCallback.clearView(recyclerView, viewHolder);
+        }
+
+        @Override
+        public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+            mCallback.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+        }
+
+        @Override
+        public void onChildDrawOver(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+            mCallback.onChildDrawOver(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+        }
+
+        @Override
+        public long getAnimationDuration(RecyclerView recyclerView, int animationType, float animateDx, float animateDy) {
+            return mCallback.getAnimationDuration(recyclerView, animationType, animateDx, animateDy);
+        }
+
+        @Override
+        public int interpolateOutOfBoundsScroll(RecyclerView recyclerView, int viewSize, int viewSizeOutOfBounds, int totalSize, long msSinceStartScroll) {
+            return mCallback.interpolateOutOfBoundsScroll(recyclerView, viewSize, viewSizeOutOfBounds, totalSize, msSinceStartScroll);
+        }
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ScrollViewOverScrollDecorAdapter.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ScrollViewOverScrollDecorAdapter.java
new file mode 100755
index 0000000..d71ba43
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ScrollViewOverScrollDecorAdapter.java
@@ -0,0 +1,41 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+import android.widget.ScrollView;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter that enables over-scrolling over a {@link ScrollView}.
+ * <br/>Seeing that {@link ScrollView} only supports vertical scrolling, this adapter
+ * should only be used with a {@link VerticalOverScrollBounceEffectDecorator}. For horizontal
+ * over-scrolling, use {@link HorizontalScrollViewOverScrollDecorAdapter} in conjunction with
+ * a {@link android.widget.HorizontalScrollView}.
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class ScrollViewOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final ScrollView mView;
+
+    public ScrollViewOverScrollDecorAdapter(ScrollView view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return !mView.canScrollVertically(-1);
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return !mView.canScrollVertically(1);
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/StaticOverScrollDecorAdapter.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/StaticOverScrollDecorAdapter.java
new file mode 100755
index 0000000..024b413
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/StaticOverScrollDecorAdapter.java
@@ -0,0 +1,36 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+import me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator;
+
+/**
+ * A static adapter for views that are ALWAYS over-scroll-able (e.g. image view).
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ * @see VerticalOverScrollBounceEffectDecorator
+ */
+public class StaticOverScrollDecorAdapter implements IOverScrollDecoratorAdapter {
+
+    protected final View mView;
+
+    public StaticOverScrollDecorAdapter(View view) {
+        mView = view;
+    }
+
+    @Override
+    public View getView() {
+        return mView;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+        return true;
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+        return true;
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ViewPagerOverScrollDecorAdapter.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ViewPagerOverScrollDecorAdapter.java
new file mode 100755
index 0000000..7aaedbd
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ViewPagerOverScrollDecorAdapter.java
@@ -0,0 +1,63 @@
+package me.everything.android.ui.overscroll.adapters;
+
+import android.view.View;
+
+import androidx.viewpager.widget.ViewPager;
+import me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator;
+
+/**
+ * An adapter to enable over-scrolling over object of {@link ViewPager}
+ *
+ * @see HorizontalOverScrollBounceEffectDecorator
+ */
+public class ViewPagerOverScrollDecorAdapter implements IOverScrollDecoratorAdapter, ViewPager.OnPageChangeListener {
+
+    protected final ViewPager mViewPager;
+
+    protected int mLastPagerPosition = 0;
+    protected float mLastPagerScrollOffset;
+
+    public ViewPagerOverScrollDecorAdapter(ViewPager viewPager) {
+        this.mViewPager = viewPager;
+
+        mViewPager.addOnPageChangeListener(this);
+
+        mLastPagerPosition = mViewPager.getCurrentItem();
+        mLastPagerScrollOffset = 0f;
+    }
+
+    @Override
+    public View getView() {
+        return mViewPager;
+    }
+
+    @Override
+    public boolean isInAbsoluteStart() {
+
+        return mLastPagerPosition == 0 &&
+                mLastPagerScrollOffset == 0f;
+    }
+
+    @Override
+    public boolean isInAbsoluteEnd() {
+
+        return mLastPagerPosition == mViewPager.getAdapter().getCount()-1 &&
+                mLastPagerScrollOffset == 0f;
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        mLastPagerPosition = position;
+        mLastPagerScrollOffset = positionOffset;
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecoratorTest.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecoratorTest.java
new file mode 100755
index 0000000..1e06199
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecoratorTest.java
@@ -0,0 +1,636 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+import static me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator.DEFAULT_DECELERATE_FACTOR;
+import static me.everything.android.ui.overscroll.HorizontalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class HorizontalOverScrollBounceEffectDecoratorTest {
+
+    View mView;
+    IOverScrollDecoratorAdapter mViewAdapter;
+    IOverScrollStateListener mStateListener;
+    IOverScrollUpdateListener mUpdateListener;
+
+    @Before
+    public void setUp() {
+        mView = mock(View.class);
+        mViewAdapter = mock(IOverScrollDecoratorAdapter.class);
+        when(mViewAdapter.getView()).thenReturn(mView);
+
+        mStateListener = mock(IOverScrollStateListener.class);
+        mUpdateListener = mock(IOverScrollUpdateListener.class);
+    }
+
+    @Test
+    public void detach_decoratorIsAttached_detachFromView() {
+
+        // Arrange
+
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter);
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    @Test
+    public void detach_overScrollInEffect_detachFromView() {
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, createShortRightMoveEvent());
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    /*
+     * Move-action event
+     */
+
+    @Test
+    public void onTouchMoveAction_notInViewEnds_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragRightInLeftEnd_overscrollRight() {
+
+        // Arrange
+
+        MotionEvent event = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        final float expectedTransX = (event.getX() - event.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragLeftInRightEnd_overscrollLeft() {
+
+        // Arrange
+
+        MotionEvent event = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        final float expectedTransX = (event.getX() - event.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragLeftInLeftEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragRightInRightEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndRightDragInLeftEnd_overscrollRightFurther() {
+
+        // Arrange
+
+        // Bring UUT to a right-overscroll state
+        MotionEvent event1 = createShortRightMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd right-drag event
+        MotionEvent event2 = createLongRightMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransX1 = (event1.getX() - event1.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransX2 = (event2.getX() - event2.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX2);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndLeftDragInRightEnd_overscrollLeftFurther() {
+
+        // Arrange
+
+        // Bring UUT to a left-overscroll state
+        MotionEvent event1 = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd left-drag event
+        MotionEvent event2 = createLongLeftMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransX1 = (event1.getX() - event1.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransX2 = (event2.getX() - event2.getHistoricalX(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationX(expectedTransX2);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (to the right in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to
+     * remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragLeftWhenRightOverscolled_continueOverscrollingLeft() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a right-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveRight = createLongRightMoveEvent();
+        uut.onTouch(mView, eventMoveRight);
+        reset(mView);
+        float startTransX = (eventMoveRight.getX() - eventMoveRight.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the left-drag event
+        MotionEvent eventMoveLeft = createShortLeftMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveLeft);
+
+        // Assert
+
+        float expectedTransX = startTransX +
+                                (eventMoveLeft.getX() - eventMoveLeft.getHistoricalX(0)) / touchDragRatioBck;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransX));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (to the left in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragRightWhenLeftOverscolled_continueOverscrollingRight() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a left-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveLeft = createLongLeftMoveEvent();
+        uut.onTouch(mView, eventMoveLeft);
+        reset(mView);
+
+        float startTransX = (eventMoveLeft.getX() - eventMoveLeft.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the right-drag event
+        MotionEvent eventMoveRight = createShortRightMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveRight);
+
+        // Assert
+
+        float expectedTransX = startTransX + (eventMoveRight.getX() - eventMoveRight.getHistoricalX(0)) / touchDragRatioBck;
+        verify(mView).setTranslationX(expectedTransX);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransX));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenRightOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a right-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveRight = createLongRightMoveEvent();
+        uut.onTouch(mView, eventMoveRight);
+        reset(mView);
+        float startTransX = (eventMoveRight.getX() - eventMoveRight.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the left-drag event
+        MotionEvent eventMoveLeft = createLongLeftMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveLeft);
+
+        // Assert
+
+        verify(mView).setTranslationX(0);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_START_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenLeftOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a left-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveLeft = createLongLeftMoveEvent();
+        uut.onTouch(mView, eventMoveLeft);
+        reset(mView);
+        float startTransX = (eventMoveLeft.getX() - eventMoveLeft.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the left-drag event
+        MotionEvent eventMoveRight = createLongRightMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveRight);
+
+        // Assert
+
+        verify(mView).setTranslationX(0);
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_END_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+
+    /*
+     * Up action event
+     */
+
+    @Test
+    public void onTouchUpAction_eventWhenNotOverscrolled_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createDefaultUpActionEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * TODO: Make this work using a decent animation shadows / newer Robolectric
+     * @throws Exception
+     */
+    @Ignore
+    @Test
+    public void onTouchUpAction_eventWhenLeftOverscrolling_smoothScrollBackToRightEnd() {
+
+        // Arrange
+
+        // Bring UUT to a left-overscroll state
+        MotionEvent moveEvent = createShortLeftMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        HorizontalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, moveEvent);
+        reset(mView);
+
+        // Make the view as though it's been moved by the move event
+        float viewX = moveEvent.getX();
+        when(mView.getTranslationX()).thenReturn(viewX);
+
+        MotionEvent upEvent = createDefaultUpActionEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, upEvent);
+
+        // Assert
+
+        assertTrue(ret);
+
+        verify(mView, atLeastOnce()).setTranslationX(anyFloat());
+    }
+
+    protected MotionEvent createShortRightMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(100f);
+        when(event.getY()).thenReturn(200f);
+        when(event.getX(0)).thenReturn(100f);
+        when(event.getY(0)).thenReturn(200f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(80f);
+        when(event.getHistoricalY(eq(0))).thenReturn(190f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(80f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(190f);
+        return event;
+    }
+
+    protected MotionEvent createLongRightMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(150f);
+        when(event.getY()).thenReturn(250f);
+        when(event.getX(0)).thenReturn(150f);
+        when(event.getY(0)).thenReturn(250f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0))).thenReturn(200f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(200f);
+        return event;
+    }
+
+    protected MotionEvent createShortLeftMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(100f);
+        when(event.getY()).thenReturn(200f);
+        when(event.getX(0)).thenReturn(100f);
+        when(event.getY(0)).thenReturn(200f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(120f);
+        when(event.getHistoricalY(eq(0))).thenReturn(220f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(120f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(220f);
+        return event;
+    }
+
+    protected MotionEvent createLongLeftMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(50f);
+        when(event.getY()).thenReturn(150f);
+        when(event.getX(0)).thenReturn(50f);
+        when(event.getY(0)).thenReturn(150f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0))).thenReturn(200f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(100f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(200f);
+        return event;
+    }
+
+    protected MotionEvent createDefaultUpActionEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_UP);
+        return event;
+    }
+
+    protected HorizontalOverScrollBounceEffectDecorator getUUT() {
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+
+    protected HorizontalOverScrollBounceEffectDecorator getUUT(float touchDragRatioFwd, float touchDragRatioBck) {
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter, touchDragRatioFwd, touchDragRatioBck, DEFAULT_DECELERATE_FACTOR);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+}
diff --git a/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecoratorTest.java b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecoratorTest.java
new file mode 100755
index 0000000..eeb2102
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecoratorTest.java
@@ -0,0 +1,596 @@
+package me.everything.android.ui.overscroll;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import me.everything.android.ui.overscroll.adapters.IOverScrollDecoratorAdapter;
+
+import static me.everything.android.ui.overscroll.IOverScrollState.*;
+import static me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator.DEFAULT_DECELERATE_FACTOR;
+import static me.everything.android.ui.overscroll.VerticalOverScrollBounceEffectDecorator.DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.*;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class VerticalOverScrollBounceEffectDecoratorTest {
+
+    View mView;
+    IOverScrollDecoratorAdapter mViewAdapter;
+    IOverScrollStateListener mStateListener;
+    IOverScrollUpdateListener mUpdateListener;
+
+    @Before
+    public void setUp() {
+        mView = mock(View.class);
+        mViewAdapter = mock(IOverScrollDecoratorAdapter.class);
+        when(mViewAdapter.getView()).thenReturn(mView);
+
+        mStateListener = mock(IOverScrollStateListener.class);
+        mUpdateListener = mock(IOverScrollUpdateListener.class);
+    }
+
+    @Test
+    public void detach_decoratorIsAttached_detachFromView() {
+
+        // Arrange
+
+        HorizontalOverScrollBounceEffectDecorator uut = new HorizontalOverScrollBounceEffectDecorator(mViewAdapter);
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    @Test
+    public void detach_overScrollInEffect_detachFromView() {
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, createShortDownwardsMoveEvent());
+
+        // Act
+
+        uut.detach();
+
+        // Assert
+
+        verify(mView).setOnTouchListener(null);
+        verify(mView).setOverScrollMode(View.OVER_SCROLL_ALWAYS);
+    }
+
+    /*
+     * Move-action event
+     */
+
+    @Test
+    public void onTouchMoveAction_notInViewEnds_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut),anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragDownInUpperEnd_overscrollDownwards() {
+
+        // Arrange
+
+        MotionEvent event = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        float expectedTransY = (event.getY() - event.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragUpInBottomEnd_overscrollUpwards() {
+
+        // Arrange
+
+        MotionEvent event = createShortUpwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        float expectedTransY = (event.getY() - event.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY));
+    }
+
+    @Test
+    public void onTouchMoveAction_dragUpInUpperEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortUpwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_dragDownInBottomEnd_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndDownDragInUpperEnd_overscrollDownwardsFurther() {
+
+        // Arrange
+
+        // Bring UUT to a downwards-overscroll state
+        MotionEvent event1 = createShortDownwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd downwards-drag event
+        MotionEvent event2 = createLongDownwardsMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransY1 = (event1.getY() - event1.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransY2 = (event2.getY() - event2.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY2);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_2ndUpDragInBottomEnd_overscrollUpwardsFurther() {
+
+        // Arrange
+
+        // Bring UUT to an upwards-overscroll state
+        MotionEvent event1 = createShortUpwardsMoveEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+        uut.onTouch(mView, event1);
+        reset(mView);
+
+        // Create 2nd upward-drag event
+        MotionEvent event2 = createLongUpwardsMoveEvent();
+
+        // Act
+
+        final boolean ret = uut.onTouch(mView, event2);
+
+        // Assert
+
+        final float expectedTransY1 = (event1.getY() - event1.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        final float expectedTransY2 = (event2.getY() - event2.getHistoricalY(0)) / DEFAULT_TOUCH_DRAG_MOVE_RATIO_FWD;
+        verify(mView).setTranslationY(expectedTransY2);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY1));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY2));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (downwards in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragUpWhenDownOverscolled_continueOverscrollingUpwards() {
+
+        // Arrange
+
+        // In down & up drag tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a downwrads-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveRight = createLongDownwardsMoveEvent();
+        uut.onTouch(mView, eventMoveRight);
+        reset(mView);
+        float startTransY = (eventMoveRight.getY() - eventMoveRight.getHistoricalY(0)) / touchDragRatioFwd;
+        when(mView.getTranslationY()).thenReturn(startTransY);
+
+        // Create the up-drag event
+        MotionEvent eventMoveUpwards = createShortUpwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveUpwards);
+
+        // Assert
+
+        float expectedTransY = startTransY +
+                (eventMoveUpwards.getY() - eventMoveUpwards.getHistoricalY(0)) / touchDragRatioBck;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_START_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransY));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(expectedTransY));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /**
+     * When over-scroll has already started (upwards in this case) and suddenly the user changes
+     * their mind and scrolls a bit in the other direction:
+     * <br/>We expect the <b>touch to still be intercepted</b> in that case, and the <b>overscroll to remain in effect</b>.
+     */
+    @Test
+    public void onTouchMoveAction_dragDownWhenUpOverscolled_continueOverscrollingDownwards() {
+
+        // Arrange
+
+        // In up & down drag tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to an upwards-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveUp = createLongUpwardsMoveEvent();
+        uut.onTouch(mView, eventMoveUp);
+        reset(mView);
+
+        float startTransY = (eventMoveUp.getY() - eventMoveUp.getHistoricalY(0)) / touchDragRatioFwd;
+        when(mView.getTranslationY()).thenReturn(startTransY);
+
+        // Create the down-drag event
+        MotionEvent eventMoveDown = createShortDownwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveDown);
+
+        // Assert
+
+        float expectedTransY = startTransY + (eventMoveDown.getY() - eventMoveDown.getHistoricalY(0)) / touchDragRatioBck;
+        verify(mView).setTranslationY(expectedTransY);
+        verify(mView, never()).setTranslationX(anyFloat());
+        assertTrue(ret);
+        assertEquals(STATE_DRAG_END_SIDE, uut.getCurrentState());
+
+        // State-change listener called only once?
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransY));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(expectedTransY));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenDownOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a downwards-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(false);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveDown = createLongDownwardsMoveEvent();
+        uut.onTouch(mView, eventMoveDown);
+        reset(mView);
+        float startTransX = (eventMoveDown.getX() - eventMoveDown.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the (negative) upwards-drag event
+        MotionEvent eventMoveUp = createLongUpwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveUp);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView).setTranslationY(0);
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_START_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_START_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_START_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    @Test
+    public void onTouchMoveAction_undragWhenUpOverscrolled_endOverscrolling() {
+
+        // Arrange
+
+        // In left & right tests we use equal ratios to avoid the effect's under-scroll handling
+        final float touchDragRatioFwd = 3f;
+        final float touchDragRatioBck = 3f;
+
+        // Bring UUT to a left-overscroll state
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(false);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT(touchDragRatioFwd, touchDragRatioBck);
+        MotionEvent eventMoveUp = createLongUpwardsMoveEvent();
+        uut.onTouch(mView, eventMoveUp);
+        reset(mView);
+        float startTransX = (eventMoveUp.getX() - eventMoveUp.getHistoricalX(0)) / touchDragRatioFwd;
+        when(mView.getTranslationX()).thenReturn(startTransX);
+
+        // Create the (negative) downwards-drag event
+        MotionEvent eventMoveDown = createLongDownwardsMoveEvent();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, eventMoveDown);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView).setTranslationY(0);
+        assertTrue(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        // State-change listener invoked to say drag-on and drag-off (idle).
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_IDLE), eq(STATE_DRAG_END_SIDE));
+        verify(mStateListener).onOverScrollStateChange(eq(uut), eq(STATE_DRAG_END_SIDE), eq(STATE_IDLE));
+        verify(mStateListener, times(2)).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        // Update-listener called exactly twice?
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(startTransX));
+        verify(mUpdateListener).onOverScrollUpdate(eq(uut), eq(STATE_DRAG_END_SIDE), eq(0f));
+        verify(mUpdateListener, times(2)).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    /*
+     * Up action event
+     */
+
+    @Test
+    public void onTouchUpAction_eventWhenNotOverscrolled_ignoreTouchEvent() {
+
+        // Arrange
+
+        MotionEvent event = createDefaultUpActionEvent();
+
+        when(mViewAdapter.isInAbsoluteStart()).thenReturn(true);
+        when(mViewAdapter.isInAbsoluteEnd()).thenReturn(true);
+
+        VerticalOverScrollBounceEffectDecorator uut = getUUT();
+
+        // Act
+
+        boolean ret = uut.onTouch(mView, event);
+
+        // Assert
+
+        verify(mView, never()).setTranslationX(anyFloat());
+        verify(mView, never()).setTranslationY(anyFloat());
+        assertFalse(ret);
+        assertEquals(STATE_IDLE, uut.getCurrentState());
+
+        verify(mStateListener, never()).onOverScrollStateChange(eq(uut), anyInt(), anyInt());
+        verify(mUpdateListener, never()).onOverScrollUpdate(eq(uut), anyInt(), anyFloat());
+    }
+
+    protected MotionEvent createShortDownwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(200f);
+        when(event.getY()).thenReturn(100f);
+        when(event.getX(0)).thenReturn(200f);
+        when(event.getY(0)).thenReturn(100f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(190f);
+        when(event.getHistoricalY(eq(0))).thenReturn(80f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(190f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(80f);
+        return event;
+    }
+
+    protected MotionEvent createLongDownwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(250f);
+        when(event.getY()).thenReturn(150f);
+        when(event.getX(0)).thenReturn(250f);
+        when(event.getY(0)).thenReturn(150f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(200f);
+        when(event.getHistoricalY(eq(0))).thenReturn(100f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(200f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(100f);
+        return event;
+    }
+
+    protected MotionEvent createShortUpwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(200f);
+        when(event.getY()).thenReturn(100f);
+        when(event.getX(0)).thenReturn(200f);
+        when(event.getY(0)).thenReturn(100f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(220f);
+        when(event.getHistoricalY(eq(0))).thenReturn(120f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(220f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(120f);
+        return event;
+    }
+
+    protected MotionEvent createLongUpwardsMoveEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_MOVE);
+        when(event.getX()).thenReturn(200f);
+        when(event.getY()).thenReturn(100f);
+        when(event.getX(0)).thenReturn(200f);
+        when(event.getY(0)).thenReturn(100f);
+        when(event.getHistorySize()).thenReturn(1);
+        when(event.getHistoricalX(eq(0))).thenReturn(250f);
+        when(event.getHistoricalY(eq(0))).thenReturn(150f);
+        when(event.getHistoricalX(eq(0), eq(0))).thenReturn(250f);
+        when(event.getHistoricalY(eq(0), eq(0))).thenReturn(150f);
+        return event;
+    }
+
+    protected MotionEvent createDefaultUpActionEvent() {
+        MotionEvent event = mock(MotionEvent.class);
+        when(event.getAction()).thenReturn(MotionEvent.ACTION_UP);
+        return event;
+    }
+
+    protected VerticalOverScrollBounceEffectDecorator getUUT() {
+        VerticalOverScrollBounceEffectDecorator uut = new VerticalOverScrollBounceEffectDecorator(mViewAdapter);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+
+    protected VerticalOverScrollBounceEffectDecorator getUUT(float touchDragRatioFwd, float touchDragRatioBck) {
+        VerticalOverScrollBounceEffectDecorator uut = new VerticalOverScrollBounceEffectDecorator(mViewAdapter, touchDragRatioFwd, touchDragRatioBck, DEFAULT_DECELERATE_FACTOR);
+        uut.setOverScrollStateListener(mStateListener);
+        uut.setOverScrollUpdateListener(mUpdateListener);
+        return uut;
+    }
+}
\ No newline at end of file
diff --git a/OnTime_User_live/lib/overscroll-decor/recyclerview_demo.gif b/OnTime_User_live/lib/overscroll-decor/recyclerview_demo.gif
new file mode 100755
index 0000000..3610e9d
Binary files /dev/null and b/OnTime_User_live/lib/overscroll-decor/recyclerview_demo.gif differ
diff --git a/OnTime_User_live/lib/overscroll-decor/settings.gradle b/OnTime_User_live/lib/overscroll-decor/settings.gradle
new file mode 100755
index 0000000..cddea94
--- /dev/null
+++ b/OnTime_User_live/lib/overscroll-decor/settings.gradle
@@ -0,0 +1 @@
+include ':app', ':liboverscroll'
diff --git a/OnTime_User_live/settings.gradle b/OnTime_User_live/settings.gradle
old mode 100644
new mode 100755
index e7b4def..d3afc7a
--- a/OnTime_User_live/settings.gradle
+++ b/OnTime_User_live/settings.gradle
@@ -1 +1,13 @@
 include ':app'
+
+// Local lib (in this app's lib/ folder) for optional use
+include ':rating-view'
+project(':rating-view').projectDir = new File(settingsDir, 'lib/RatingView/rating-view')
+include ':liboverscroll'
+project(':liboverscroll').projectDir = new File(settingsDir, 'lib/overscroll-decor/liboverscroll')
+include ':prdownloader'
+project(':prdownloader').projectDir = new File(settingsDir, 'lib/PRDownloader/prdownloader')
+include ':textdrawable'
+project(':textdrawable').projectDir = new File(settingsDir, 'lib/TextDrawable/library')
+include ':fragmentanimations'
+project(':fragmentanimations').projectDir = new File(settingsDir, 'lib/FragmentAnimations/fragmentanimations')
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/SECURITY.md b/SECURITY.md
old mode 100644
new mode 100755
diff --git a/TEST_APP.md b/TEST_APP.md
new file mode 100644
index 0000000..8f8c735
--- /dev/null
+++ b/TEST_APP.md
@@ -0,0 +1,69 @@
+# Testing OnTime Apps
+
+## Backend API (test endpoint)
+
+**Base URL:** `https://apitest.semestaterpadu.my.id/`
+
+- **Health check:** `GET https://apitest.semestaterpadu.my.id/api/notification`  
+  Expected: `{"message":"Notification API ready"}`
+- **FCM send:** `POST https://apitest.semestaterpadu.my.id/api/notification/send_generic`  
+  Body: `{"target":"<fcm_token>","is_topic":false,"data":{...}}`
+
+Backend notification API is reachable at the test endpoint.
+
+---
+
+## Android apps (User & Driver)
+
+### Prerequisites
+
+- **JDK 17+** (project uses Gradle 8.x / AGP 8.5)
+- **Android SDK** (API 33; build-tools, platform-tools)
+- **Android device or emulator** (for install/run)
+- Optional: **Android Studio** (simplest: open project → Run)
+
+### Build from command line
+
+```bash
+# User app
+cd OnTime_User_live
+./gradlew assembleDebug
+
+# Driver app
+cd OnTime_Driver_live
+./gradlew assembleDebug
+```
+
+Debug APK output:
+- User: `OnTime_User_live/app/build/outputs/apk/debug/app-debug.apk`
+- Driver: `OnTime_Driver_live/app/build/outputs/apk/debug/app-debug.apk`
+
+### Install and run on device/emulator
+
+```bash
+# Ensure one device/emulator is connected: adb devices
+
+# User app
+cd OnTime_User_live && ./gradlew installDebug
+
+# Driver app
+cd OnTime_Driver_live && ./gradlew installDebug
+```
+
+Or in Android Studio: open `OnTime_User_live` or `OnTime_Driver_live` → Run (▶).
+
+### User app signing (debug)
+
+User app uses a debug keystore: `OnTime_User_live/app/ontimekeystore.jks`.  
+If the file is missing, either add it or in `app/build.gradle` point `storeFile` to your own debug keystore (or use the default debug keystore by removing/commenting the `signingConfigs` block for debug).
+
+---
+
+## Quick flow to test ordering
+
+1. **Backend:** Confirm `https://apitest.semestaterpadu.my.id/api/notification` returns `Notification API ready`.
+2. **User app:** Login → choose fitur → set jemput & tujuan → set payment → Order. App will call backend and send FCM to drivers.
+3. **Driver app:** Login (driver account). When an order is sent, FCM opens NewOrderActivity → Accept (or auto-accept). User app should switch to ProgressActivity.
+4. **Driver:** In OrderFragment tap Start, then Finish (sampai tujuan). User app ProgressActivity should show “driver start” then “finish/tiba di tujuan”.
+
+Use the same backend (apitest.semestaterpadu.my.id) for both apps so FCM and API stay consistent.
diff --git a/backendpanel/.htaccess b/backendpanel/.htaccess
old mode 100644
new mode 100755
diff --git a/backendpanel/MODIFIED_FILES.md b/backendpanel/MODIFIED_FILES.md
new file mode 100644
index 0000000..17631b0
--- /dev/null
+++ b/backendpanel/MODIFIED_FILES.md
@@ -0,0 +1,83 @@
+# Backend panel files modified (from ordering workflow & fixes)
+
+All paths below are relative to **backendpanel/**.
+
+---
+
+## 1. `application/controllers/api/Notification.php`
+
+**Change:** Load FCM v1 helper before calling the notification model so `send_generic` works.
+
+- Added: `$this->load->helper('fcm_v1_helper');` at the start of `send_generic_post()`, before reading `$decoded`.
+
+**Reason:** User and Driver apps send FCM via `POST api/notification/send_generic`. The controller calls `send_generic_to_token` / `send_generic_to_topic`, which use `fcm_v1_send()` from the helper.
+
+---
+
+## 2. `application/models/Notification_model.php`
+
+**Change:** Implemented generic FCM send methods used by the API.
+
+- Added: **`send_generic_to_token($target, $data, $options)`**  
+  Flattens `$data` (string values for FCM), loads `fcm_v1_helper` if needed, calls `fcm_v1_send($target, $flat, false, $options)`. Returns `true`/`false`.
+
+- Added: **`send_generic_to_topic($target, $data, $options)`**  
+  Same as above but calls `fcm_v1_send(..., true, $options)` for topic.
+
+**Reason:** The API was calling these methods but they did not exist. Without them, ordering FCM from User/Driver apps would fail.
+
+---
+
+## 3. `application/config/config.php`
+
+**Change:** Documented the test backend URL.
+
+- Added comment in the base_url block:  
+  `| Test backend API: apitest.semestaterpadu.my.id`
+- No change to the actual `$config['base_url']` value (already `https://apitest.semestaterpadu.my.id/`).
+
+**Reason:** Clarify that the test backend endpoint is `apitest.semestaterpadu.my.id`.
+
+---
+
+## 4. `application/models/Pelanggan_model.php`
+
+**Changes:**
+
+- **get_driver_ride($lat, $lng, $fitur)**  
+  - **Logic:** Replaced  
+    `HAVING distance <= f.jarak_minimum`  
+    with  
+    `HAVING distance <= GREATEST(COALESCE(f.jarak_minimum, 10), 10)`  
+    so the search radius is at least 10 km (still uses real GPS from `config_driver` and user lat/lng; no region).  
+  - **Docblock:** Added comment that matching is purely by GPS, no region/wilayah; radius = `jarak_minimum` with minimum 10 km.
+
+- **get_driver_car($lat, $lng, $fitur)**  
+  - **Docblock only:** Added comment that matching is purely by GPS, no region; radius 10 km.  
+  - Query unchanged (already used a fixed 10 km radius).
+
+- **merchantnearby($long, $lat)**  
+  - **Docblock only:** Added comment that matching is purely by GPS (merchant lat/long vs user), no region; distance <= `fitur.jarak_minimum`.
+
+- **merchantpromo($long, $lat)**  
+  - **Docblock only:** “Merchant promo nearby: purely GPS, no region.”
+
+- **allmerchantnearby($long, $lat, $fitur)**  
+  - **Docblock only:** “All merchant nearby by fitur: purely GPS (merchant lat/long vs user), no region.”
+
+**Reason:**  
+- Minimum 10 km radius for ride so “tidak ada pengemudi” is less likely when drivers are close.  
+- Explicit documentation that driver and merchant nearby use only real GPS and `jarak_minimum`, with no region involvement.
+
+---
+
+## Summary table
+
+| File | Type of change |
+|------|----------------|
+| `application/controllers/api/Notification.php` | Load `fcm_v1_helper` in `send_generic_post()` |
+| `application/models/Notification_model.php` | New `send_generic_to_token`, `send_generic_to_topic` |
+| `application/config/config.php` | Comment: test backend API = apitest.semestaterpadu.my.id |
+| `application/models/Pelanggan_model.php` | Min radius 10 km in `get_driver_ride`; docblocks (purely GPS, no region) on driver & merchant nearby functions |
+
+No other files under **backendpanel** were modified for these modifications (no views, no other controllers, no other models).
diff --git a/backendpanel/application/.htaccess b/backendpanel/application/.htaccess
old mode 100644
new mode 100755
diff --git a/backendpanel/application/cache/index.html b/backendpanel/application/cache/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/autoload.php b/backendpanel/application/config/autoload.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/config.php b/backendpanel/application/config/config.php
old mode 100644
new mode 100755
index 94061b5..e690c17
--- a/backendpanel/application/config/config.php
+++ b/backendpanel/application/config/config.php
@@ -22,6 +22,8 @@ defined('BASEPATH') or exit('No direct script access allowed');
 | If you need to allow multiple domains, remember that this file is still
 | a PHP script and you can easily do that on your own.
 |
+|
+| Test backend API: apitest.semestaterpadu.my.id
 */
 $config['base_url'] = 'https://apitest.semestaterpadu.my.id/';
 
@@ -30,11 +32,16 @@ $config['base_url'] = 'https://apitest.semestaterpadu.my.id/';
 | API keys & external services (edit values here)
 |--------------------------------------------------------------------------
 */
-$config['google_maps_api_key']     = '';
-$config['firebase_db_url']         = 'https://project-on-time-apps-default-rtdb.firebaseio.com/';
-$config['fcm_project_id']           = '';
+$config['google_maps_api_key']     = 'AIzaSyB-g7AdE_hmuDjv7GMMPbrfT0N36yR3N7o';
+$config['firebase_db_url']         = 'https://ngojol-trial-default-rtdb.firebaseio.com/';
+// Firebase / FCM HTTP v1 service account configuration.
+// Project id from ngojol-trial-firebase-adminsdk JSON.
+$config['fcm_project_id']           = 'ngojol-trial';
+// Prefer using a credentials file path rather than inlining JSON here.
+// The JSON file is stored at backendpanel/ngojol-trial-firebase-adminsdk-lc81n-00c9e935db.json
+// and will be read by fcm_v1_helper via FCM_CREDENTIALS_PATH.
 $config['fcm_credentials_json']    = '';
-$config['fcm_credentials_path']    = '';
+$config['fcm_credentials_path']    = FCPATH . 'ngojol-trial-firebase-adminsdk-lc81n-00c9e935db.json';
 $config['fcm_limit_per_hour']      = 100;
 $config['fcm_limit_per_day']       = 500;
 $config['maps_limit_per_hour']     = 1000;
@@ -182,7 +189,7 @@ $config['composer_autoload'] = FALSE;
 | Leave blank to allow all characters -- but only if you are insane.
 |
 | The configured value is actually a regular expression character group
-| and it will be executed as: ! preg_match('/^[<permitted_uri_chars>]+$/i
+| and it will be executed as: ! preg_match('/^[permitted_uri_chars]+$/i
 |
 | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
 |
@@ -252,7 +259,7 @@ $config['allow_get_array'] = TRUE;
 | your log files will fill up very fast.
 |
 */
-$config['log_threshold'] = 0;
+$config['log_threshold'] = 2;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/backendpanel/application/config/constants.php b/backendpanel/application/config/constants.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/database.php b/backendpanel/application/config/database.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/doctypes.php b/backendpanel/application/config/doctypes.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/fcm.php b/backendpanel/application/config/fcm.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/foreign_chars.php b/backendpanel/application/config/foreign_chars.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/hooks.php b/backendpanel/application/config/hooks.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/index.html b/backendpanel/application/config/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/memcached.php b/backendpanel/application/config/memcached.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/migration.php b/backendpanel/application/config/migration.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/mimes.php b/backendpanel/application/config/mimes.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/profiler.php b/backendpanel/application/config/profiler.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/rest.php b/backendpanel/application/config/rest.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/routes.php b/backendpanel/application/config/routes.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/smileys.php b/backendpanel/application/config/smileys.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/config/user_agents.php b/backendpanel/application/config/user_agents.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Appnotification.php b/backendpanel/application/controllers/Appnotification.php
old mode 100644
new mode 100755
index caa94ed..0684765
--- a/backendpanel/application/controllers/Appnotification.php
+++ b/backendpanel/application/controllers/Appnotification.php
@@ -24,13 +24,25 @@ class appnotification extends CI_Controller
 
     public function send()
     {
+        $this->load->helper('fcm_v1_helper');
 
+        // Validate Firebase token before kirim. If no token, relogin (retry) is done in helper.
+        if (!fcm_v1_validate_token()) {
+            $this->session->set_flashdata('error', 'Firebase token tidak valid. Pastikan file ngojol-trial-firebase-adminsdk JSON ada dan dapat dibaca. Silakan coba lagi.');
+            redirect('appnotification/index');
+            return;
+        }
 
         $topic = $this->input->post('topic');
         $title = $this->input->post('title');
         $message = $this->input->post('message');
-        $this->notif->send_notif($title, $message, $topic);
-        $this->session->set_flashdata('send', 'Notifikasi berhasil dikirim');
+
+        $ok = $this->notif->send_notif($title, $message, $topic);
+        if ($ok) {
+            $this->session->set_flashdata('send', 'Notifikasi berhasil dikirim');
+        } else {
+            $this->session->set_flashdata('error', 'Gagal mengirim notifikasi. Firebase token mungkin kedaluwarsa. Silakan coba lagi.');
+        }
         redirect('appnotification/index');
     }
 }
diff --git a/backendpanel/application/controllers/Appsettings.php b/backendpanel/application/controllers/Appsettings.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Categorymerchant.php b/backendpanel/application/controllers/Categorymerchant.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Dashboard.php b/backendpanel/application/controllers/Dashboard.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Driver.php b/backendpanel/application/controllers/Driver.php
old mode 100644
new mode 100755
index fdf8fa9..0f3ca38
--- a/backendpanel/application/controllers/Driver.php
+++ b/backendpanel/application/controllers/Driver.php
@@ -59,6 +59,7 @@ class Driver extends CI_Controller
         $this->form_validation->set_rules('tgl_lahir', 'tgl_lahir', 'trim|prep_for_form');
         $this->form_validation->set_rules('gender', 'gender', 'trim|prep_for_form');
         $this->form_validation->set_rules('alamat_driver', 'alamat_driver', 'trim|prep_for_form');
+        $this->form_validation->set_rules('reg_id', 'reg_id', 'trim|prep_for_form');
 
 
         if ($this->form_validation->run() == TRUE) {
@@ -76,7 +77,8 @@ class Driver extends CI_Controller
                 'tempat_lahir'          => html_escape($this->input->post('tempat_lahir', TRUE)),
                 'tgl_lahir'             => html_escape($this->input->post('tgl_lahir', TRUE)),
                 'gender'                => html_escape($this->input->post('gender', TRUE)),
-                'alamat_driver'         => html_escape($this->input->post('alamat_driver', TRUE))
+                'alamat_driver'         => html_escape($this->input->post('alamat_driver', TRUE)),
+                'reg_id'                => html_escape($this->input->post('reg_id', TRUE))
             ];
 
 
diff --git a/backendpanel/application/controllers/Error404.php b/backendpanel/application/controllers/Error404.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Login.php b/backendpanel/application/controllers/Login.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Mitra.php b/backendpanel/application/controllers/Mitra.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Newregistration.php b/backendpanel/application/controllers/Newregistration.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/News.php b/backendpanel/application/controllers/News.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Partnerjob.php b/backendpanel/application/controllers/Partnerjob.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Partnerregion.php b/backendpanel/application/controllers/Partnerregion.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Profile.php b/backendpanel/application/controllers/Profile.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Promocode.php b/backendpanel/application/controllers/Promocode.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Promoslider.php b/backendpanel/application/controllers/Promoslider.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Resetpass.php b/backendpanel/application/controllers/Resetpass.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Sendemail.php b/backendpanel/application/controllers/Sendemail.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Services.php b/backendpanel/application/controllers/Services.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Transaction.php b/backendpanel/application/controllers/Transaction.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Users.php b/backendpanel/application/controllers/Users.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/Wallet.php b/backendpanel/application/controllers/Wallet.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/api/Driver.php b/backendpanel/application/controllers/api/Driver.php
old mode 100644
new mode 100755
index 2b88ac9..df2824b
--- a/backendpanel/application/controllers/api/Driver.php
+++ b/backendpanel/application/controllers/api/Driver.php
@@ -10,6 +10,7 @@ class Driver extends REST_Controller
         parent::__construct();
         
         $this->load->helper("url");
+        $this->load->helper('fcm_v1_helper');
         $this->load->database();
         $this->load->model('Driver_model');
         $this->load->model('Pelanggan_model');
@@ -75,16 +76,28 @@ class Driver extends REST_Controller
 
         $data = file_get_contents("php://input");
         $decoded_data = json_decode($data);
-        $reg_id = array(
-            'reg_id' => $decoded_data->token
-        );
+        // Only save reg_id (FCM token) when valid. Invalid/placeholder tokens are updated by relogin.
+        $token_from_regid = isset($decoded_data->reg_id) ? trim((string) $decoded_data->reg_id) : '';
+        $token_from_token = isset($decoded_data->token) ? trim((string) $decoded_data->token) : '';
+        $token = $token_from_regid !== '' ? $token_from_regid : $token_from_token;
+        $reg_id = array();
+        if ($token !== '' && function_exists('fcm_v1_is_valid_device_token') && fcm_v1_is_valid_device_token($token)) {
+            $reg_id['reg_id'] = $token;
+        }
 
         $condition = array(
-            'password' => sha1($decoded_data->password),
-            'no_telepon' => $decoded_data->no_telepon,
-            //'token' => $decoded_data->token
+            'password' => sha1($decoded_data->password)
         );
-        $check_banned = $this->Driver_model->check_banned($decoded_data->no_telepon);
+        $login_by_phone = isset($decoded_data->no_telepon) && $decoded_data->no_telepon !== '';
+        if ($login_by_phone) {
+            $condition['no_telepon'] = $decoded_data->no_telepon;
+        } else {
+            $condition['email'] = $decoded_data->email;
+        }
+
+        $check_banned = $login_by_phone
+            ? $this->Driver_model->check_banned($decoded_data->no_telepon)
+            : $this->Driver_model->check_banned_by_email($decoded_data->email);
         if ($check_banned) {
             $message = array(
                 'message' => 'banned',
@@ -96,9 +109,12 @@ class Driver extends REST_Controller
             $message = array();
 
             if ($cek_login->num_rows() > 0) {
-                $upd_regid = $this->Driver_model->edit_profile($reg_id, $decoded_data->no_telepon);
+                $no_telepon = $cek_login->row()->no_telepon;
+                if (!empty($reg_id)) {
+                    $this->Driver_model->edit_profile($reg_id, $no_telepon);
+                }
                 $get_pelanggan = $this->Driver_model->get_data_pelanggan($condition);
-                $this->Driver_model->edit_status_login($decoded_data->no_telepon);
+                $this->Driver_model->edit_status_login($no_telepon);
                 $message = array(
                     'code' => '200',
                     'message' => 'found',
@@ -133,6 +149,12 @@ class Driver extends REST_Controller
         );
         $ins = $this->Driver_model->my_location($data);
 
+        // When driver sends valid FCM token (reg_id) with location, update so they receive order requests. Invalid/placeholder tokens are updated by relogin.
+        $reg_id = isset($decoded_data->reg_id) ? trim((string) $decoded_data->reg_id) : '';
+        if ($reg_id !== '' && isset($decoded_data->id_driver) && function_exists('fcm_v1_is_valid_device_token') && fcm_v1_is_valid_device_token($reg_id)) {
+            $this->Driver_model->update_driver_reg_id($decoded_data->id_driver, $reg_id);
+        }
+
         if ($ins) {
             $message = array(
                 'message' => 'location updated',
@@ -360,6 +382,7 @@ class Driver extends REST_Controller
 
         $data = file_get_contents("php://input");
         $dec_data = json_decode($data);
+        log_message('debug', 'accept_post: payload=' . $data);
 
         $data_req = array(
             'id_driver' => $dec_data->id,
@@ -372,9 +395,11 @@ class Driver extends REST_Controller
         );
 
         $cek_login = $this->Driver_model->get_status_driver($condition);
+        log_message('debug', 'accept_post: get_status_driver rows=' . $cek_login->num_rows());
         if ($cek_login->num_rows() > 0) {
 
             $acc_req = $this->Driver_model->accept_request($data_req);
+            log_message('debug', 'accept_post: accept_request result=' . json_encode($acc_req));
             if ($acc_req['status']) {
                 $message = array(
                     'message' => 'berhasil',
@@ -415,6 +440,7 @@ class Driver extends REST_Controller
 
         $data = file_get_contents("php://input");
         $dec_data = json_decode($data);
+        log_message('debug', 'start_post: payload=' . $data);
 
         $data_req = array(
             'id_driver' => $dec_data->id,
@@ -422,6 +448,7 @@ class Driver extends REST_Controller
         );
 
         $acc_req = $this->Driver_model->start_request($data_req);
+        log_message('debug', 'start_post: start_request result=' . json_encode($acc_req));
         if ($acc_req['status']) {
             $message = array(
                 'message' => 'berhasil',
@@ -455,6 +482,7 @@ class Driver extends REST_Controller
 
         $data = file_get_contents("php://input");
         $dec_data = json_decode($data);
+        log_message('debug', 'finish_post: payload=' . $data);
 
         $data_req = array(
             'id_driver' => $dec_data->id,
@@ -467,6 +495,7 @@ class Driver extends REST_Controller
         );
 
         $finish_transaksi = $this->Driver_model->finish_request($data_req, $data_tr);
+        log_message('debug', 'finish_post: finish_request result=' . json_encode($finish_transaksi));
         if ($finish_transaksi['status']) {
             $message = array(
                 'message' => 'berhasil',
@@ -863,6 +892,12 @@ class Driver extends REST_Controller
                 $namafoto = time() . '-' . rand(0, 99999) . ".jpg";
                 $path = "images/fotodriver/" . $namafoto;
                 file_put_contents($path, base64_decode($image));
+
+                // New driver registrations from older apps do not send an FCM token yet.
+                // Generate a deterministic placeholder based on email so reg_id is never empty.
+                // This stays unusable for FCM v1 because fcm_v1_is_valid_device_token() will reject it.
+                $regIdPlaceholder = 'R' . sprintf('%u', crc32(strtolower(trim((string) $dec_data->email))));
+
                 $data_signup = array(
                     'id' => 'D' . time(),
                     'nama_driver' => $dec_data->nama_driver,
@@ -878,7 +913,7 @@ class Driver extends REST_Controller
                     'countrycode' => $dec_data->countrycode,
                     'gender' => $dec_data->gender,
                     'alamat_driver' => $dec_data->alamat_driver,
-                    'reg_id' => 12345,
+                    'reg_id' => $regIdPlaceholder,
                     'status' => 0
                 );
 
diff --git a/backendpanel/application/controllers/api/Map.php b/backendpanel/application/controllers/api/Map.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/api/Merchant.php b/backendpanel/application/controllers/api/Merchant.php
old mode 100644
new mode 100755
index d0bf864..b3e6a00
--- a/backendpanel/application/controllers/api/Merchant.php
+++ b/backendpanel/application/controllers/api/Merchant.php
@@ -10,6 +10,7 @@ class Merchant extends REST_Controller
         parent::__construct();
        
         $this->load->helper("url");
+        $this->load->helper('fcm_v1_helper');
         $this->load->database();
         $this->load->model('Merchantapi_model');
          $this->load->model('wallet_model', 'wallet');
@@ -64,9 +65,13 @@ class Merchant extends REST_Controller
 
         $data = file_get_contents("php://input");
         $decoded_data = json_decode($data);
-        $reg_id = array(
-            'token_merchant' => $decoded_data->token
-        );
+        // Only save FCM token when valid (relogin overwrites invalid/placeholder tokens).
+        $token = isset($decoded_data->token) ? trim((string) $decoded_data->token) : '';
+        $token = (isset($decoded_data->reg_id) && trim((string) $decoded_data->reg_id) !== '') ? trim((string) $decoded_data->reg_id) : $token;
+        $reg_id = array();
+        if ($token !== '' && function_exists('fcm_v1_is_valid_device_token') && fcm_v1_is_valid_device_token($token)) {
+            $reg_id['token_merchant'] = $token;
+        }
 
         $condition = array(
             'password' => sha1($decoded_data->password),
@@ -84,7 +89,9 @@ class Merchant extends REST_Controller
             $cek_login = $this->Merchantapi_model->get_data_merchant($condition);
             $message = array();
             if ($cek_login->num_rows() > 0) {
-                $this->Merchantapi_model->edit_profile_token($reg_id, $decoded_data->no_telepon);
+                if (!empty($reg_id)) {
+                    $this->Merchantapi_model->edit_profile_token($reg_id, $decoded_data->no_telepon);
+                }
                 $get_pelanggan = $this->Merchantapi_model->get_data_merchant($condition);
                 $message = array(
                     'code' => '200',
@@ -183,6 +190,11 @@ class Merchant extends REST_Controller
                 $path = "images/merchant/" . $namafoto;
                 file_put_contents($path, base64_decode($image));
 
+                // Merchant apps prior to FCM v1 do not send a Firebase token on register.
+                // Generate a deterministic placeholder from email so token_merchant is never empty.
+                // This value is NOT a real FCM token; Notification_model will ignore it for push.
+                $tokenPlaceholder = 'R' . sprintf('%u', crc32(strtolower(trim((string) $dec_data->email))));
+
                 $data_merchant = array(
                     'id_fitur' => $dec_data->id_fitur,
                     'nama_merchant' => $dec_data->nama_merchant,
@@ -197,7 +209,7 @@ class Merchant extends REST_Controller
                     'phone_merchant' => $dec_data->phone,
                     'country_code_merchant' => $dec_data->countrycode,
                     'status_merchant' => '0',
-                    'token_merchant' => time()
+                    'token_merchant' => $tokenPlaceholder
                 );
 
                 $imagektp = $dec_data->foto_ktp;
diff --git a/backendpanel/application/controllers/api/Midtrans.php b/backendpanel/application/controllers/api/Midtrans.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/api/Notification.php b/backendpanel/application/controllers/api/Notification.php
old mode 100644
new mode 100755
index 91db145..64203e1
--- a/backendpanel/application/controllers/api/Notification.php
+++ b/backendpanel/application/controllers/api/Notification.php
@@ -48,6 +48,17 @@ class Notification extends REST_Controller
             return;
         }
 
+        $this->load->helper('fcm_v1_helper');
+
+        // Always verify FCM token is ready before using Firebase service (as in test / panel send).
+        if (!fcm_v1_validate_token()) {
+            $this->response(array(
+                'code' => '503',
+                'message' => 'fcm_token_not_ready',
+            ), 200);
+            return;
+        }
+
         $target = isset($decoded['target']) ? trim($decoded['target']) : '';
         $is_topic = !empty($decoded['is_topic']);
         $data = isset($decoded['data']) && is_array($decoded['data']) ? $decoded['data'] : array();
diff --git a/backendpanel/application/controllers/api/Pelanggan.php b/backendpanel/application/controllers/api/Pelanggan.php
old mode 100644
new mode 100755
index 1ae5b20..3dc8ea9
--- a/backendpanel/application/controllers/api/Pelanggan.php
+++ b/backendpanel/application/controllers/api/Pelanggan.php
@@ -10,6 +10,7 @@ class Pelanggan extends REST_Controller
         parent::__construct();
         
         $this->load->helper("url");
+        $this->load->helper('fcm_v1_helper');
         $this->load->database();
         $this->load->model('Pelanggan_model');
         $this->load->model('wallet_model', 'wallet');
@@ -115,16 +116,37 @@ class Pelanggan extends REST_Controller
 
         $data = file_get_contents("php://input");
         $decoded_data = json_decode($data);
-        $reg_id = array(
-            'token' => $decoded_data->token
-        );
+        if (!$decoded_data || !isset($decoded_data->password)) {
+            $this->response(array('code' => '400', 'message' => 'Invalid request', 'data' => []), 200);
+            return;
+        }
+        // Only save FCM token when valid (relogin overwrites invalid/placeholder tokens).
+        $token = isset($decoded_data->token) ? trim((string) $decoded_data->token) : '';
+        $token = (isset($decoded_data->reg_id) && trim((string) $decoded_data->reg_id) !== '') ? trim((string) $decoded_data->reg_id) : $token;
+        $reg_id = array();
+        if ($token !== '' && function_exists('fcm_v1_is_valid_device_token') && fcm_v1_is_valid_device_token($token)) {
+            $reg_id['token'] = $token;
+        }
 
         $condition = array(
-            'password' => sha1($decoded_data->password),
-            'no_telepon' => $decoded_data->no_telepon,
-            //'token' => $decoded_data->token
+            'password' => sha1($decoded_data->password)
         );
-        $check_banned = $this->Pelanggan_model->check_banned($decoded_data->no_telepon);
+        $no_telepon_val = isset($decoded_data->no_telepon) ? trim($decoded_data->no_telepon) : '';
+        $email_val = isset($decoded_data->email) ? trim($decoded_data->email) : '';
+        $login_by_phone = $no_telepon_val !== '';
+        if ($login_by_phone) {
+            $condition['no_telepon'] = $no_telepon_val;
+        } else {
+            if ($email_val === '') {
+                $this->response(array('code' => '404', 'message' => 'no hp atau password salah!', 'data' => []), 200);
+                return;
+            }
+            $condition['email'] = $email_val;
+        }
+
+        $check_banned = $login_by_phone
+            ? $this->Pelanggan_model->check_banned($no_telepon_val)
+            : $this->Pelanggan_model->check_banned_user($email_val);
         if ($check_banned) {
             $message = array(
                 'message' => 'banned',
@@ -136,7 +158,10 @@ class Pelanggan extends REST_Controller
             $message = array();
 
             if ($cek_login->num_rows() > 0) {
-                $upd_regid = $this->Pelanggan_model->edit_profile($reg_id, $decoded_data->no_telepon);
+                $no_telepon = $cek_login->row()->no_telepon;
+                if (!empty($reg_id)) {
+                    $this->Pelanggan_model->edit_profile($reg_id, $no_telepon);
+                }
                 $get_pelanggan = $this->Pelanggan_model->get_data_pelanggan($condition);
 
                 $message = array(
@@ -206,6 +231,21 @@ class Pelanggan extends REST_Controller
                 $namafoto = time() . '-' . rand(0, 99999) . ".jpg";
                 $path = "images/pelanggan/" . $namafoto;
                 file_put_contents($path, base64_decode($image));
+
+                // New users may register from older apps that do not send an FCM token.
+                // Generate a deterministic placeholder based on email so the column is never empty.
+                // This placeholder is intentionally SHORT / starting with "R" + digits so
+                // fcm_v1_is_valid_device_token() will treat it as invalid for push.
+                $incomingToken = isset($dec_data->token) ? trim((string) $dec_data->token) : '';
+                if ($incomingToken === '') {
+                    $emailForToken = isset($dec_data->email) ? strtolower(trim((string) $dec_data->email)) : '';
+                    if ($emailForToken !== '') {
+                        $incomingToken = 'R' . sprintf('%u', crc32($emailForToken));
+                    } else {
+                        $incomingToken = 'R' . sprintf('%u', crc32('guest-' . time()));
+                    }
+                }
+
                 $data_signup = array(
                     'id' => 'P' . time(),
                     'fullnama' => $dec_data->fullnama,
@@ -216,7 +256,7 @@ class Pelanggan extends REST_Controller
                     'tgl_lahir' => $dec_data->tgl_lahir,
                     'countrycode' => $dec_data->countrycode,
                     'fotopelanggan' => $namafoto,
-                    'token' => $dec_data->token,
+                    'token' => $incomingToken,
                 );
                 $signup = $this->Pelanggan_model->signup($data_signup);
                 if ($signup) {
@@ -831,24 +871,24 @@ class Pelanggan extends REST_Controller
                 $token = $this->wallet->gettoken($iduser);
                 $regid = $this->wallet->getregid($iduser);
                 $tokenmerchant = $this->wallet->gettokenmerchant($iduser);
-                
-                if ($token == NULL and $tokenmerchant == NULL and $regid != NULL) {
+
+                $topic = null;
+                if ($token == NULL and $tokenmerchant == NULL and $regid != NULL && !empty(trim((string) $regid['reg_id']))) {
                     $topic = $regid['reg_id'];
-                } else if ($regid == NULL and $tokenmerchant == NULL and $token != NULL) {
+                } else if ($regid == NULL and $tokenmerchant == NULL and $token != NULL && !empty(trim((string) $token['token']))) {
                     $topic = $token['token'];
-                } else if ($regid == NULL and $token == NULL and $tokenmerchant != NULL) {
+                } else if ($regid == NULL and $token == NULL and $tokenmerchant != NULL && !empty(trim((string) $tokenmerchant['token_merchant']))) {
                     $topic = $tokenmerchant['token_merchant'];
                 }
-                
+
                 $title = 'Sukses';
                 $message = 'Permintaan berhasil dikirim';
                 $saldo = $this->wallet->getsaldo($iduser);
-        
-                
-        
+
                 $this->wallet->ubahsaldo($iduser, $amount, $saldo);
-                //$this->wallet->ubahstatuswithdrawbyid($id);
-                $this->wallet->send_notif($title, $message, $topic);
+                if ($topic !== null) {
+                    $this->wallet->send_notif($title, $message, $topic);
+                }
                 
                 /* END EDIT */        
                 $message = array(
@@ -877,12 +917,26 @@ class Pelanggan extends REST_Controller
         }
 
         $data = file_get_contents("php://input");
-        $dec_data = json_decode($data);
+        log_message('debug', 'list_ride_post REQUEST: ' . $data);
 
-        $near = $this->Pelanggan_model->get_driver_ride($dec_data->latitude, $dec_data->longitude, $dec_data->fitur);
+        $dec_data = json_decode($data);
+        if (!$dec_data || !isset($dec_data->latitude, $dec_data->longitude, $dec_data->fitur)) {
+            log_message('error', 'list_ride_post: invalid request, missing latitude/longitude/fitur');
+            $message = array('data' => [], 'error' => 'Invalid request: latitude, longitude, fitur required');
+            $this->response($message, 200);
+            return;
+        }
+
+        $radius_km = null;
+        if (isset($dec_data->radius_km) && is_numeric($dec_data->radius_km)) {
+            $radius_km = max(1, min(100, (float) $dec_data->radius_km));
+        }
+        $near = $this->Pelanggan_model->get_driver_ride($dec_data->latitude, $dec_data->longitude, $dec_data->fitur, $radius_km);
+        $drivers = $near->result();
         $message = array(
-            'data' => $near->result()
+            'data' => $drivers
         );
+        log_message('debug', 'list_ride_post RESPONSE: fitur=' . $dec_data->fitur . ' lat=' . $dec_data->latitude . ' lng=' . $dec_data->longitude . ' radius_km=' . ($radius_km !== null ? $radius_km : 'default') . ' drivers_found=' . count($drivers));
         $this->response($message, 200);
     }
 
@@ -910,12 +964,26 @@ class Pelanggan extends REST_Controller
         }
 
         $data = file_get_contents("php://input");
-        $dec_data = json_decode($data);
+        log_message('debug', 'list_car_post REQUEST: ' . $data);
 
-        $near = $this->Pelanggan_model->get_driver_car($dec_data->latitude, $dec_data->longitude, $dec_data->fitur);
+        $dec_data = json_decode($data);
+        if (!$dec_data || !isset($dec_data->latitude, $dec_data->longitude, $dec_data->fitur)) {
+            log_message('error', 'list_car_post: invalid request, missing latitude/longitude/fitur');
+            $message = array('data' => [], 'error' => 'Invalid request: latitude, longitude, fitur required');
+            $this->response($message, 200);
+            return;
+        }
+
+        $radius_km = null;
+        if (isset($dec_data->radius_km) && is_numeric($dec_data->radius_km)) {
+            $radius_km = max(1, min(100, (float) $dec_data->radius_km));
+        }
+        $near = $this->Pelanggan_model->get_driver_car($dec_data->latitude, $dec_data->longitude, $dec_data->fitur, $radius_km);
+        $drivers = $near->result();
         $message = array(
-            'data' => $near->result()
+            'data' => $drivers
         );
+        log_message('debug', 'list_car_post RESPONSE: fitur=' . $dec_data->fitur . ' lat=' . $dec_data->latitude . ' lng=' . $dec_data->longitude . ' radius_km=' . ($radius_km !== null ? $radius_km : 'default') . ' drivers_found=' . count($drivers));
         $this->response($message, 200);
     }
 
@@ -946,6 +1014,7 @@ class Pelanggan extends REST_Controller
         } else {
             $cek = $this->Pelanggan_model->check_banned_user($_SERVER['PHP_AUTH_USER']);
             if ($cek) {
+                log_message('debug', 'request_transaksi_post: banned user ' . $_SERVER['PHP_AUTH_USER']);
                 $message = array(
                     'message' => 'fail',
                     'data' => 'Status User Banned'
@@ -956,6 +1025,7 @@ class Pelanggan extends REST_Controller
 
         $data = file_get_contents("php://input");
         $dec_data = json_decode($data);
+        log_message('debug', 'request_transaksi_post: payload=' . $data);
 
         $data_req = array(
             'id_pelanggan' => $dec_data->id_pelanggan,
@@ -977,12 +1047,18 @@ class Pelanggan extends REST_Controller
 
         $request = $this->Pelanggan_model->insert_transaksi($data_req);
         if ($request['status']) {
+            if (isset($request['data'][0]->id)) {
+                log_message('debug', 'request_transaksi_post: success id_transaksi=' . $request['data'][0]->id . ' id_pelanggan=' . $dec_data->id_pelanggan . ' fitur=' . $dec_data->order_fitur);
+            } else {
+                log_message('debug', 'request_transaksi_post: success (no id in data) payload=' . json_encode($request['data']));
+            }
             $message = array(
                 'message' => 'success',
                 'data' => $request['data']
             );
             $this->response($message, 200);
         } else {
+            log_message('error', 'request_transaksi_post: insert_transaksi fail data=' . json_encode($request['data']));
             $message = array(
                 'message' => 'fail',
                 'data' => $request['data']
@@ -1001,12 +1077,14 @@ class Pelanggan extends REST_Controller
 
         $data = file_get_contents("php://input");
         $dec_data = json_decode($data);
+        log_message('debug', 'check_status_transaksi_post: payload=' . $data);
 
         $dataTrans = array(
             'id_transaksi' => $dec_data->id_transaksi
         );
 
         $getStatus = $this->Pelanggan_model->check_status($dataTrans);
+        log_message('debug', 'check_status_transaksi_post: result=' . json_encode($getStatus));
         $this->response($getStatus, 200);
     }
 
diff --git a/backendpanel/application/controllers/api/Xendit.php b/backendpanel/application/controllers/api/Xendit.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/index.html b/backendpanel/application/controllers/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/notification.php b/backendpanel/application/controllers/notification.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/snap.php b/backendpanel/application/controllers/snap.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/controllers/vtweb.php b/backendpanel/application/controllers/vtweb.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/core/index.html b/backendpanel/application/core/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/helpers/fcm_v1_helper.php b/backendpanel/application/helpers/fcm_v1_helper.php
old mode 100644
new mode 100755
index e1fa049..61c1bf1
--- a/backendpanel/application/helpers/fcm_v1_helper.php
+++ b/backendpanel/application/helpers/fcm_v1_helper.php
@@ -12,11 +12,17 @@ if (!function_exists('fcm_v1_get_credentials')) {
     {
         $json = (defined('FCM_CREDENTIALS_JSON') ? FCM_CREDENTIALS_JSON : '');
         if ($json !== '') {
+            log_message('debug', 'FCM v1: loading credentials from FCM_CREDENTIALS_JSON');
             return json_decode($json, true);
         }
         $path = (defined('FCM_CREDENTIALS_PATH') ? FCM_CREDENTIALS_PATH : '');
-        if ($path !== '' && is_readable($path)) {
-            return json_decode(file_get_contents($path), true);
+        if ($path !== '') {
+            if (is_readable($path)) {
+                log_message('debug', 'FCM v1: loading credentials from path=' . $path);
+                return json_decode(file_get_contents($path), true);
+            } else {
+                log_message('error', 'FCM v1: credentials path not readable: ' . $path);
+            }
         }
         return null;
     }
@@ -25,47 +31,113 @@ if (!function_exists('fcm_v1_get_credentials')) {
 if (!function_exists('fcm_v1_get_access_token')) {
     /**
      * Get OAuth2 access token for FCM using service account JWT.
+     * Uses ngojol-trial-firebase-adminsdk JSON credentials.
+     * Retries once on failure (relogin to Firebase).
      * @return string|null Access token or null on failure
      */
     function fcm_v1_get_access_token()
+    {
+        $token = fcm_v1_fetch_access_token();
+        if ($token) {
+            return $token;
+        }
+        log_message('debug', 'FCM v1: Retrying Firebase auth (relogin)');
+        return fcm_v1_fetch_access_token();
+    }
+}
+
+if (!function_exists('fcm_v1_fetch_access_token')) {
+    /**
+     * Single attempt to fetch OAuth2 access token from Firebase service account.
+     * @return string|null Access token or null on failure
+     */
+    function fcm_v1_fetch_access_token()
     {
         $cred = fcm_v1_get_credentials();
         if (!$cred || empty($cred['client_email']) || empty($cred['private_key'])) {
-            log_message('error', 'FCM v1: Missing FCM_CREDENTIALS_JSON or FCM_CREDENTIALS_PATH');
+            log_message('error', 'FCM v1: Missing credentials. Ensure ngojol-trial-firebase-adminsdk JSON is at FCM_CREDENTIALS_PATH');
             return null;
         }
         $now = time();
+        $token_uri = !empty($cred['token_uri']) ? $cred['token_uri'] : 'https://oauth2.googleapis.com/token';
+        // Use cloud-platform scope. If you get invalid_scope, enable Firebase Cloud Messaging API
+        // in Google Cloud Console (APIs & Services → Library) for project ngojol-trial.
+        $scope = 'https://www.googleapis.com/auth/cloud-platform';
         $jwt = array(
             'iss' => $cred['client_email'],
             'sub' => $cred['client_email'],
             'aud' => 'https://oauth2.googleapis.com/token',
             'iat' => $now,
             'exp' => $now + 3600,
+            'scope' => $scope,
         );
         $jwt_b64 = fcm_v1_base64url_encode(json_encode(array('alg' => 'RS256', 'typ' => 'JWT')))
             . '.' . fcm_v1_base64url_encode(json_encode($jwt));
         $sig = '';
-        $key = openssl_pkey_get_private($cred['private_key']);
+        $pk = $cred['private_key'];
+        if (strpos($pk, '\\n') !== false) {
+            $pk = str_replace('\\n', "\n", $pk);
+        }
+        $key = openssl_pkey_get_private($pk);
         if (!$key) {
-            log_message('error', 'FCM v1: Invalid private key');
+            log_message('error', 'FCM v1: Invalid private key in service account JSON');
             return null;
         }
         openssl_sign($jwt_b64, $sig, $key, OPENSSL_ALGO_SHA256);
         openssl_free_key($key);
         $jwt_b64 .= '.' . fcm_v1_base64url_encode($sig);
-        $resp = @file_get_contents('https://oauth2.googleapis.com/token', false, stream_context_create(array(
+        $post_body = 'grant_type=urn:ietf:params:oauth:grant-type:jwt-bearer&assertion=' . rawurlencode($jwt_b64);
+        $ctx = stream_context_create(array(
             'http' => array(
                 'method' => 'POST',
                 'header' => "Content-Type: application/x-www-form-urlencoded",
-                'content' => 'grant_type=urn:ietf:params:oauth:grant-type:jwt-bearer&assertion=' . $jwt_b64,
+                'content' => $post_body,
+                'ignore_errors' => true,
             ),
-        )));
+        ));
+        $resp = @file_get_contents($token_uri, false, $ctx);
         if ($resp === false) {
-            log_message('error', 'FCM v1: Token request failed');
+            log_message('error', 'FCM v1: Token request failed (network or OAuth error)');
             return null;
         }
         $data = json_decode($resp, true);
-        return isset($data['access_token']) ? $data['access_token'] : null;
+        if (isset($data['access_token'])) {
+            return $data['access_token'];
+        }
+        log_message('error', 'FCM v1: Token response invalid: ' . substr($resp, 0, 200));
+        return null;
+    }
+}
+
+if (!function_exists('fcm_v1_validate_token')) {
+    /**
+     * Validate that Firebase auth token can be obtained (for FCM send).
+     * Call before kirim/send. If false, backend should prompt relogin/retry.
+     * @return bool True if token is valid and ready for FCM
+     */
+    function fcm_v1_validate_token()
+    {
+        $token = fcm_v1_get_access_token();
+        return !empty($token);
+    }
+}
+
+if (!function_exists('fcm_v1_is_valid_device_token')) {
+    /**
+     * Check if string looks like a valid FCM v1 device token (not a placeholder).
+     * Valid tokens from FirebaseMessaging.getToken() are typically 100+ chars.
+     * Placeholders like "12345", "R1234567890" are rejected. Use relogin to update.
+     *
+     * @param string|null $token FCM device token from client
+     * @return bool True if token looks valid and should be saved
+     */
+    function fcm_v1_is_valid_device_token($token)
+    {
+        $s = $token === null ? '' : trim((string) $token);
+        if ($s === '') return false;
+        if (strlen($s) < 50) return false;
+        if (preg_match('/^(12345|R\d+)$/', $s)) return false;
+        return true;
     }
 }
 
@@ -124,6 +196,14 @@ if (!function_exists('fcm_v1_send')) {
             $message['android'] = array('priority' => 'HIGH');
         }
         $body = json_encode(array('message' => $message));
+        // Log request (without auth token) for debugging
+        $logTarget = $is_topic ? ('topic=' . (string)$target) : ('token=' . substr((string)$target, 0, 20) . '...');
+        log_message(
+            'debug',
+            'FCM v1 request project_id=' . $project_id .
+            ' ' . $logTarget .
+            ' payload=' . $body
+        );
         $ctx = stream_context_create(array(
             'http' => array(
                 'method' => 'POST',
@@ -136,6 +216,51 @@ if (!function_exists('fcm_v1_send')) {
         ));
         $url = 'https://fcm.googleapis.com/v1/projects/' . $project_id . '/messages:send';
         $resp = @file_get_contents($url, false, $ctx);
-        return $resp !== false ? $resp : false;
+        if ($resp === false) {
+            log_message('error', 'FCM v1 response error for ' . $logTarget);
+            return false;
+        }
+        // Check for FCM error in response body (e.g. invalid topic, quota)
+        $decoded = json_decode($resp, true);
+        if (is_array($decoded) && isset($decoded['error'])) {
+            log_message('error', 'FCM v1 API error for ' . $logTarget . ': ' . $resp);
+            return false;
+        }
+        // On 401 (token expired), relogin and retry once
+        $http_response_header_local = isset($http_response_header) ? $http_response_header : array();
+        $is_401 = false;
+        foreach ($http_response_header_local as $h) {
+            if (preg_match('/^HTTP\/\d\.\d\s+401\b/', $h)) {
+                $is_401 = true;
+                break;
+            }
+        }
+        if ($is_401) {
+            log_message('debug', 'FCM v1: 401 received, relogin and retry');
+            $token = fcm_v1_get_access_token();
+            if ($token) {
+                $ctx = stream_context_create(array(
+                    'http' => array(
+                        'method' => 'POST',
+                        'header' =>
+                            "Content-Type: application/json\r\n" .
+                            "Authorization: Bearer " . $token . "\r\n",
+                        'content' => $body,
+                        'ignore_errors' => true,
+                    ),
+                ));
+                $resp = @file_get_contents($url, false, $ctx);
+            }
+        }
+        log_message('debug', 'FCM v1 response for ' . $logTarget . ' body=' . $resp);
+        // Treat FCM error in response body as failure
+        if (is_string($resp)) {
+            $decoded = json_decode($resp, true);
+            if (is_array($decoded) && isset($decoded['error'])) {
+                log_message('error', 'FCM v1 API error: ' . (isset($decoded['error']['message']) ? $decoded['error']['message'] : $resp));
+                return false;
+            }
+        }
+        return $resp;
     }
 }
diff --git a/backendpanel/application/helpers/firebase_auth_helper.php b/backendpanel/application/helpers/firebase_auth_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/helpers/index.html b/backendpanel/application/helpers/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/helpers/maps_helper.php b/backendpanel/application/helpers/maps_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/helpers/quota_limiter_helper.php b/backendpanel/application/helpers/quota_limiter_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/helpers/topup_helper.php b/backendpanel/application/helpers/topup_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/helpers/useraccess_helper.php b/backendpanel/application/helpers/useraccess_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/hooks/index.html b/backendpanel/application/hooks/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/index.html b/backendpanel/application/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/language/english/index.html b/backendpanel/application/language/english/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/language/index.html b/backendpanel/application/language/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/libraries/Fcm.php b/backendpanel/application/libraries/Fcm.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/libraries/Format.php b/backendpanel/application/libraries/Format.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/libraries/Midtrans.php b/backendpanel/application/libraries/Midtrans.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/libraries/REST_Controller.php b/backendpanel/application/libraries/REST_Controller.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/libraries/Veritrans.php b/backendpanel/application/libraries/Veritrans.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/libraries/class.phpmailer.php b/backendpanel/application/libraries/class.phpmailer.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/libraries/class.smtp.php b/backendpanel/application/libraries/class.smtp.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/libraries/index.html b/backendpanel/application/libraries/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/logs/index.html b/backendpanel/application/logs/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Appsettings_model.php b/backendpanel/application/models/Appsettings_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Categorymerchant_model.php b/backendpanel/application/models/Categorymerchant_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Dashboard_model.php b/backendpanel/application/models/Dashboard_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Driver_model.php b/backendpanel/application/models/Driver_model.php
old mode 100644
new mode 100755
index cbab914..13aa291
--- a/backendpanel/application/models/Driver_model.php
+++ b/backendpanel/application/models/Driver_model.php
@@ -124,6 +124,16 @@ class Driver_model extends CI_model
         }
     }
 
+    public function check_banned_by_email($email)
+    {
+        $stat = $this->db->query("SELECT id FROM driver WHERE status='3' AND email='" . $this->db->escape_str($email) . "'");
+        if ($stat->num_rows() == 1) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public function check_exist_phone_edit($id, $phone)
     {
         $cek = $this->db->query("SELECT no_telepon FROM driver where no_telepon='$phone' AND id!='$id'");
@@ -242,6 +252,19 @@ class Driver_model extends CI_model
         }
     }
 
+    /**
+     * Update driver's FCM token (reg_id) so they receive order request notifications.
+     */
+    public function update_driver_reg_id($id_driver, $reg_id)
+    {
+        if (empty($id_driver) || empty(trim((string) $reg_id))) {
+            return false;
+        }
+        $this->db->where('id', $id_driver);
+        $this->db->update('driver', array('reg_id' => trim((string) $reg_id)));
+        return $this->db->affected_rows() >= 0;
+    }
+
     public function get_data_driver($condition)
     {
         $this->db->select('driver.*, saldo.saldo');
@@ -862,7 +885,9 @@ class Driver_model extends CI_model
         $this->db->set('tempat_lahir', $data['tempat_lahir']);
         $this->db->set('tgl_lahir', $data['tgl_lahir']);
         $this->db->set('alamat_driver', $data['alamat_driver']);
-    
+        if (isset($data['reg_id'])) {
+            $this->db->set('reg_id', $data['reg_id']);
+        }
 
         $this->db->where('id', $data['id']);
         $this->db->update('driver', $data);
diff --git a/backendpanel/application/models/Email_model.php b/backendpanel/application/models/Email_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Login_model.php b/backendpanel/application/models/Login_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Merchantapi_model.php b/backendpanel/application/models/Merchantapi_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Mitra_model.php b/backendpanel/application/models/Mitra_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/News_model.php b/backendpanel/application/models/News_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Notification_model.php b/backendpanel/application/models/Notification_model.php
old mode 100644
new mode 100755
index 7a299e6..f9df4f6
--- a/backendpanel/application/models/Notification_model.php
+++ b/backendpanel/application/models/Notification_model.php
@@ -4,155 +4,193 @@ class notification_model extends CI_model
 {
   public function notif_cancel_user($id_driver, $id_transaksi, $token_user)
   {
-
-    $datanotif = array(
-      'id_driver' => $id_driver,
+    if ($this->is_token_empty($token_user) || !$this->is_valid_fcm_token($token_user)) {
+      log_message('debug', 'notif_cancel_user: skip, no/invalid Firebase token for user');
+      return true;
+    }
+    // Use FCM HTTP v1 via service account, not legacy keyfcm.
+    $payload = array(
+      'id_driver'    => $id_driver,
       'id_transaksi' => $id_transaksi,
-      'response' => '5',
-      'type' => 1
+      'response'     => '5',
+      'type'         => 1,
     );
-    $senderdata = array(
-      'data' => $datanotif,
-      'to' => $token_user
-    );
-    $headers = array(
-      "Content-Type: application/json",
-      "Authorization: key=" . keyfcm
-    );
-    $curl = curl_init();
-
-    curl_setopt_array($curl, array(
-      CURLOPT_URL => "https://fcm.googleapis.com/fcm/send",
-      CURLOPT_RETURNTRANSFER => true,
-      CURLOPT_ENCODING => "",
-      CURLOPT_MAXREDIRS => 10,
-      CURLOPT_TIMEOUT => 30,
-      CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-      CURLOPT_CUSTOMREQUEST => "POST",
-      CURLOPT_POSTFIELDS => json_encode($senderdata),
-      CURLOPT_HTTPHEADER => $headers,
-    ));
-
-    $response = curl_exec($curl);
-    $err = curl_error($curl);
-
-    curl_close($curl);
-    return $response;
+    $this->send_generic_to_token($token_user, $payload, array());
+    return true;
   }
 
   public function notif_cancel_driver($id_transaksi, $token_driver)
   {
-
-    $data = array(
+    if ($this->is_token_empty($token_driver) || !$this->is_valid_fcm_token($token_driver)) {
+      log_message('debug', 'notif_cancel_driver: skip, no/invalid Firebase token for driver');
+      return true;
+    }
+    $payload = array(
       'id_transaksi' => $id_transaksi,
-      'response' => '0',
-      'type' => 1
+      'response'     => '0',
+      'type'         => 1,
     );
-    $senderdata = array(
-      'data' => $data,
-      'to' => $token_driver
-    );
-
-    $headers = array(
-      "Content-Type: application/json",
-      'Authorization: key=' . keyfcm
-    );
-    $curl = curl_init();
-
-    curl_setopt_array($curl, array(
-      CURLOPT_URL => "https://fcm.googleapis.com/fcm/send",
-      CURLOPT_RETURNTRANSFER => true,
-      CURLOPT_ENCODING => "",
-      CURLOPT_MAXREDIRS => 10,
-      CURLOPT_TIMEOUT => 30,
-      CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-      CURLOPT_CUSTOMREQUEST => "POST",
-      CURLOPT_POSTFIELDS => json_encode($senderdata),
-      CURLOPT_HTTPHEADER => $headers,
-    ));
-
-    $response = curl_exec($curl);
-    $err = curl_error($curl);
-
-    curl_close($curl);
-
-    return $response;
+    $this->send_generic_to_token($token_driver, $payload, array());
+    return true;
   }
 
-  public function send_notif($title, $message, $topic)
+  /**
+   * Check if token/target is empty (null, empty string, or whitespace).
+   * Use before sending FCM to avoid sending when device has no token.
+   */
+  private function is_token_empty($token)
   {
+    return $token === null || trim((string) $token) === '';
+  }
 
+  /**
+   * Check if string looks like a valid FCM v1 device token (not a placeholder).
+   * Uses shared fcm_v1_is_valid_device_token helper.
+   */
+  private function is_valid_fcm_token($token)
+  {
+    if (!function_exists('fcm_v1_is_valid_device_token')) {
+      get_instance()->load->helper('fcm_v1_helper');
+    }
+    return fcm_v1_is_valid_device_token($token);
+  }
+
+  /**
+   * Send notification via FCM HTTP v1 to a device token (reg_id, token, token_merchant).
+   * Uses token API so reg_id can be used as FCM v1 target. Skips invalid/placeholder tokens.
+   * @param string $target FCM device token (from driver.reg_id, pelanggan.token, etc.)
+   * @return bool True on success or skip, false on failure
+   */
+  public function send_notif($title, $message, $target)
+  {
+    if ($this->is_token_empty($target)) {
+      log_message('debug', 'send_notif: skip, no token');
+      return true;
+    }
+    if (!$this->is_valid_fcm_token($target)) {
+      log_message('debug', 'send_notif: skip, invalid/placeholder FCM token');
+      return true;
+    }
+    if (!function_exists('fcm_v1_validate_token')) {
+      get_instance()->load->helper('fcm_v1_helper');
+    }
+    if (!fcm_v1_validate_token()) {
+      log_message('error', 'send_notif: Firebase token not ready, skip send');
+      return false;
+    }
     $data = array(
-      'title' => $title,
+      'title'   => $title,
       'message' => $message,
-      'type' => 4
+      'type'    => 4,
     );
-    $senderdata = array(
-      'data' => $data,
-      'to' => '/topics/' . $topic
+    $options = array(
+      'title' => $title,
+      'body'  => $message,
     );
-
-    $headers = array(
-      'Content-Type : application/json',
-      'Authorization: key=' . keyfcm
-    );
-    $curl = curl_init();
-
-    curl_setopt_array($curl, array(
-      CURLOPT_URL => "https://fcm.googleapis.com/fcm/send",
-      CURLOPT_RETURNTRANSFER => true,
-      CURLOPT_ENCODING => "",
-      CURLOPT_MAXREDIRS => 10,
-      CURLOPT_TIMEOUT => 30,
-      CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-      CURLOPT_CUSTOMREQUEST => "POST",
-      CURLOPT_POSTFIELDS => json_encode($senderdata),
-      CURLOPT_HTTPHEADER => $headers,
-    ));
-
-    $response = curl_exec($curl);
-    $err = curl_error($curl);
-
-    curl_close($curl);
+    return $this->send_generic_to_token($target, $data, $options);
   }
 
   public function send_notif_topup($title, $id, $message, $method, $token)
   {
-
+    if ($this->is_token_empty($token)) {
+      log_message('debug', 'send_notif_topup: skip, no Firebase token for user id=' . $id);
+      return;
+    }
+    if (!function_exists('fcm_v1_validate_token')) {
+      get_instance()->load->helper('fcm_v1_helper');
+    }
+    if (!fcm_v1_validate_token()) {
+      log_message('error', 'send_notif_topup: Firebase token not ready, skip send for user id=' . $id);
+      return;
+    }
+    // Direct token notification for topup via HTTP v1.
     $data = array(
-      'title' => $title,
-      'id' => $id,
-      'message' => $message,
+      'title'  => $title,
+      'id'     => $id,
+      'message'=> $message,
       'method' => $method,
-      'type' => 3
+      'type'   => 3,
     );
-    $senderdata = array(
-      'data' => $data,
-      'to' => $token
-
+    $options = array(
+      'title' => $title,
+      'body'  => $message,
     );
+    $this->send_generic_to_token($token, $data, $options);
+  }
 
-    $headers = array(
-      'Content-Type : application/json',
-      'Authorization: key=' . keyfcm
-    );
-    $curl = curl_init();
+  /**
+   * Send FCM via HTTP v1 API to a single device token.
+   * Used by User and Driver apps (notification/send_generic).
+   * $data must be flat key-value; values are stringified for FCM.
+   *
+   * @param string $target FCM device token
+   * @param array $data Data payload (keys preserved; values cast to string)
+   * @param array $options Optional 'title', 'body' for notification
+   * @return bool True on success, false on failure
+   */
+  public function send_generic_to_token($target, $data, $options = array())
+  {
+    if ($this->is_token_empty($target)) {
+      log_message('debug', 'FCM v1 send_generic_to_token: skip, target token empty');
+      return false;
+    }
+    if (!$this->is_valid_fcm_token($target)) {
+      log_message('debug', 'FCM v1 send_generic_to_token: skip, invalid/placeholder token');
+      return false;
+    }
+    if (!function_exists('fcm_v1_send')) {
+      get_instance()->load->helper('fcm_v1_helper');
+    }
+    if (!fcm_v1_validate_token()) {
+      log_message('error', 'FCM v1 send_generic_to_token: Firebase token not ready, skip send');
+      return false;
+    }
+    $flat = array();
+    foreach ($data as $k => $v) {
+      if (is_array($v) || is_object($v)) {
+        $flat[$k] = json_encode($v);
+      } else {
+        $flat[$k] = (string) $v;
+      }
+    }
+    log_message('debug', 'FCM v1 send_generic_to_token target=' . substr((string)$target, 0, 20) . '... payload=' . json_encode($flat));
+    $result = fcm_v1_send($target, $flat, false, $options);
+    if ($result === false) {
+      log_message('error', 'FCM v1 send_generic_to_token failed for target=' . substr((string)$target, 0, 20) . '...');
+    }
+    return $result !== false;
+  }
 
-    curl_setopt_array($curl, array(
-      CURLOPT_URL => "https://fcm.googleapis.com/fcm/send",
-      CURLOPT_RETURNTRANSFER => true,
-      CURLOPT_ENCODING => "",
-      CURLOPT_MAXREDIRS => 10,
-      CURLOPT_TIMEOUT => 30,
-      CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-      CURLOPT_CUSTOMREQUEST => "POST",
-      CURLOPT_POSTFIELDS => json_encode($senderdata),
-      CURLOPT_HTTPHEADER => $headers,
-    ));
-
-    $response = curl_exec($curl);
-    $err = curl_error($curl);
-
-    curl_close($curl);
+  /**
+   * Send FCM via HTTP v1 API to a topic.
+   *
+   * @param string $target Topic name (without /topics/ prefix)
+   * @param array $data Data payload
+   * @param array $options Optional 'title', 'body'
+   * @return bool True on success, false on failure
+   */
+  public function send_generic_to_topic($target, $data, $options = array())
+  {
+    if (!function_exists('fcm_v1_send')) {
+      get_instance()->load->helper('fcm_v1_helper');
+    }
+    if (!fcm_v1_validate_token()) {
+      log_message('error', 'FCM v1 send_generic_to_topic: Firebase token not ready, skip send');
+      return false;
+    }
+    $flat = array();
+    foreach ($data as $k => $v) {
+      if (is_array($v) || is_object($v)) {
+        $flat[$k] = json_encode($v);
+      } else {
+        $flat[$k] = (string) $v;
+      }
+    }
+    log_message('debug', 'FCM v1 send_generic_to_topic topic=' . (string)$target . ' payload=' . json_encode($flat));
+    $result = fcm_v1_send($target, $flat, true, $options);
+    if ($result === false) {
+      log_message('error', 'FCM v1 send_generic_to_topic failed for topic=' . (string)$target);
+    }
+    return $result !== false;
   }
 }
diff --git a/backendpanel/application/models/PartnerRegion_model.php b/backendpanel/application/models/PartnerRegion_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Partnerjob_model.php b/backendpanel/application/models/Partnerjob_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Pelanggan_model.php b/backendpanel/application/models/Pelanggan_model.php
old mode 100644
new mode 100755
index 12b89d3..15f3883
--- a/backendpanel/application/models/Pelanggan_model.php
+++ b/backendpanel/application/models/Pelanggan_model.php
@@ -269,19 +269,45 @@ class Pelanggan_model extends CI_model
         return true;
     }
 
-    public function get_driver_ride($lat, $lng, $fitur)
+    /**
+     * Get nearby drivers for ride: purely by GPS distance, no region/wilayah.
+     * Uses config_driver (driver's real-time lat/long from app) and user (lat, lng).
+     * Optional $radius_km (1–100): when set, used as search radius; else fitur.jarak_minimum with min 10 km.
+     * Optimized: bounding-box pre-filter + Haversine + LIMIT 50.
+     */
+    public function get_driver_ride($lat, $lng, $fitur, $radius_km = null)
     {
         $url_foto = base_url() . 'images/fotodriver/';
+        $lat = (float) $lat;
+        $lng = (float) $lng;
+        $fitur = (int) $fitur;
+
+        if ($radius_km !== null && $radius_km > 0) {
+            $radius_km = max(1, min(100, (float) $radius_km));
+        }
+
+        $box_km = isset($radius_km) ? $radius_km : 50;
+        $delta_lat = $box_km / 111.0;
+        $cos_lat = max(0.01, cos(deg2rad($lat)));
+        $delta_lng = $box_km / (111.0 * $cos_lat);
+        $lat_min = $lat - $delta_lat;
+        $lat_max = $lat + $delta_lat;
+        $lng_min = $lng - $delta_lng;
+        $lng_max = $lng + $delta_lng;
+
+        $having_radius = isset($radius_km)
+            ? (float) $radius_km
+            : 'GREATEST(COALESCE(f.jarak_minimum, 10), 10)';
 
         $result = $this->db->query("
             SELECT f.jarak_minimum, f.wallet_minimum, d.id as id, d.nama_driver, ld.latitude, ld.longitude, ld.bearing, ld.update_at,
             k.merek, k.nomor_kendaraan, k.warna, k.tipe, s.saldo,
             d.no_telepon, CONCAT('$url_foto', d.foto, '') as foto, d.reg_id, dj.driver_job,
-                (6371 * acos(cos(radians($lat)) * cos(radians( ld.latitude ))"
-            . " * cos(radians(ld.longitude) - radians($lng))"
-            . " + sin(radians($lat)) * sin( radians(ld.latitude)))) AS distance
-            FROM config_driver ld, driver d, driver_job dj, kendaraan k, saldo s,fitur f
-            WHERE ld.id_driver = d.id 
+                (6371 * acos(cos(radians($lat)) * cos(radians(ld.latitude))
+                * cos(radians(ld.longitude) - radians($lng))
+                + sin(radians($lat)) * sin(radians(ld.latitude)))) AS distance
+            FROM config_driver ld, driver d, driver_job dj, kendaraan k, saldo s, fitur f
+            WHERE ld.id_driver = d.id
                 AND f.id_fitur = $fitur
                 AND ld.status = '1'
                 AND dj.id = d.job
@@ -290,35 +316,88 @@ class Pelanggan_model extends CI_model
                 AND k.id_k = d.kendaraan
                 AND s.id_user = d.id
                 AND s.saldo > f.wallet_minimum
-            HAVING distance <= f.jarak_minimum
-            ORDER BY distance ASC");
+                AND ld.latitude BETWEEN $lat_min AND $lat_max
+                AND ld.longitude BETWEEN $lng_min AND $lng_max
+            HAVING distance <= $having_radius
+            ORDER BY distance ASC
+            LIMIT 50");
+        $count = $result->num_rows();
+        log_message('debug', 'get_driver_ride: fitur=' . $fitur . ' lat=' . $lat . ' lng=' . $lng . ' drivers_found=' . $count);
+        if ($count === 0) {
+            $this->log_driver_diagnostic('ride', $lat, $lng, $fitur, $lat_min, $lat_max, $lng_min, $lng_max, $radius_km);
+        }
         return $result;
     }
 
-    public function get_driver_car($lat, $lng, $fitur)
+    /**
+     * Diagnostic logging when 0 drivers found: counts online drivers, in-box, by job, etc.
+     */
+    private function log_driver_diagnostic($type, $lat, $lng, $fitur, $lat_min, $lat_max, $lng_min, $lng_max, $radius_km)
+    {
+        $r_online = $this->db->query("SELECT COUNT(*) as c FROM config_driver WHERE status='1'")->row();
+        $cnt_online = $r_online ? (int) $r_online->c : 0;
+        $r_box = $this->db->query("SELECT COUNT(*) as c FROM config_driver ld JOIN driver d ON ld.id_driver=d.id WHERE ld.status='1' AND d.status='1' AND ld.latitude BETWEEN " . (float)$lat_min . " AND " . (float)$lat_max . " AND ld.longitude BETWEEN " . (float)$lng_min . " AND " . (float)$lng_max)->row();
+        $cnt_in_box = $r_box ? (int) $r_box->c : 0;
+        $fitur_row = $this->db->query("SELECT driver_job, jarak_minimum, wallet_minimum FROM fitur WHERE id_fitur=" . (int)$fitur)->row();
+        $driver_job = $fitur_row ? $fitur_row->driver_job : null;
+        $cnt_job = 0;
+        if ($driver_job !== null) {
+            $r_job = $this->db->query("SELECT COUNT(*) as c FROM driver WHERE status='1' AND job=" . (int)$driver_job)->row();
+            $cnt_job = $r_job ? (int) $r_job->c : 0;
+        }
+        $fitur_exists = $fitur_row ? 'yes' : 'NO_FITUR_NOT_FOUND';
+        log_message('debug', 'get_driver_' . $type . '_diagnostic: fitur=' . $fitur . ' fitur_exists=' . $fitur_exists . ' driver_job=' . ($driver_job !== null ? $driver_job : 'n/a') . ' radius_km=' . ($radius_km !== null ? $radius_km : 'default') . ' online_drivers=' . $cnt_online . ' in_box=' . $cnt_in_box . ' with_job=' . $cnt_job);
+    }
+
+    /**
+     * Get nearby drivers for car: purely by GPS distance, no region/wilayah.
+     * Optional $radius_km (1–100); else 10 km. Optimized: bounding-box + LIMIT 50.
+     */
+    public function get_driver_car($lat, $lng, $fitur, $radius_km = null)
     {
-        $range = 10;
         $url_foto = base_url() . 'images/fotodriver/';
+        $lat = (float) $lat;
+        $lng = (float) $lng;
+        $fitur = (int) $fitur;
+        $range = ($radius_km !== null && $radius_km > 0)
+            ? max(1, min(100, (float) $radius_km))
+            : 10;
+
+        $delta_lat = $range / 111.0;
+        $cos_lat = max(0.01, cos(deg2rad($lat)));
+        $delta_lng = $range / (111.0 * $cos_lat);
+        $lat_min = $lat - $delta_lat;
+        $lat_max = $lat + $delta_lat;
+        $lng_min = $lng - $delta_lng;
+        $lng_max = $lng + $delta_lng;
 
         $result = $this->db->query("
             SELECT f.jarak_minimum, f.wallet_minimum, d.id as id, d.nama_driver, ld.latitude, ld.longitude, ld.bearing, ld.update_at,
             k.merek, k.nomor_kendaraan, k.warna, k.tipe, s.saldo,
             d.no_telepon, CONCAT('$url_foto', d.foto, '') as foto, d.reg_id, dj.driver_job,
-                (6371 * acos(cos(radians($lat)) * cos(radians( ld.latitude ))"
-            . " * cos(radians(ld.longitude) - radians($lng))"
-            . " + sin(radians($lat)) * sin( radians(ld.latitude)))) AS distance
-            FROM config_driver ld, driver d, driver_job dj, kendaraan k, saldo s,fitur f
-            WHERE ld.id_driver = d.id 
+                (6371 * acos(cos(radians($lat)) * cos(radians(ld.latitude))
+                * cos(radians(ld.longitude) - radians($lng))
+                + sin(radians($lat)) * sin(radians(ld.latitude)))) AS distance
+            FROM config_driver ld, driver d, driver_job dj, kendaraan k, saldo s, fitur f
+            WHERE ld.id_driver = d.id
                 AND f.id_fitur = $fitur
                 AND ld.status = '1'
                 AND dj.id = d.job
-                AND d.job = '2'
+                AND d.job = f.driver_job
                 AND d.status = '1'
                 AND k.id_k = d.kendaraan
                 AND s.id_user = d.id
-                AND s.saldo > 500
+                AND s.saldo > GREATEST(COALESCE(f.wallet_minimum, 0), 500)
+                AND ld.latitude BETWEEN $lat_min AND $lat_max
+                AND ld.longitude BETWEEN $lng_min AND $lng_max
             HAVING distance <= $range
-            ORDER BY distance ASC");
+            ORDER BY distance ASC
+            LIMIT 50");
+        $count = $result->num_rows();
+        log_message('debug', 'get_driver_car: fitur=' . $fitur . ' lat=' . $lat . ' lng=' . $lng . ' drivers_found=' . $count);
+        if ($count === 0) {
+            $this->log_driver_diagnostic('car', $lat, $lng, $fitur, $lat_min, $lat_max, $lng_min, $lng_max, $radius_km);
+        }
         return $result;
     }
 
@@ -467,6 +546,7 @@ class Pelanggan_model extends CI_model
             $this->delete_transaksi($dataTrans['id_transaksi']);
             $stat = FALSE;
         }
+        log_message('debug', 'check_status: id_transaksi=' . $dataTrans['id_transaksi'] . ' raw_status=' . $cek->row('status') . ' stat=' . ($stat ? 'TRUE' : 'FALSE'));
         $dataCheck = array(
             'message' => 'check status',
             'status' => $stat,
@@ -1273,6 +1353,10 @@ class Pelanggan_model extends CI_model
         return $this->db->get('category_merchant');
     }
 
+    /**
+     * Merchant nearby: purely by GPS (merchant lat/long vs user lat/long), no region.
+     * Distance <= fitur.jarak_minimum.
+     */
     public function merchantnearby($long, $lat)
     {
         $this->db->select("merchant.id_merchant , merchant.nama_merchant , merchant.alamat_merchant , merchant.rate_merchant, merchant.latitude_merchant , merchant.longitude_merchant , merchant.jam_buka , merchant.jam_tutup ,
@@ -1329,6 +1413,7 @@ class Pelanggan_model extends CI_model
         return $data;
     }
 
+    /** Merchant promo nearby: purely GPS, no region. */
     public function merchantpromo($long, $lat)
     {
         $this->db->select("merchant.id_merchant , merchant.nama_merchant , merchant.alamat_merchant , merchant.rate_merchant, merchant.latitude_merchant , merchant.longitude_merchant , merchant.jam_buka , merchant.jam_tutup ,
@@ -1411,6 +1496,7 @@ class Pelanggan_model extends CI_model
         return $this->db->get('merchant');
     }
 
+    /** All merchant nearby by fitur: purely GPS (merchant lat/long vs user), no region. */
     public function allmerchantnearby($long, $lat, $fitur)
     {
         $this->db->select("merchant.id_merchant , merchant.nama_merchant , merchant.alamat_merchant , merchant.rate_merchant, merchant.latitude_merchant , merchant.longitude_merchant , merchant.jam_buka , merchant.jam_tutup ,
diff --git a/backendpanel/application/models/Profile_model.php b/backendpanel/application/models/Profile_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Promocode_model.php b/backendpanel/application/models/Promocode_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Promoslider_model.php b/backendpanel/application/models/Promoslider_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Resetpass_model.php b/backendpanel/application/models/Resetpass_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Service_model.php b/backendpanel/application/models/Service_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Users_model.php b/backendpanel/application/models/Users_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/Wallet_model.php b/backendpanel/application/models/Wallet_model.php
old mode 100644
new mode 100755
index 7e841a0..36c8c00
--- a/backendpanel/application/models/Wallet_model.php
+++ b/backendpanel/application/models/Wallet_model.php
@@ -146,39 +146,10 @@ class wallet_model extends CI_model
 
     public function send_notif($title, $message, $topic)
     {
-
-        $data = array(
-            'title' => $title,
-            'message' => $message,
-            'type' => 3
-        );
-        $senderdata = array(
-            'data' => $data,
-            'to' => $topic
-        );
-
-        $headers = array(
-            'Content-Type : application/json',
-            'Authorization: key=' . keyfcm
-        );
-        $curl = curl_init();
-
-        curl_setopt_array($curl, array(
-            CURLOPT_URL => "https://fcm.googleapis.com/fcm/send",
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_ENCODING => "",
-            CURLOPT_MAXREDIRS => 10,
-            CURLOPT_TIMEOUT => 30,
-            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-            CURLOPT_CUSTOMREQUEST => "POST",
-            CURLOPT_POSTFIELDS => json_encode($senderdata),
-            CURLOPT_HTTPHEADER => $headers,
-        ));
-
-        $response = curl_exec($curl);
-        $err = curl_error($curl);
-
-        curl_close($curl);
+        // Delegate to Notification_model, which uses FCM HTTP v1 + service account.
+        $CI = &get_instance();
+        $CI->load->model('notification_model', 'notif');
+        $CI->notif->send_notif($title, $message, $topic);
     }
 
     public function updatesaldowallet($data)
@@ -319,7 +290,9 @@ class wallet_model extends CI_model
 
                 $title = 'Dibatalkan';
                 $desc = 'Pembayaran Kamu telah Dibatalkan';
-                $this->Notification_model->send_notif_topup($title, $wl['id_user'], $desc, $wl['invoice'], $token);
+                if ($token !== null && trim((string) $token) !== '') {
+                    $this->Notification_model->send_notif_topup($title, $wl['id_user'], $desc, $wl['invoice'], $token);
+                }
             }
         }
     }
diff --git a/backendpanel/application/models/index.html b/backendpanel/application/models/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/models/mobile_model.php b/backendpanel/application/models/mobile_model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/third_party/index.html b/backendpanel/application/third_party/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/appnotification/index.php b/backendpanel/application/views/appnotification/index.php
old mode 100644
new mode 100755
index 4bd077d..6064464
--- a/backendpanel/application/views/appnotification/index.php
+++ b/backendpanel/application/views/appnotification/index.php
@@ -5,11 +5,16 @@
       <div class="card">
         <div class="card-body">
           <h4 class="card-title">Kirim Notifikasi</h4>
-          <?php if ($this->session->flashdata()) : ?>
+          <?php if ($this->session->flashdata('send')) : ?>
             <div class="alert alert-success" role="alert">
               <?php echo $this->session->flashdata('send'); ?>
             </div>
           <?php endif; ?>
+          <?php if ($this->session->flashdata('error')) : ?>
+            <div class="alert alert-danger" role="alert">
+              <?php echo $this->session->flashdata('error'); ?>
+            </div>
+          <?php endif; ?>
           <?= form_open_multipart('appnotification/send'); ?>
           <div class="form-group">
             <label for="newscategory">Kirim Ke</label>
diff --git a/backendpanel/application/views/appsettings/addbank.php b/backendpanel/application/views/appsettings/addbank.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/appsettings/editbank.php b/backendpanel/application/views/appsettings/editbank.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/appsettings/index.php b/backendpanel/application/views/appsettings/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/categorymerchant/index.php b/backendpanel/application/views/categorymerchant/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/dashboard/detailtransaction.php b/backendpanel/application/views/dashboard/detailtransaction.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/dashboard/index.php b/backendpanel/application/views/dashboard/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/drivers/detail.php b/backendpanel/application/views/drivers/detail.php
old mode 100644
new mode 100755
index 1cf6f88..0ef5a89
--- a/backendpanel/application/views/drivers/detail.php
+++ b/backendpanel/application/views/drivers/detail.php
@@ -30,6 +30,8 @@
                                 <?= $driver['no_ktp'] ?></a>
                             <a class="d-block text-center text-dark" href="#"><?= $driver['email'] ?></a>
                             <a class="d-block text-center text-dark" href="#"><?= $driver['no_telepon'] ?></a>
+                            <a class="d-block text-center text-dark" href="#">reg_id :
+                                <?= $driver['reg_id'] ?></a>
 
                             <?php if ($driver['status'] == 0) { ?>
                                 <a class="d-block text-center" href=" <?= base_url(); ?>newregistration/confirm/<?= $driver['id'] ?>"> <button class="btn btn-outline-primary mr-2">Confirm</button>
@@ -189,6 +191,11 @@
                                     </div>
                                 </div>
 
+                                <div class="form-group">
+                                    <label for="reg_id">FCM Reg ID (device token)</label>
+                                    <input type="text" class="form-control" name="reg_id" value="<?= $driver['reg_id'] ?>">
+                                </div>
+
                                 <div class=" form-group">
                                         <label for="birthdate">Tanggal Lahir</label>
                                         <input type="date" class="form-control" name="tgl_lahir" value="<?= $driver['tgl_lahir'] ?>" required>
diff --git a/backendpanel/application/views/drivers/index.php b/backendpanel/application/views/drivers/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/drivers/tambahdriver.php b/backendpanel/application/views/drivers/tambahdriver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/drivers/tracking_driver.php b/backendpanel/application/views/drivers/tracking_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/cli/error_404.php b/backendpanel/application/views/errors/cli/error_404.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/cli/error_db.php b/backendpanel/application/views/errors/cli/error_db.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/cli/error_exception.php b/backendpanel/application/views/errors/cli/error_exception.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/cli/error_general.php b/backendpanel/application/views/errors/cli/error_general.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/cli/error_php.php b/backendpanel/application/views/errors/cli/error_php.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/cli/index.html b/backendpanel/application/views/errors/cli/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/html/error_404.php b/backendpanel/application/views/errors/html/error_404.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/html/error_db.php b/backendpanel/application/views/errors/html/error_db.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/html/error_exception.php b/backendpanel/application/views/errors/html/error_exception.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/html/error_general.php b/backendpanel/application/views/errors/html/error_general.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/html/error_php.php b/backendpanel/application/views/errors/html/error_php.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/html/index.html b/backendpanel/application/views/errors/html/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/errors/index.html b/backendpanel/application/views/errors/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/includes/footer.php b/backendpanel/application/views/includes/footer.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/includes/header.php b/backendpanel/application/views/includes/header.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/index.html b/backendpanel/application/views/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/login/index.php b/backendpanel/application/views/login/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/mitra/detail.php b/backendpanel/application/views/mitra/detail.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/mitra/edititem.php b/backendpanel/application/views/mitra/edititem.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/mitra/index.php b/backendpanel/application/views/mitra/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/mitra/newreg.php b/backendpanel/application/views/mitra/newreg.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/newregistration/index.php b/backendpanel/application/views/newregistration/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/news/addcategory.php b/backendpanel/application/views/news/addcategory.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/news/addnews.php b/backendpanel/application/views/news/addnews.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/news/editnews.php b/backendpanel/application/views/news/editnews.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/news/index.php b/backendpanel/application/views/news/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/nodata.php b/backendpanel/application/views/nodata.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/partnerjob/addpartnerjob.php b/backendpanel/application/views/partnerjob/addpartnerjob.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/partnerjob/editpartnerjob.php b/backendpanel/application/views/partnerjob/editpartnerjob.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/partnerjob/index.php b/backendpanel/application/views/partnerjob/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/partnerregion/addpartnerregion.php b/backendpanel/application/views/partnerregion/addpartnerregion.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/partnerregion/editpartnerregion.php b/backendpanel/application/views/partnerregion/editpartnerregion.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/partnerregion/index.php b/backendpanel/application/views/partnerregion/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/profile/index.php b/backendpanel/application/views/profile/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/profile/index_lawas.php b/backendpanel/application/views/profile/index_lawas.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/profile/tambahprivilage.php b/backendpanel/application/views/profile/tambahprivilage.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/profile/tambahprivilagesub.php b/backendpanel/application/views/profile/tambahprivilagesub.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/profile/tambahrole.php b/backendpanel/application/views/profile/tambahrole.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/profile/tambahroleprivilage.php b/backendpanel/application/views/profile/tambahroleprivilage.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/profile/tambahuseradmin.php b/backendpanel/application/views/profile/tambahuseradmin.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/profile/ubahpengguna.php b/backendpanel/application/views/profile/ubahpengguna.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/promocode/addpromocode.php b/backendpanel/application/views/promocode/addpromocode.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/promocode/editpromocode.php b/backendpanel/application/views/promocode/editpromocode.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/promocode/index.php b/backendpanel/application/views/promocode/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/promoslider/addslider.php b/backendpanel/application/views/promoslider/addslider.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/promoslider/editslider.php b/backendpanel/application/views/promoslider/editslider.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/promoslider/index.php b/backendpanel/application/views/promoslider/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/resetpass.php b/backendpanel/application/views/resetpass.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/sendemail/index.php b/backendpanel/application/views/sendemail/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/services/addservice.php b/backendpanel/application/views/services/addservice.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/services/editservices.php b/backendpanel/application/views/services/editservices.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/services/index.php b/backendpanel/application/views/services/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/success.php b/backendpanel/application/views/success.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/transaction/index.php b/backendpanel/application/views/transaction/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/users/detailusers.php b/backendpanel/application/views/users/detailusers.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/users/index.php b/backendpanel/application/views/users/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/users/tambahuser.php b/backendpanel/application/views/users/tambahuser.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/wallet/index.php b/backendpanel/application/views/wallet/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/wallet/tambahtopup.php b/backendpanel/application/views/wallet/tambahtopup.php
old mode 100644
new mode 100755
index 869de5f..8a2fb0a
--- a/backendpanel/application/views/wallet/tambahtopup.php
+++ b/backendpanel/application/views/wallet/tambahtopup.php
@@ -27,7 +27,8 @@
                         <label for="id_Pelanggan">User</label>
                         <select class="js-example-basic-single" style="width:100%" name="id_pelanggan">
                             <?php foreach ($saldo as $sl) {
-                                if (substr($sl['id_user'], 0, 1) == 'P') { ?>
+                                $nm = isset($sl['fullnama']) ? trim((string)$sl['fullnama']) : '';
+                                if (substr($sl['id_user'], 0, 1) == 'P' && $nm !== '') { ?>
                                     <option value="<?= $sl['id_user'] ?>"><?= $sl['fullnama'] ?> (<?= $currency['duit'] ?><?= number_format($sl['saldo'] , 0, ".", ".") ?>)</option>
                             <?php }
                             } ?>
@@ -38,7 +39,8 @@
                         <label for="id_driver">Driver</label>
                         <select class="js-example-basic-single" style="width:100%" name="id_driver">
                             <?php foreach ($saldo as $sl) {
-                                if (substr($sl['id_user'], 0, 1) == 'D') { ?>
+                                $nm = isset($sl['nama_driver']) ? trim((string)$sl['nama_driver']) : '';
+                                if (substr($sl['id_user'], 0, 1) == 'D' && $nm !== '') { ?>
                                     <option value="<?= $sl['id_user'] ?>"><?= $sl['nama_driver'] ?> (<?= $currency['duit'] ?><?= number_format($sl['saldo'] , 0, ".", ".") ?>)
                                     </option>
                             <?php }
@@ -50,7 +52,8 @@
                         <label for="id_mitra">Owner</label>
                         <select class="js-example-basic-single" style="width:100%" name="id_mitra">
                             <?php foreach ($saldo as $sl) {
-                                if (substr($sl['id_user'], 0, 1) == 'M') { ?>
+                                $nm = isset($sl['nama_mitra']) ? trim((string)$sl['nama_mitra']) : '';
+                                if (substr($sl['id_user'], 0, 1) == 'M' && $nm !== '') { ?>
                                     <option value="<?= $sl['id_user'] ?>"><?= $sl['nama_mitra'] ?> (<?= $currency['duit'] ?><?= number_format($sl['saldo'] , 0, ".", ".") ?>)
                                     </option>
                             <?php }
diff --git a/backendpanel/application/views/wallet/tambahwithdraw.php b/backendpanel/application/views/wallet/tambahwithdraw.php
old mode 100644
new mode 100755
diff --git a/backendpanel/application/views/welcome_message.php b/backendpanel/application/views/welcome_message.php
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/css/maps/style.css.map b/backendpanel/asset/css/maps/style.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/css/style.css b/backendpanel/asset/css/style.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/ejs/Chart.min.js b/backendpanel/asset/ejs/Chart.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/ejs/bootstrap.min.js b/backendpanel/asset/ejs/bootstrap.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/ejs/jquery.min.js b/backendpanel/asset/ejs/jquery.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/ejs/popper.min.js b/backendpanel/asset/ejs/popper.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/LICENSE.txt b/backendpanel/asset/fonts/Roboto/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-Black.ttf b/backendpanel/asset/fonts/Roboto/Roboto-Black.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-BlackItalic.ttf b/backendpanel/asset/fonts/Roboto/Roboto-BlackItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-Bold.ttf b/backendpanel/asset/fonts/Roboto/Roboto-Bold.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-BoldItalic.ttf b/backendpanel/asset/fonts/Roboto/Roboto-BoldItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-Italic.ttf b/backendpanel/asset/fonts/Roboto/Roboto-Italic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-Light.ttf b/backendpanel/asset/fonts/Roboto/Roboto-Light.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-LightItalic.ttf b/backendpanel/asset/fonts/Roboto/Roboto-LightItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-Medium.ttf b/backendpanel/asset/fonts/Roboto/Roboto-Medium.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-MediumItalic.ttf b/backendpanel/asset/fonts/Roboto/Roboto-MediumItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-Regular.ttf b/backendpanel/asset/fonts/Roboto/Roboto-Regular.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-Thin.ttf b/backendpanel/asset/fonts/Roboto/Roboto-Thin.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/fonts/Roboto/Roboto-ThinItalic.ttf b/backendpanel/asset/fonts/Roboto/Roboto-ThinItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/images/bg_vector.jpg b/backendpanel/asset/images/bg_vector.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/images/driveon_panjang.png b/backendpanel/asset/images/driveon_panjang.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/images/ic_ontime.png b/backendpanel/asset/images/ic_ontime.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/images/icon_ontime.png b/backendpanel/asset/images/icon_ontime.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/images/img_bg.png b/backendpanel/asset/images/img_bg.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/images/logo_driveon.png b/backendpanel/asset/images/logo_driveon.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/images/logo_panjang.png b/backendpanel/asset/images/logo_panjang.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/dashboard.js b/backendpanel/asset/js/dashboard.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/data-table.js b/backendpanel/asset/js/data-table.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/dragula.js b/backendpanel/asset/js/dragula.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/dropify.js b/backendpanel/asset/js/dropify.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/duit.js b/backendpanel/asset/js/duit.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/editorDemo.js b/backendpanel/asset/js/editorDemo.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/file-upload.js b/backendpanel/asset/js/file-upload.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/hoverable-collapse.js b/backendpanel/asset/js/hoverable-collapse.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/iCheck.js b/backendpanel/asset/js/iCheck.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/locationpicker.jquery.js b/backendpanel/asset/js/locationpicker.jquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/misc.js b/backendpanel/asset/js/misc.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/off-canvas.js b/backendpanel/asset/js/off-canvas.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/select2.js b/backendpanel/asset/js/select2.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/settings.js b/backendpanel/asset/js/settings.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/tabs.js b/backendpanel/asset/js/tabs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/todolist.js b/backendpanel/asset/js/todolist.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/js/typeahead.js b/backendpanel/asset/js/typeahead.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/atob b/backendpanel/asset/node_modules/.bin/atob
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/atob.cmd b/backendpanel/asset/node_modules/.bin/atob.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/browser-sync b/backendpanel/asset/node_modules/.bin/browser-sync
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/browser-sync.cmd b/backendpanel/asset/node_modules/.bin/browser-sync.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/cleancss b/backendpanel/asset/node_modules/.bin/cleancss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/cleancss.cmd b/backendpanel/asset/node_modules/.bin/cleancss.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/color-support b/backendpanel/asset/node_modules/.bin/color-support
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/color-support.cmd b/backendpanel/asset/node_modules/.bin/color-support.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/dev-ip b/backendpanel/asset/node_modules/.bin/dev-ip
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/dev-ip.cmd b/backendpanel/asset/node_modules/.bin/dev-ip.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/gulp b/backendpanel/asset/node_modules/.bin/gulp
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/gulp.cmd b/backendpanel/asset/node_modules/.bin/gulp.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/in-install b/backendpanel/asset/node_modules/.bin/in-install
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/in-install.cmd b/backendpanel/asset/node_modules/.bin/in-install.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/in-publish b/backendpanel/asset/node_modules/.bin/in-publish
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/in-publish.cmd b/backendpanel/asset/node_modules/.bin/in-publish.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/lt b/backendpanel/asset/node_modules/.bin/lt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/lt.cmd b/backendpanel/asset/node_modules/.bin/lt.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/marked b/backendpanel/asset/node_modules/.bin/marked
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/marked.cmd b/backendpanel/asset/node_modules/.bin/marked.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/mime b/backendpanel/asset/node_modules/.bin/mime
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/mime.cmd b/backendpanel/asset/node_modules/.bin/mime.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/mkdirp b/backendpanel/asset/node_modules/.bin/mkdirp
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/mkdirp.cmd b/backendpanel/asset/node_modules/.bin/mkdirp.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/node-gyp b/backendpanel/asset/node_modules/.bin/node-gyp
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/node-gyp.cmd b/backendpanel/asset/node_modules/.bin/node-gyp.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/node-sass b/backendpanel/asset/node_modules/.bin/node-sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/node-sass.cmd b/backendpanel/asset/node_modules/.bin/node-sass.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/nopt b/backendpanel/asset/node_modules/.bin/nopt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/nopt.cmd b/backendpanel/asset/node_modules/.bin/nopt.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/not-in-install b/backendpanel/asset/node_modules/.bin/not-in-install
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/not-in-install.cmd b/backendpanel/asset/node_modules/.bin/not-in-install.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/not-in-publish b/backendpanel/asset/node_modules/.bin/not-in-publish
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/not-in-publish.cmd b/backendpanel/asset/node_modules/.bin/not-in-publish.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/rimraf b/backendpanel/asset/node_modules/.bin/rimraf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/rimraf.cmd b/backendpanel/asset/node_modules/.bin/rimraf.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/sassgraph b/backendpanel/asset/node_modules/.bin/sassgraph
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/sassgraph.cmd b/backendpanel/asset/node_modules/.bin/sassgraph.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/semver b/backendpanel/asset/node_modules/.bin/semver
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/semver.cmd b/backendpanel/asset/node_modules/.bin/semver.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/sshpk-conv b/backendpanel/asset/node_modules/.bin/sshpk-conv
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/sshpk-conv.cmd b/backendpanel/asset/node_modules/.bin/sshpk-conv.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/sshpk-sign b/backendpanel/asset/node_modules/.bin/sshpk-sign
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/sshpk-sign.cmd b/backendpanel/asset/node_modules/.bin/sshpk-sign.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/sshpk-verify b/backendpanel/asset/node_modules/.bin/sshpk-verify
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/sshpk-verify.cmd b/backendpanel/asset/node_modules/.bin/sshpk-verify.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/strip-indent b/backendpanel/asset/node_modules/.bin/strip-indent
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/strip-indent.cmd b/backendpanel/asset/node_modules/.bin/strip-indent.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/strip-json-comments b/backendpanel/asset/node_modules/.bin/strip-json-comments
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/strip-json-comments.cmd b/backendpanel/asset/node_modules/.bin/strip-json-comments.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/throttleproxy b/backendpanel/asset/node_modules/.bin/throttleproxy
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/throttleproxy.cmd b/backendpanel/asset/node_modules/.bin/throttleproxy.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/uglifyjs b/backendpanel/asset/node_modules/.bin/uglifyjs
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/uglifyjs.cmd b/backendpanel/asset/node_modules/.bin/uglifyjs.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/user-home b/backendpanel/asset/node_modules/.bin/user-home
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/user-home.cmd b/backendpanel/asset/node_modules/.bin/user-home.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/uuid b/backendpanel/asset/node_modules/.bin/uuid
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/uuid.cmd b/backendpanel/asset/node_modules/.bin/uuid.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/which b/backendpanel/asset/node_modules/.bin/which
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/which.cmd b/backendpanel/asset/node_modules/.bin/which.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/window-size b/backendpanel/asset/node_modules/.bin/window-size
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/.bin/window-size.cmd b/backendpanel/asset/node_modules/.bin/window-size.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/LICENSE b/backendpanel/asset/node_modules/bootstrap/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/README.md b/backendpanel/asset/node_modules/bootstrap/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-grid.css b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-grid.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-grid.css.map b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-grid.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-grid.min.css b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-grid.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-grid.min.css.map b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-grid.min.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-reboot.css b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-reboot.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-reboot.css.map b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-reboot.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-reboot.min.css b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-reboot.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-reboot.min.css.map b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap-reboot.min.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap.css b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap.css.map b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap.min.css b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap.min.css.map b/backendpanel/asset/node_modules/bootstrap/dist/css/bootstrap.min.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.bundle.js b/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.bundle.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.bundle.js.map b/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.bundle.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js b/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js.map b/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.js b/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.js.map b/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.min.js b/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.min.js.map b/backendpanel/asset/node_modules/bootstrap/dist/js/bootstrap.min.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/alert.js b/backendpanel/asset/node_modules/bootstrap/js/dist/alert.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/alert.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/alert.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/button.js b/backendpanel/asset/node_modules/bootstrap/js/dist/button.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/button.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/button.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/carousel.js b/backendpanel/asset/node_modules/bootstrap/js/dist/carousel.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/carousel.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/carousel.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/collapse.js b/backendpanel/asset/node_modules/bootstrap/js/dist/collapse.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/collapse.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/collapse.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/dropdown.js b/backendpanel/asset/node_modules/bootstrap/js/dist/dropdown.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/dropdown.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/dropdown.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/index.js b/backendpanel/asset/node_modules/bootstrap/js/dist/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/index.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/index.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/modal.js b/backendpanel/asset/node_modules/bootstrap/js/dist/modal.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/modal.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/modal.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/popover.js b/backendpanel/asset/node_modules/bootstrap/js/dist/popover.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/popover.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/popover.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/scrollspy.js b/backendpanel/asset/node_modules/bootstrap/js/dist/scrollspy.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/scrollspy.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/scrollspy.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/tab.js b/backendpanel/asset/node_modules/bootstrap/js/dist/tab.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/tab.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/tab.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/tooltip.js b/backendpanel/asset/node_modules/bootstrap/js/dist/tooltip.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/tooltip.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/tooltip.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/util.js b/backendpanel/asset/node_modules/bootstrap/js/dist/util.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/dist/util.js.map b/backendpanel/asset/node_modules/bootstrap/js/dist/util.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/alert.js b/backendpanel/asset/node_modules/bootstrap/js/src/alert.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/button.js b/backendpanel/asset/node_modules/bootstrap/js/src/button.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/carousel.js b/backendpanel/asset/node_modules/bootstrap/js/src/carousel.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/collapse.js b/backendpanel/asset/node_modules/bootstrap/js/src/collapse.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/dropdown.js b/backendpanel/asset/node_modules/bootstrap/js/src/dropdown.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/index.js b/backendpanel/asset/node_modules/bootstrap/js/src/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/modal.js b/backendpanel/asset/node_modules/bootstrap/js/src/modal.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/popover.js b/backendpanel/asset/node_modules/bootstrap/js/src/popover.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/scrollspy.js b/backendpanel/asset/node_modules/bootstrap/js/src/scrollspy.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/tab.js b/backendpanel/asset/node_modules/bootstrap/js/src/tab.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/tooltip.js b/backendpanel/asset/node_modules/bootstrap/js/src/tooltip.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/js/src/util.js b/backendpanel/asset/node_modules/bootstrap/js/src/util.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/package.json b/backendpanel/asset/node_modules/bootstrap/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_alert.scss b/backendpanel/asset/node_modules/bootstrap/scss/_alert.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_badge.scss b/backendpanel/asset/node_modules/bootstrap/scss/_badge.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_breadcrumb.scss b/backendpanel/asset/node_modules/bootstrap/scss/_breadcrumb.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_button-group.scss b/backendpanel/asset/node_modules/bootstrap/scss/_button-group.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_buttons.scss b/backendpanel/asset/node_modules/bootstrap/scss/_buttons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_card.scss b/backendpanel/asset/node_modules/bootstrap/scss/_card.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_carousel.scss b/backendpanel/asset/node_modules/bootstrap/scss/_carousel.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_close.scss b/backendpanel/asset/node_modules/bootstrap/scss/_close.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_code.scss b/backendpanel/asset/node_modules/bootstrap/scss/_code.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_custom-forms.scss b/backendpanel/asset/node_modules/bootstrap/scss/_custom-forms.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_dropdown.scss b/backendpanel/asset/node_modules/bootstrap/scss/_dropdown.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_forms.scss b/backendpanel/asset/node_modules/bootstrap/scss/_forms.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_functions.scss b/backendpanel/asset/node_modules/bootstrap/scss/_functions.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_grid.scss b/backendpanel/asset/node_modules/bootstrap/scss/_grid.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_images.scss b/backendpanel/asset/node_modules/bootstrap/scss/_images.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_input-group.scss b/backendpanel/asset/node_modules/bootstrap/scss/_input-group.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_jumbotron.scss b/backendpanel/asset/node_modules/bootstrap/scss/_jumbotron.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_list-group.scss b/backendpanel/asset/node_modules/bootstrap/scss/_list-group.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_media.scss b/backendpanel/asset/node_modules/bootstrap/scss/_media.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_mixins.scss b/backendpanel/asset/node_modules/bootstrap/scss/_mixins.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_modal.scss b/backendpanel/asset/node_modules/bootstrap/scss/_modal.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_nav.scss b/backendpanel/asset/node_modules/bootstrap/scss/_nav.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_navbar.scss b/backendpanel/asset/node_modules/bootstrap/scss/_navbar.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_pagination.scss b/backendpanel/asset/node_modules/bootstrap/scss/_pagination.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_popover.scss b/backendpanel/asset/node_modules/bootstrap/scss/_popover.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_print.scss b/backendpanel/asset/node_modules/bootstrap/scss/_print.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_progress.scss b/backendpanel/asset/node_modules/bootstrap/scss/_progress.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_reboot.scss b/backendpanel/asset/node_modules/bootstrap/scss/_reboot.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_root.scss b/backendpanel/asset/node_modules/bootstrap/scss/_root.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_tables.scss b/backendpanel/asset/node_modules/bootstrap/scss/_tables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_tooltip.scss b/backendpanel/asset/node_modules/bootstrap/scss/_tooltip.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_transitions.scss b/backendpanel/asset/node_modules/bootstrap/scss/_transitions.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_type.scss b/backendpanel/asset/node_modules/bootstrap/scss/_type.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_utilities.scss b/backendpanel/asset/node_modules/bootstrap/scss/_utilities.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/_variables.scss b/backendpanel/asset/node_modules/bootstrap/scss/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/bootstrap-grid.scss b/backendpanel/asset/node_modules/bootstrap/scss/bootstrap-grid.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/bootstrap-reboot.scss b/backendpanel/asset/node_modules/bootstrap/scss/bootstrap-reboot.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/bootstrap.scss b/backendpanel/asset/node_modules/bootstrap/scss/bootstrap.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_alert.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_alert.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_background-variant.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_background-variant.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_badge.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_badge.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_border-radius.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_border-radius.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_box-shadow.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_box-shadow.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_breakpoints.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_breakpoints.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_buttons.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_buttons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_caret.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_caret.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_clearfix.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_clearfix.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_float.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_float.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_forms.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_forms.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_gradients.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_gradients.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_grid-framework.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_grid-framework.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_grid.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_grid.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_hover.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_hover.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_image.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_image.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_list-group.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_list-group.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_lists.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_lists.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_nav-divider.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_nav-divider.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_navbar-align.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_navbar-align.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_pagination.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_pagination.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_reset-text.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_reset-text.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_resize.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_resize.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_screen-reader.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_screen-reader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_size.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_size.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_table-row.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_table-row.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_text-emphasis.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_text-emphasis.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_text-hide.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_text-hide.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_text-truncate.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_text-truncate.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_transition.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_transition.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/mixins/_visibility.scss b/backendpanel/asset/node_modules/bootstrap/scss/mixins/_visibility.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_align.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_align.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_background.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_background.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_borders.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_borders.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_clearfix.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_clearfix.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_display.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_display.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_embed.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_embed.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_flex.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_flex.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_float.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_float.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_position.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_position.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_screenreaders.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_screenreaders.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_sizing.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_sizing.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_spacing.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_spacing.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_text.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_text.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/bootstrap/scss/utilities/_visibility.scss b/backendpanel/asset/node_modules/bootstrap/scss/utilities/_visibility.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/.editorconfig b/backendpanel/asset/node_modules/chart.js/.editorconfig
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/.eslintignore b/backendpanel/asset/node_modules/chart.js/.eslintignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/.eslintrc b/backendpanel/asset/node_modules/chart.js/.eslintrc
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/.npmignore b/backendpanel/asset/node_modules/chart.js/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/LICENSE.md b/backendpanel/asset/node_modules/chart.js/LICENSE.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/MAINTAINING.md b/backendpanel/asset/node_modules/chart.js/MAINTAINING.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/README.md b/backendpanel/asset/node_modules/chart.js/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/book.json b/backendpanel/asset/node_modules/chart.js/book.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/bower.json b/backendpanel/asset/node_modules/chart.js/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/composer.json b/backendpanel/asset/node_modules/chart.js/composer.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/Chart.bundle.js b/backendpanel/asset/node_modules/chart.js/dist/Chart.bundle.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/Chart.bundle.min.js b/backendpanel/asset/node_modules/chart.js/dist/Chart.bundle.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/Chart.js b/backendpanel/asset/node_modules/chart.js/dist/Chart.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/Chart.min.js b/backendpanel/asset/node_modules/chart.js/dist/Chart.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/axes/cartesian/category.html b/backendpanel/asset/node_modules/chart.js/dist/docs/axes/cartesian/category.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/axes/cartesian/index.html b/backendpanel/asset/node_modules/chart.js/dist/docs/axes/cartesian/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/axes/cartesian/linear.html b/backendpanel/asset/node_modules/chart.js/dist/docs/axes/cartesian/linear.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/axes/cartesian/logarithmic.html b/backendpanel/asset/node_modules/chart.js/dist/docs/axes/cartesian/logarithmic.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/axes/cartesian/time.html b/backendpanel/asset/node_modules/chart.js/dist/docs/axes/cartesian/time.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/axes/index.html b/backendpanel/asset/node_modules/chart.js/dist/docs/axes/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/axes/labelling.html b/backendpanel/asset/node_modules/chart.js/dist/docs/axes/labelling.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/axes/radial/index.html b/backendpanel/asset/node_modules/chart.js/dist/docs/axes/radial/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/axes/radial/linear.html b/backendpanel/asset/node_modules/chart.js/dist/docs/axes/radial/linear.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/axes/styling.html b/backendpanel/asset/node_modules/chart.js/dist/docs/axes/styling.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/charts/area.html b/backendpanel/asset/node_modules/chart.js/dist/docs/charts/area.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/charts/bar.html b/backendpanel/asset/node_modules/chart.js/dist/docs/charts/bar.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/charts/bubble.html b/backendpanel/asset/node_modules/chart.js/dist/docs/charts/bubble.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/charts/doughnut.html b/backendpanel/asset/node_modules/chart.js/dist/docs/charts/doughnut.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/charts/index.html b/backendpanel/asset/node_modules/chart.js/dist/docs/charts/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/charts/line.html b/backendpanel/asset/node_modules/chart.js/dist/docs/charts/line.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/charts/mixed.html b/backendpanel/asset/node_modules/chart.js/dist/docs/charts/mixed.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/charts/polar.html b/backendpanel/asset/node_modules/chart.js/dist/docs/charts/polar.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/charts/radar.html b/backendpanel/asset/node_modules/chart.js/dist/docs/charts/radar.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/charts/scatter.html b/backendpanel/asset/node_modules/chart.js/dist/docs/charts/scatter.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/animations.html b/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/animations.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/elements.html b/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/elements.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/index.html b/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/layout.html b/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/layout.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/legend.html b/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/legend.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/title.html b/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/title.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/tooltip.html b/backendpanel/asset/node_modules/chart.js/dist/docs/configuration/tooltip.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/developers/api.html b/backendpanel/asset/node_modules/chart.js/dist/docs/developers/api.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/developers/axes.html b/backendpanel/asset/node_modules/chart.js/dist/docs/developers/axes.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/developers/charts.html b/backendpanel/asset/node_modules/chart.js/dist/docs/developers/charts.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/developers/contributing.html b/backendpanel/asset/node_modules/chart.js/dist/docs/developers/contributing.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/developers/index.html b/backendpanel/asset/node_modules/chart.js/dist/docs/developers/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/developers/plugins.html b/backendpanel/asset/node_modules/chart.js/dist/docs/developers/plugins.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/developers/updates.html b/backendpanel/asset/node_modules/chart.js/dist/docs/developers/updates.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/general/colors.html b/backendpanel/asset/node_modules/chart.js/dist/docs/general/colors.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/general/fonts.html b/backendpanel/asset/node_modules/chart.js/dist/docs/general/fonts.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/general/index.html b/backendpanel/asset/node_modules/chart.js/dist/docs/general/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/general/interactions/events.html b/backendpanel/asset/node_modules/chart.js/dist/docs/general/interactions/events.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/general/interactions/index.html b/backendpanel/asset/node_modules/chart.js/dist/docs/general/interactions/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/general/interactions/modes.html b/backendpanel/asset/node_modules/chart.js/dist/docs/general/interactions/modes.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/general/responsive.html b/backendpanel/asset/node_modules/chart.js/dist/docs/general/responsive.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/getting-started/index.html b/backendpanel/asset/node_modules/chart.js/dist/docs/getting-started/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/getting-started/installation.html b/backendpanel/asset/node_modules/chart.js/dist/docs/getting-started/installation.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/getting-started/integration.html b/backendpanel/asset/node_modules/chart.js/dist/docs/getting-started/integration.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/getting-started/usage.html b/backendpanel/asset/node_modules/chart.js/dist/docs/getting-started/usage.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/FontAwesome.otf b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/FontAwesome.otf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/fontawesome-webfont.eot b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/fontawesome-webfont.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/fontawesome-webfont.svg b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/fontawesome-webfont.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/fontawesome-webfont.ttf b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/fontawesome-webfont.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/fontawesome-webfont.woff b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/fontawesome-webfont.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/fontawesome-webfont.woff2 b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/fonts/fontawesome/fontawesome-webfont.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-anchorjs/anchor-style.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-anchorjs/anchor-style.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/Chart.bundle.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/Chart.bundle.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/Chart.bundle.min.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/Chart.bundle.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/Chart.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/Chart.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/Chart.min.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/Chart.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/chartjs-plugin-deferred.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/chartjs-plugin-deferred.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/chartjs-plugin-deferred.min.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/chartjs-plugin-deferred.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/style.css b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-chartjs/style.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-fontsettings/fontsettings.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-fontsettings/fontsettings.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-fontsettings/website.css b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-fontsettings/website.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-ga/plugin.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-ga/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-highlight/ebook.css b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-highlight/ebook.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-highlight/website.css b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-highlight/website.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-search-plus/jquery.mark.min.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-search-plus/jquery.mark.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-search-plus/search.css b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-search-plus/search.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-search-plus/search.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-search-plus/search.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-sharing/buttons.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook-plugin-sharing/buttons.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/gitbook.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/images/apple-touch-icon-precomposed-152.png b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/images/apple-touch-icon-precomposed-152.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/images/favicon.ico b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/images/favicon.ico
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/style.css b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/style.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/theme.js b/backendpanel/asset/node_modules/chart.js/dist/docs/gitbook/theme.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/index.html b/backendpanel/asset/node_modules/chart.js/dist/docs/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/notes/comparison.html b/backendpanel/asset/node_modules/chart.js/dist/docs/notes/comparison.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/notes/extensions.html b/backendpanel/asset/node_modules/chart.js/dist/docs/notes/extensions.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/notes/index.html b/backendpanel/asset/node_modules/chart.js/dist/docs/notes/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/notes/license.html b/backendpanel/asset/node_modules/chart.js/dist/docs/notes/license.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/search_plus_index.json b/backendpanel/asset/node_modules/chart.js/dist/docs/search_plus_index.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/dist/docs/style.css b/backendpanel/asset/node_modules/chart.js/dist/docs/style.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/README.md b/backendpanel/asset/node_modules/chart.js/docs/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/SUMMARY.md b/backendpanel/asset/node_modules/chart.js/docs/SUMMARY.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/axes/README.md b/backendpanel/asset/node_modules/chart.js/docs/axes/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/axes/cartesian/README.md b/backendpanel/asset/node_modules/chart.js/docs/axes/cartesian/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/axes/cartesian/category.md b/backendpanel/asset/node_modules/chart.js/docs/axes/cartesian/category.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/axes/cartesian/linear.md b/backendpanel/asset/node_modules/chart.js/docs/axes/cartesian/linear.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/axes/cartesian/logarithmic.md b/backendpanel/asset/node_modules/chart.js/docs/axes/cartesian/logarithmic.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/axes/cartesian/time.md b/backendpanel/asset/node_modules/chart.js/docs/axes/cartesian/time.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/axes/labelling.md b/backendpanel/asset/node_modules/chart.js/docs/axes/labelling.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/axes/radial/README.md b/backendpanel/asset/node_modules/chart.js/docs/axes/radial/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/axes/radial/linear.md b/backendpanel/asset/node_modules/chart.js/docs/axes/radial/linear.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/axes/styling.md b/backendpanel/asset/node_modules/chart.js/docs/axes/styling.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/charts/README.md b/backendpanel/asset/node_modules/chart.js/docs/charts/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/charts/area.md b/backendpanel/asset/node_modules/chart.js/docs/charts/area.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/charts/bar.md b/backendpanel/asset/node_modules/chart.js/docs/charts/bar.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/charts/bubble.md b/backendpanel/asset/node_modules/chart.js/docs/charts/bubble.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/charts/doughnut.md b/backendpanel/asset/node_modules/chart.js/docs/charts/doughnut.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/charts/line.md b/backendpanel/asset/node_modules/chart.js/docs/charts/line.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/charts/mixed.md b/backendpanel/asset/node_modules/chart.js/docs/charts/mixed.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/charts/polar.md b/backendpanel/asset/node_modules/chart.js/docs/charts/polar.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/charts/radar.md b/backendpanel/asset/node_modules/chart.js/docs/charts/radar.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/charts/scatter.md b/backendpanel/asset/node_modules/chart.js/docs/charts/scatter.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/configuration/README.md b/backendpanel/asset/node_modules/chart.js/docs/configuration/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/configuration/animations.md b/backendpanel/asset/node_modules/chart.js/docs/configuration/animations.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/configuration/elements.md b/backendpanel/asset/node_modules/chart.js/docs/configuration/elements.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/configuration/layout.md b/backendpanel/asset/node_modules/chart.js/docs/configuration/layout.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/configuration/legend.md b/backendpanel/asset/node_modules/chart.js/docs/configuration/legend.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/configuration/title.md b/backendpanel/asset/node_modules/chart.js/docs/configuration/title.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/configuration/tooltip.md b/backendpanel/asset/node_modules/chart.js/docs/configuration/tooltip.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/developers/README.md b/backendpanel/asset/node_modules/chart.js/docs/developers/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/developers/api.md b/backendpanel/asset/node_modules/chart.js/docs/developers/api.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/developers/axes.md b/backendpanel/asset/node_modules/chart.js/docs/developers/axes.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/developers/charts.md b/backendpanel/asset/node_modules/chart.js/docs/developers/charts.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/developers/contributing.md b/backendpanel/asset/node_modules/chart.js/docs/developers/contributing.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/developers/plugins.md b/backendpanel/asset/node_modules/chart.js/docs/developers/plugins.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/developers/updates.md b/backendpanel/asset/node_modules/chart.js/docs/developers/updates.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/general/README.md b/backendpanel/asset/node_modules/chart.js/docs/general/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/general/colors.md b/backendpanel/asset/node_modules/chart.js/docs/general/colors.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/general/fonts.md b/backendpanel/asset/node_modules/chart.js/docs/general/fonts.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/general/interactions/README.md b/backendpanel/asset/node_modules/chart.js/docs/general/interactions/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/general/interactions/events.md b/backendpanel/asset/node_modules/chart.js/docs/general/interactions/events.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/general/interactions/modes.md b/backendpanel/asset/node_modules/chart.js/docs/general/interactions/modes.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/general/responsive.md b/backendpanel/asset/node_modules/chart.js/docs/general/responsive.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/getting-started/README.md b/backendpanel/asset/node_modules/chart.js/docs/getting-started/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/getting-started/installation.md b/backendpanel/asset/node_modules/chart.js/docs/getting-started/installation.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/getting-started/integration.md b/backendpanel/asset/node_modules/chart.js/docs/getting-started/integration.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/getting-started/usage.md b/backendpanel/asset/node_modules/chart.js/docs/getting-started/usage.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/notes/README.md b/backendpanel/asset/node_modules/chart.js/docs/notes/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/notes/comparison.md b/backendpanel/asset/node_modules/chart.js/docs/notes/comparison.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/notes/extensions.md b/backendpanel/asset/node_modules/chart.js/docs/notes/extensions.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/notes/license.md b/backendpanel/asset/node_modules/chart.js/docs/notes/license.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/docs/style.css b/backendpanel/asset/node_modules/chart.js/docs/style.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/gulpfile.js b/backendpanel/asset/node_modules/chart.js/gulpfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/karma.conf.js b/backendpanel/asset/node_modules/chart.js/karma.conf.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/package.json b/backendpanel/asset/node_modules/chart.js/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/advanced/data-labelling.html b/backendpanel/asset/node_modules/chart.js/samples/advanced/data-labelling.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/advanced/progress-bar.html b/backendpanel/asset/node_modules/chart.js/samples/advanced/progress-bar.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/area/analyser.js b/backendpanel/asset/node_modules/chart.js/samples/charts/area/analyser.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/area/line-boundaries.html b/backendpanel/asset/node_modules/chart.js/samples/charts/area/line-boundaries.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/area/line-datasets.html b/backendpanel/asset/node_modules/chart.js/samples/charts/area/line-datasets.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/area/line-stacked.html b/backendpanel/asset/node_modules/chart.js/samples/charts/area/line-stacked.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/area/radar.html b/backendpanel/asset/node_modules/chart.js/samples/charts/area/radar.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/bar/horizontal.html b/backendpanel/asset/node_modules/chart.js/samples/charts/bar/horizontal.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/bar/multi-axis.html b/backendpanel/asset/node_modules/chart.js/samples/charts/bar/multi-axis.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/bar/stacked-group.html b/backendpanel/asset/node_modules/chart.js/samples/charts/bar/stacked-group.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/bar/stacked.html b/backendpanel/asset/node_modules/chart.js/samples/charts/bar/stacked.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/bar/vertical.html b/backendpanel/asset/node_modules/chart.js/samples/charts/bar/vertical.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/bubble.html b/backendpanel/asset/node_modules/chart.js/samples/charts/bubble.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/combo-bar-line.html b/backendpanel/asset/node_modules/chart.js/samples/charts/combo-bar-line.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/doughnut.html b/backendpanel/asset/node_modules/chart.js/samples/charts/doughnut.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/line/basic.html b/backendpanel/asset/node_modules/chart.js/samples/charts/line/basic.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/line/interpolation-modes.html b/backendpanel/asset/node_modules/chart.js/samples/charts/line/interpolation-modes.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/line/line-styles.html b/backendpanel/asset/node_modules/chart.js/samples/charts/line/line-styles.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/line/multi-axis.html b/backendpanel/asset/node_modules/chart.js/samples/charts/line/multi-axis.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/line/point-sizes.html b/backendpanel/asset/node_modules/chart.js/samples/charts/line/point-sizes.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/line/point-styles.html b/backendpanel/asset/node_modules/chart.js/samples/charts/line/point-styles.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/line/skip-points.html b/backendpanel/asset/node_modules/chart.js/samples/charts/line/skip-points.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/line/stepped.html b/backendpanel/asset/node_modules/chart.js/samples/charts/line/stepped.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/pie.html b/backendpanel/asset/node_modules/chart.js/samples/charts/pie.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/polar-area.html b/backendpanel/asset/node_modules/chart.js/samples/charts/polar-area.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/radar-skip-points.html b/backendpanel/asset/node_modules/chart.js/samples/charts/radar-skip-points.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/radar.html b/backendpanel/asset/node_modules/chart.js/samples/charts/radar.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/scatter/basic.html b/backendpanel/asset/node_modules/chart.js/samples/charts/scatter/basic.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/charts/scatter/multi-axis.html b/backendpanel/asset/node_modules/chart.js/samples/charts/scatter/multi-axis.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/favicon.ico b/backendpanel/asset/node_modules/chart.js/samples/favicon.ico
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/index.html b/backendpanel/asset/node_modules/chart.js/samples/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/legend/point-style.html b/backendpanel/asset/node_modules/chart.js/samples/legend/point-style.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/legend/positioning.html b/backendpanel/asset/node_modules/chart.js/samples/legend/positioning.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/logo.svg b/backendpanel/asset/node_modules/chart.js/samples/logo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/samples.js b/backendpanel/asset/node_modules/chart.js/samples/samples.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/filtering-labels.html b/backendpanel/asset/node_modules/chart.js/samples/scales/filtering-labels.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/gridlines-display.html b/backendpanel/asset/node_modules/chart.js/samples/scales/gridlines-display.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/gridlines-style.html b/backendpanel/asset/node_modules/chart.js/samples/scales/gridlines-style.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/linear/min-max-suggested.html b/backendpanel/asset/node_modules/chart.js/samples/scales/linear/min-max-suggested.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/linear/min-max.html b/backendpanel/asset/node_modules/chart.js/samples/scales/linear/min-max.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/linear/step-size.html b/backendpanel/asset/node_modules/chart.js/samples/scales/linear/step-size.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/logarithmic/line.html b/backendpanel/asset/node_modules/chart.js/samples/scales/logarithmic/line.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/logarithmic/scatter.html b/backendpanel/asset/node_modules/chart.js/samples/scales/logarithmic/scatter.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/multiline-labels.html b/backendpanel/asset/node_modules/chart.js/samples/scales/multiline-labels.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/non-numeric-y.html b/backendpanel/asset/node_modules/chart.js/samples/scales/non-numeric-y.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/time/combo.html b/backendpanel/asset/node_modules/chart.js/samples/scales/time/combo.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/time/line-point-data.html b/backendpanel/asset/node_modules/chart.js/samples/scales/time/line-point-data.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/scales/time/line.html b/backendpanel/asset/node_modules/chart.js/samples/scales/time/line.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/style.css b/backendpanel/asset/node_modules/chart.js/samples/style.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/tooltips/border.html b/backendpanel/asset/node_modules/chart.js/samples/tooltips/border.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/tooltips/callbacks.html b/backendpanel/asset/node_modules/chart.js/samples/tooltips/callbacks.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/tooltips/custom-line.html b/backendpanel/asset/node_modules/chart.js/samples/tooltips/custom-line.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/tooltips/custom-pie.html b/backendpanel/asset/node_modules/chart.js/samples/tooltips/custom-pie.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/tooltips/custom-points.html b/backendpanel/asset/node_modules/chart.js/samples/tooltips/custom-points.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/tooltips/interactions.html b/backendpanel/asset/node_modules/chart.js/samples/tooltips/interactions.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/tooltips/positioning.html b/backendpanel/asset/node_modules/chart.js/samples/tooltips/positioning.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/samples/utils.js b/backendpanel/asset/node_modules/chart.js/samples/utils.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/scripts/deploy.sh b/backendpanel/asset/node_modules/chart.js/scripts/deploy.sh
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/scripts/release.sh b/backendpanel/asset/node_modules/chart.js/scripts/release.sh
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/chart.js b/backendpanel/asset/node_modules/chart.js/src/chart.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Bar.js b/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Bar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Bubble.js b/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Bubble.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Doughnut.js b/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Doughnut.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Line.js b/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Line.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/charts/Chart.PolarArea.js b/backendpanel/asset/node_modules/chart.js/src/charts/Chart.PolarArea.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Radar.js b/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Radar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Scatter.js b/backendpanel/asset/node_modules/chart.js/src/charts/Chart.Scatter.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/controllers/controller.bar.js b/backendpanel/asset/node_modules/chart.js/src/controllers/controller.bar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/controllers/controller.bubble.js b/backendpanel/asset/node_modules/chart.js/src/controllers/controller.bubble.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/controllers/controller.doughnut.js b/backendpanel/asset/node_modules/chart.js/src/controllers/controller.doughnut.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/controllers/controller.line.js b/backendpanel/asset/node_modules/chart.js/src/controllers/controller.line.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/controllers/controller.polarArea.js b/backendpanel/asset/node_modules/chart.js/src/controllers/controller.polarArea.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/controllers/controller.radar.js b/backendpanel/asset/node_modules/chart.js/src/controllers/controller.radar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.animation.js b/backendpanel/asset/node_modules/chart.js/src/core/core.animation.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.canvasHelpers.js b/backendpanel/asset/node_modules/chart.js/src/core/core.canvasHelpers.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.controller.js b/backendpanel/asset/node_modules/chart.js/src/core/core.controller.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.datasetController.js b/backendpanel/asset/node_modules/chart.js/src/core/core.datasetController.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.element.js b/backendpanel/asset/node_modules/chart.js/src/core/core.element.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.helpers.js b/backendpanel/asset/node_modules/chart.js/src/core/core.helpers.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.interaction.js b/backendpanel/asset/node_modules/chart.js/src/core/core.interaction.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.js b/backendpanel/asset/node_modules/chart.js/src/core/core.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.layoutService.js b/backendpanel/asset/node_modules/chart.js/src/core/core.layoutService.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.plugin.js b/backendpanel/asset/node_modules/chart.js/src/core/core.plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.scale.js b/backendpanel/asset/node_modules/chart.js/src/core/core.scale.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.scaleService.js b/backendpanel/asset/node_modules/chart.js/src/core/core.scaleService.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.ticks.js b/backendpanel/asset/node_modules/chart.js/src/core/core.ticks.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/core/core.tooltip.js b/backendpanel/asset/node_modules/chart.js/src/core/core.tooltip.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/elements/element.arc.js b/backendpanel/asset/node_modules/chart.js/src/elements/element.arc.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/elements/element.line.js b/backendpanel/asset/node_modules/chart.js/src/elements/element.line.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/elements/element.point.js b/backendpanel/asset/node_modules/chart.js/src/elements/element.point.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/elements/element.rectangle.js b/backendpanel/asset/node_modules/chart.js/src/elements/element.rectangle.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/platforms/platform.dom.js b/backendpanel/asset/node_modules/chart.js/src/platforms/platform.dom.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/platforms/platform.js b/backendpanel/asset/node_modules/chart.js/src/platforms/platform.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/plugins/plugin.filler.js b/backendpanel/asset/node_modules/chart.js/src/plugins/plugin.filler.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/plugins/plugin.legend.js b/backendpanel/asset/node_modules/chart.js/src/plugins/plugin.legend.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/plugins/plugin.title.js b/backendpanel/asset/node_modules/chart.js/src/plugins/plugin.title.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/scales/scale.category.js b/backendpanel/asset/node_modules/chart.js/src/scales/scale.category.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/scales/scale.linear.js b/backendpanel/asset/node_modules/chart.js/src/scales/scale.linear.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/scales/scale.linearbase.js b/backendpanel/asset/node_modules/chart.js/src/scales/scale.linearbase.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/scales/scale.logarithmic.js b/backendpanel/asset/node_modules/chart.js/src/scales/scale.logarithmic.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/scales/scale.radialLinear.js b/backendpanel/asset/node_modules/chart.js/src/scales/scale.radialLinear.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/src/scales/scale.time.js b/backendpanel/asset/node_modules/chart.js/src/scales/scale.time.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-end-span.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-end-span.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-end-span.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-end-span.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-end.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-end.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-end.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-end.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-span.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-span.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-span.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-span.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-spline-span.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-spline.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped-span.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin-stepped.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-origin.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-start-span.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-start-span.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-start-span.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-start-span.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-start.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-start.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-start.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-boundary-start.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-span.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-span.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-span.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-span.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-spline-span.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-spline-span.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-spline-span.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-spline-span.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-spline.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-spline.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-spline.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset-spline.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-line-dataset.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-radar-boundary-origin-spline.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-radar-boundary-origin.json b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-radar-boundary-origin.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-radar-boundary-origin.png b/backendpanel/asset/node_modules/chart.js/test/fixtures/plugin.filler/fill-radar-boundary-origin.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/jasmine.context.js b/backendpanel/asset/node_modules/chart.js/test/jasmine.context.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/jasmine.index.js b/backendpanel/asset/node_modules/chart.js/test/jasmine.index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/jasmine.matchers.js b/backendpanel/asset/node_modules/chart.js/test/jasmine.matchers.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/jasmine.utils.js b/backendpanel/asset/node_modules/chart.js/test/jasmine.utils.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/controller.bar.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/controller.bar.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/controller.bubble.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/controller.bubble.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/controller.doughnut.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/controller.doughnut.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/controller.line.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/controller.line.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/controller.polarArea.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/controller.polarArea.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/controller.radar.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/controller.radar.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/core.controller.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/core.controller.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/core.datasetController.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/core.datasetController.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/core.element.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/core.element.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/core.helpers.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/core.helpers.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/core.interaction.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/core.interaction.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/core.layoutService.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/core.layoutService.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/core.plugin.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/core.plugin.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/core.scaleService.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/core.scaleService.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/core.tooltip.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/core.tooltip.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/element.arc.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/element.arc.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/element.line.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/element.line.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/element.point.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/element.point.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/element.rectangle.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/element.rectangle.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/global.defaults.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/global.defaults.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/global.deprecations.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/global.deprecations.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/platform.dom.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/platform.dom.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/plugin.filler.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/plugin.filler.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/plugin.legend.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/plugin.legend.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/plugin.title.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/plugin.title.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/scale.category.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/scale.category.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/scale.linear.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/scale.linear.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/scale.logarithmic.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/scale.logarithmic.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/scale.radialLinear.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/scale.radialLinear.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/chart.js/test/specs/scale.time.tests.js b/backendpanel/asset/node_modules/chart.js/test/specs/scale.time.tests.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/datatables.net-bs4/Readme.md b/backendpanel/asset/node_modules/datatables.net-bs4/Readme.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/datatables.net-bs4/css/dataTables.bootstrap4.css b/backendpanel/asset/node_modules/datatables.net-bs4/css/dataTables.bootstrap4.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/datatables.net-bs4/js/dataTables.bootstrap4.js b/backendpanel/asset/node_modules/datatables.net-bs4/js/dataTables.bootstrap4.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/datatables.net-bs4/package.json b/backendpanel/asset/node_modules/datatables.net-bs4/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/datatables.net/Readme.md b/backendpanel/asset/node_modules/datatables.net/Readme.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/datatables.net/js/jquery.dataTables.js b/backendpanel/asset/node_modules/datatables.net/js/jquery.dataTables.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/datatables.net/package.json b/backendpanel/asset/node_modules/datatables.net/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/.editorconfig b/backendpanel/asset/node_modules/dragula/.editorconfig
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/.github/contributing.markdown b/backendpanel/asset/node_modules/dragula/.github/contributing.markdown
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/.github/issue_template.markdown b/backendpanel/asset/node_modules/dragula/.github/issue_template.markdown
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/.jshintignore b/backendpanel/asset/node_modules/dragula/.jshintignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/.jshintrc b/backendpanel/asset/node_modules/dragula/.jshintrc
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/.npmignore b/backendpanel/asset/node_modules/dragula/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/.travis.yml b/backendpanel/asset/node_modules/dragula/.travis.yml
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/bower.json b/backendpanel/asset/node_modules/dragula/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/changelog.markdown b/backendpanel/asset/node_modules/dragula/changelog.markdown
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/classes.js b/backendpanel/asset/node_modules/dragula/classes.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/dist/dragula.css b/backendpanel/asset/node_modules/dragula/dist/dragula.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/dist/dragula.js b/backendpanel/asset/node_modules/dragula/dist/dragula.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/dist/dragula.min.css b/backendpanel/asset/node_modules/dragula/dist/dragula.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/dist/dragula.min.js b/backendpanel/asset/node_modules/dragula/dist/dragula.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/dragula.js b/backendpanel/asset/node_modules/dragula/dragula.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/dragula.styl b/backendpanel/asset/node_modules/dragula/dragula.styl
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/example/example.css b/backendpanel/asset/node_modules/dragula/example/example.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/example/example.js b/backendpanel/asset/node_modules/dragula/example/example.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/example/example.min.js b/backendpanel/asset/node_modules/dragula/example/example.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/favicon.ico b/backendpanel/asset/node_modules/dragula/favicon.ico
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/index.html b/backendpanel/asset/node_modules/dragula/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/license b/backendpanel/asset/node_modules/dragula/license
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/package.json b/backendpanel/asset/node_modules/dragula/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/readme.markdown b/backendpanel/asset/node_modules/dragula/readme.markdown
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/resources/demo.png b/backendpanel/asset/node_modules/dragula/resources/demo.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/resources/eyes.png b/backendpanel/asset/node_modules/dragula/resources/eyes.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/resources/icon.png b/backendpanel/asset/node_modules/dragula/resources/icon.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/resources/icon.svg b/backendpanel/asset/node_modules/dragula/resources/icon.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/resources/logo.png b/backendpanel/asset/node_modules/dragula/resources/logo.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/resources/logo.svg b/backendpanel/asset/node_modules/dragula/resources/logo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/resources/patreon.svg b/backendpanel/asset/node_modules/dragula/resources/patreon.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/cancel.js b/backendpanel/asset/node_modules/dragula/test/cancel.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/classes.js b/backendpanel/asset/node_modules/dragula/test/classes.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/containers.js b/backendpanel/asset/node_modules/dragula/test/containers.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/defaults.js b/backendpanel/asset/node_modules/dragula/test/defaults.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/destroy.js b/backendpanel/asset/node_modules/dragula/test/destroy.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/drag.js b/backendpanel/asset/node_modules/dragula/test/drag.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/drake-api.js b/backendpanel/asset/node_modules/dragula/test/drake-api.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/end.js b/backendpanel/asset/node_modules/dragula/test/end.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/events.js b/backendpanel/asset/node_modules/dragula/test/events.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/lib/events.js b/backendpanel/asset/node_modules/dragula/test/lib/events.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/public-api.js b/backendpanel/asset/node_modules/dragula/test/public-api.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dragula/test/remove.js b/backendpanel/asset/node_modules/dragula/test/remove.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/.npmignore b/backendpanel/asset/node_modules/dropify/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/LICENCE.md b/backendpanel/asset/node_modules/dropify/LICENCE.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/README.md b/backendpanel/asset/node_modules/dropify/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/bower.json b/backendpanel/asset/node_modules/dropify/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/dist/css/demo.css b/backendpanel/asset/node_modules/dropify/dist/css/demo.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/dist/css/dropify.css b/backendpanel/asset/node_modules/dropify/dist/css/dropify.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/dist/css/dropify.min.css b/backendpanel/asset/node_modules/dropify/dist/css/dropify.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/dist/fonts/dropify.eot b/backendpanel/asset/node_modules/dropify/dist/fonts/dropify.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/dist/fonts/dropify.svg b/backendpanel/asset/node_modules/dropify/dist/fonts/dropify.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/dist/fonts/dropify.ttf b/backendpanel/asset/node_modules/dropify/dist/fonts/dropify.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/dist/fonts/dropify.woff b/backendpanel/asset/node_modules/dropify/dist/fonts/dropify.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/dist/js/dropify.js b/backendpanel/asset/node_modules/dropify/dist/js/dropify.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/dist/js/dropify.min.js b/backendpanel/asset/node_modules/dropify/dist/js/dropify.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/gulpfile.js b/backendpanel/asset/node_modules/dropify/gulpfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/index.html b/backendpanel/asset/node_modules/dropify/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/package.json b/backendpanel/asset/node_modules/dropify/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/fonts/dropify.eot b/backendpanel/asset/node_modules/dropify/src/fonts/dropify.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/fonts/dropify.svg b/backendpanel/asset/node_modules/dropify/src/fonts/dropify.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/fonts/dropify.ttf b/backendpanel/asset/node_modules/dropify/src/fonts/dropify.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/fonts/dropify.woff b/backendpanel/asset/node_modules/dropify/src/fonts/dropify.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/images/cover.jpg b/backendpanel/asset/node_modules/dropify/src/images/cover.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/images/test-image-1.jpg b/backendpanel/asset/node_modules/dropify/src/images/test-image-1.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/images/test-image-2.jpg b/backendpanel/asset/node_modules/dropify/src/images/test-image-2.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/js/dropify.js b/backendpanel/asset/node_modules/dropify/src/js/dropify.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/sass/_dropify-font.scss b/backendpanel/asset/node_modules/dropify/src/sass/_dropify-font.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/sass/demo.scss b/backendpanel/asset/node_modules/dropify/src/sass/demo.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/sass/demo/_grid.scss b/backendpanel/asset/node_modules/dropify/src/sass/demo/_grid.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/sass/demo/_normalize.scss b/backendpanel/asset/node_modules/dropify/src/sass/demo/_normalize.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/sass/demo/_reset.scss b/backendpanel/asset/node_modules/dropify/src/sass/demo/_reset.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/sass/demo/_typo.scss b/backendpanel/asset/node_modules/dropify/src/sass/demo/_typo.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/sass/demo/_variables.scss b/backendpanel/asset/node_modules/dropify/src/sass/demo/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/sass/demo/helpers/_grid.scss b/backendpanel/asset/node_modules/dropify/src/sass/demo/helpers/_grid.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/sass/demo/helpers/_mixins.scss b/backendpanel/asset/node_modules/dropify/src/sass/demo/helpers/_mixins.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/sass/demo/helpers/_shortcuts.scss b/backendpanel/asset/node_modules/dropify/src/sass/demo/helpers/_shortcuts.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/dropify/src/sass/dropify.scss b/backendpanel/asset/node_modules/dropify/src/sass/dropify.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/.editorconfig b/backendpanel/asset/node_modules/flag-icon-css/.editorconfig
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/.npmignore b/backendpanel/asset/node_modules/flag-icon-css/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/Gruntfile.coffee b/backendpanel/asset/node_modules/flag-icon-css/Gruntfile.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/LICENSE b/backendpanel/asset/node_modules/flag-icon-css/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/README.md b/backendpanel/asset/node_modules/flag-icon-css/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/assets/docs.css b/backendpanel/asset/node_modules/flag-icon-css/assets/docs.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/assets/docs.js b/backendpanel/asset/node_modules/flag-icon-css/assets/docs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/assets/docs.less b/backendpanel/asset/node_modules/flag-icon-css/assets/docs.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/bower.json b/backendpanel/asset/node_modules/flag-icon-css/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/composer.json b/backendpanel/asset/node_modules/flag-icon-css/composer.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/css/flag-icon.css b/backendpanel/asset/node_modules/flag-icon-css/css/flag-icon.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/css/flag-icon.min.css b/backendpanel/asset/node_modules/flag-icon-css/css/flag-icon.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ad.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ad.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ae.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ae.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/af.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/af.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ag.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ag.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ai.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ai.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/al.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/al.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/am.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/am.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ao.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ao.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/aq.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/aq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ar.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ar.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/as.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/as.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/at.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/at.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/au.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/au.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/aw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/aw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ax.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ax.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/az.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/az.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ba.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ba.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bb.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bd.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/be.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/be.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bi.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bj.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bo.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bq.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/br.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/br.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bs.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/by.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/by.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/bz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ca.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ca.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cd.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ch.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ch.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ci.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ci.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ck.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ck.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/co.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/co.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cx.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cy.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/cz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/de.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/de.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/dj.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/dj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/dk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/dk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/dm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/dm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/do.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/do.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/dz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/dz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ec.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ec.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ee.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ee.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/eg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/eg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/eh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/eh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/er.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/er.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/es.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/es.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/et.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/et.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/eu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/eu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fi.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fj.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fo.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/fr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ga.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ga.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gb-eng.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gb-eng.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gb-nir.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gb-nir.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gb-sct.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gb-sct.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gb-wls.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gb-wls.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gb.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gd.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ge.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ge.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gi.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gp.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gq.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gs.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gy.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/gy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/hk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/hk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/hm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/hm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/hn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/hn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/hr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/hr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ht.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ht.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/hu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/hu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/id.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/id.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ie.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ie.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/il.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/il.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/im.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/im.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/in.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/in.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/io.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/io.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/iq.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/iq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ir.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ir.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/is.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/is.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/it.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/it.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/je.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/je.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/jm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/jm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/jo.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/jo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/jp.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/jp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ke.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ke.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ki.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ki.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/km.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/km.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kp.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ky.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ky.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/kz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/la.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/la.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lb.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/li.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/li.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ls.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ls.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/lv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ly.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ly.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ma.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ma.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/md.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/md.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/me.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/me.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ml.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ml.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mo.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mp.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mq.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ms.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ms.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mx.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/my.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/my.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/mz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/na.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/na.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ne.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ne.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ng.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ng.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ni.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ni.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/no.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/no.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/np.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/np.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/nz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/om.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/om.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pa.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pe.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pe.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ph.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ph.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ps.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ps.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/pw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/py.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/py.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/qa.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/qa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/re.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/re.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ro.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ro.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/rs.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/rs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ru.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ru.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/rw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/rw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sa.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sb.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sd.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/se.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/se.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/si.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/si.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sj.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/so.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/so.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ss.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ss.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/st.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/st.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sx.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sy.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/sz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/td.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/td.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/th.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/th.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tj.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/to.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/to.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/tz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ua.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ua.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ug.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ug.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/um.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/um.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/un.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/un.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/us.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/us.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/uy.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/uy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/uz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/uz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/va.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/va.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/vc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/vc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ve.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ve.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/vg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/vg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/vi.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/vi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/vn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/vn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/vu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/vu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/wf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/wf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ws.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ws.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ye.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/ye.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/yt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/yt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/za.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/za.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/zm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/zm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/zw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/1x1/zw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ad.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ad.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ae.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ae.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/af.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/af.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ag.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ag.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ai.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ai.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/al.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/al.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/am.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/am.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ao.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ao.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/aq.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/aq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ar.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ar.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/as.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/as.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/at.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/at.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/au.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/au.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/aw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/aw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ax.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ax.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/az.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/az.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ba.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ba.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bb.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bd.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/be.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/be.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bi.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bj.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bo.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bq.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/br.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/br.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bs.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/by.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/by.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/bz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ca.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ca.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cd.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ch.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ch.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ci.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ci.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ck.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ck.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/co.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/co.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cx.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cy.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/cz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/de.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/de.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/dj.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/dj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/dk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/dk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/dm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/dm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/do.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/do.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/dz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/dz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ec.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ec.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ee.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ee.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/eg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/eg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/eh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/eh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/er.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/er.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/es.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/es.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/et.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/et.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/eu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/eu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fi.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fj.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fo.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/fr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ga.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ga.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gb-eng.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gb-eng.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gb-nir.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gb-nir.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gb-sct.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gb-sct.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gb-wls.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gb-wls.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gb.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gd.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ge.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ge.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gi.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gp.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gq.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gs.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gy.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/gy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/hk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/hk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/hm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/hm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/hn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/hn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/hr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/hr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ht.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ht.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/hu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/hu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/id.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/id.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ie.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ie.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/il.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/il.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/im.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/im.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/in.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/in.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/io.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/io.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/iq.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/iq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ir.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ir.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/is.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/is.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/it.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/it.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/je.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/je.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/jm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/jm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/jo.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/jo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/jp.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/jp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ke.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ke.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ki.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ki.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/km.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/km.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kp.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ky.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ky.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/kz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/la.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/la.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lb.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/li.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/li.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ls.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ls.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/lv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ly.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ly.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ma.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ma.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/md.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/md.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/me.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/me.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ml.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ml.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mo.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mp.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mq.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ms.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ms.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mx.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/my.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/my.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/mz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/na.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/na.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ne.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ne.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ng.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ng.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ni.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ni.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/no.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/no.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/np.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/np.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/nz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/om.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/om.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pa.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pe.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pe.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ph.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ph.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ps.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ps.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/pw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/py.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/py.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/qa.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/qa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/re.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/re.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ro.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ro.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/rs.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/rs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ru.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ru.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/rw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/rw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sa.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sb.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sd.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/se.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/se.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sh.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/si.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/si.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sj.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/so.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/so.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ss.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ss.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/st.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/st.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sx.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sy.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/sz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/td.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/td.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/th.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/th.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tj.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tk.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tl.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/to.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/to.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tr.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tv.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/tz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ua.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ua.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ug.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ug.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/um.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/um.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/un.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/un.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/us.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/us.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/uy.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/uy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/uz.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/uz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/va.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/va.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/vc.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/vc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ve.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ve.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/vg.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/vg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/vi.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/vi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/vn.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/vn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/vu.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/vu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/wf.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/wf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ws.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ws.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ye.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/ye.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/yt.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/yt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/za.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/za.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/zm.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/zm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/zw.svg b/backendpanel/asset/node_modules/flag-icon-css/flags/4x3/zw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/index.html b/backendpanel/asset/node_modules/flag-icon-css/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/less/flag-icon-base.less b/backendpanel/asset/node_modules/flag-icon-css/less/flag-icon-base.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/less/flag-icon-list.less b/backendpanel/asset/node_modules/flag-icon-css/less/flag-icon-list.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/less/flag-icon-more.less b/backendpanel/asset/node_modules/flag-icon-css/less/flag-icon-more.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/less/flag-icon.less b/backendpanel/asset/node_modules/flag-icon-css/less/flag-icon.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/less/variables.less b/backendpanel/asset/node_modules/flag-icon-css/less/variables.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/package.json b/backendpanel/asset/node_modules/flag-icon-css/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/sass/_flag-icon-base.scss b/backendpanel/asset/node_modules/flag-icon-css/sass/_flag-icon-base.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/sass/_flag-icon-list.scss b/backendpanel/asset/node_modules/flag-icon-css/sass/_flag-icon-list.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/sass/_flag-icon-more.scss b/backendpanel/asset/node_modules/flag-icon-css/sass/_flag-icon-more.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/sass/_flag-icon.scss b/backendpanel/asset/node_modules/flag-icon-css/sass/_flag-icon.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/flag-icon-css/sass/_variables.scss b/backendpanel/asset/node_modules/flag-icon-css/sass/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/.npmignore b/backendpanel/asset/node_modules/font-awesome/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/HELP-US-OUT.txt b/backendpanel/asset/node_modules/font-awesome/HELP-US-OUT.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/README.md b/backendpanel/asset/node_modules/font-awesome/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/css/font-awesome.css b/backendpanel/asset/node_modules/font-awesome/css/font-awesome.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/css/font-awesome.css.map b/backendpanel/asset/node_modules/font-awesome/css/font-awesome.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/css/font-awesome.min.css b/backendpanel/asset/node_modules/font-awesome/css/font-awesome.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/fonts/FontAwesome.otf b/backendpanel/asset/node_modules/font-awesome/fonts/FontAwesome.otf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/fonts/fontawesome-webfont.eot b/backendpanel/asset/node_modules/font-awesome/fonts/fontawesome-webfont.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/fonts/fontawesome-webfont.svg b/backendpanel/asset/node_modules/font-awesome/fonts/fontawesome-webfont.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/fonts/fontawesome-webfont.ttf b/backendpanel/asset/node_modules/font-awesome/fonts/fontawesome-webfont.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/fonts/fontawesome-webfont.woff b/backendpanel/asset/node_modules/font-awesome/fonts/fontawesome-webfont.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/fonts/fontawesome-webfont.woff2 b/backendpanel/asset/node_modules/font-awesome/fonts/fontawesome-webfont.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/animated.less b/backendpanel/asset/node_modules/font-awesome/less/animated.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/bordered-pulled.less b/backendpanel/asset/node_modules/font-awesome/less/bordered-pulled.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/core.less b/backendpanel/asset/node_modules/font-awesome/less/core.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/fixed-width.less b/backendpanel/asset/node_modules/font-awesome/less/fixed-width.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/font-awesome.less b/backendpanel/asset/node_modules/font-awesome/less/font-awesome.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/icons.less b/backendpanel/asset/node_modules/font-awesome/less/icons.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/larger.less b/backendpanel/asset/node_modules/font-awesome/less/larger.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/list.less b/backendpanel/asset/node_modules/font-awesome/less/list.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/mixins.less b/backendpanel/asset/node_modules/font-awesome/less/mixins.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/path.less b/backendpanel/asset/node_modules/font-awesome/less/path.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/rotated-flipped.less b/backendpanel/asset/node_modules/font-awesome/less/rotated-flipped.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/screen-reader.less b/backendpanel/asset/node_modules/font-awesome/less/screen-reader.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/stacked.less b/backendpanel/asset/node_modules/font-awesome/less/stacked.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/less/variables.less b/backendpanel/asset/node_modules/font-awesome/less/variables.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/package.json b/backendpanel/asset/node_modules/font-awesome/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_animated.scss b/backendpanel/asset/node_modules/font-awesome/scss/_animated.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_bordered-pulled.scss b/backendpanel/asset/node_modules/font-awesome/scss/_bordered-pulled.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_core.scss b/backendpanel/asset/node_modules/font-awesome/scss/_core.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_fixed-width.scss b/backendpanel/asset/node_modules/font-awesome/scss/_fixed-width.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_icons.scss b/backendpanel/asset/node_modules/font-awesome/scss/_icons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_larger.scss b/backendpanel/asset/node_modules/font-awesome/scss/_larger.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_list.scss b/backendpanel/asset/node_modules/font-awesome/scss/_list.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_mixins.scss b/backendpanel/asset/node_modules/font-awesome/scss/_mixins.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_path.scss b/backendpanel/asset/node_modules/font-awesome/scss/_path.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_rotated-flipped.scss b/backendpanel/asset/node_modules/font-awesome/scss/_rotated-flipped.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_screen-reader.scss b/backendpanel/asset/node_modules/font-awesome/scss/_screen-reader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_stacked.scss b/backendpanel/asset/node_modules/font-awesome/scss/_stacked.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/_variables.scss b/backendpanel/asset/node_modules/font-awesome/scss/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/font-awesome/scss/font-awesome.scss b/backendpanel/asset/node_modules/font-awesome/scss/font-awesome.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/.npmignore b/backendpanel/asset/node_modules/icheck/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/CHANGELOG.md b/backendpanel/asset/node_modules/icheck/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/README.md b/backendpanel/asset/node_modules/icheck/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/bower.json b/backendpanel/asset/node_modules/icheck/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/banner.jpg b/backendpanel/asset/node_modules/icheck/demo/css/banner.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/custom.css b/backendpanel/asset/node_modules/icheck/demo/css/custom.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/icheck.png b/backendpanel/asset/node_modules/icheck/demo/css/icheck.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/ie/arrow-bottom.png b/backendpanel/asset/node_modules/icheck/demo/css/ie/arrow-bottom.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/ie/arrow-top.png b/backendpanel/asset/node_modules/icheck/demo/css/ie/arrow-top.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/ie/header-line.png b/backendpanel/asset/node_modules/icheck/demo/css/ie/header-line.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/ie/icon-fork.png b/backendpanel/asset/node_modules/icheck/demo/css/ie/icon-fork.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/ie/icon-github.png b/backendpanel/asset/node_modules/icheck/demo/css/ie/icon-github.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/ie/icon-lab.png b/backendpanel/asset/node_modules/icheck/demo/css/ie/icon-lab.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/ie/icon-options.png b/backendpanel/asset/node_modules/icheck/demo/css/ie/icon-options.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/ie/icon-star.png b/backendpanel/asset/node_modules/icheck/demo/css/ie/icon-star.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/montserrat-bold.eot b/backendpanel/asset/node_modules/icheck/demo/css/montserrat-bold.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/montserrat-bold.svg b/backendpanel/asset/node_modules/icheck/demo/css/montserrat-bold.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/montserrat-bold.ttf b/backendpanel/asset/node_modules/icheck/demo/css/montserrat-bold.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/montserrat-bold.woff b/backendpanel/asset/node_modules/icheck/demo/css/montserrat-bold.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/montserrat-regular.eot b/backendpanel/asset/node_modules/icheck/demo/css/montserrat-regular.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/montserrat-regular.svg b/backendpanel/asset/node_modules/icheck/demo/css/montserrat-regular.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/montserrat-regular.ttf b/backendpanel/asset/node_modules/icheck/demo/css/montserrat-regular.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/montserrat-regular.woff b/backendpanel/asset/node_modules/icheck/demo/css/montserrat-regular.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/css/normalize.css b/backendpanel/asset/node_modules/icheck/demo/css/normalize.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/index.html b/backendpanel/asset/node_modules/icheck/demo/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/js/custom.min.js b/backendpanel/asset/node_modules/icheck/demo/js/custom.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/js/jquery.js b/backendpanel/asset/node_modules/icheck/demo/js/jquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/demo/js/zepto.js b/backendpanel/asset/node_modules/icheck/demo/js/zepto.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/icheck.jquery.json b/backendpanel/asset/node_modules/icheck/icheck.jquery.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/icheck.js b/backendpanel/asset/node_modules/icheck/icheck.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/icheck.min.js b/backendpanel/asset/node_modules/icheck/icheck.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/package.json b/backendpanel/asset/node_modules/icheck/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/all.css b/backendpanel/asset/node_modules/icheck/skins/all.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/_all.css b/backendpanel/asset/node_modules/icheck/skins/flat/_all.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/aero.css b/backendpanel/asset/node_modules/icheck/skins/flat/aero.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/aero.png b/backendpanel/asset/node_modules/icheck/skins/flat/aero.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/aero@2x.png b/backendpanel/asset/node_modules/icheck/skins/flat/aero@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/blue.css b/backendpanel/asset/node_modules/icheck/skins/flat/blue.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/blue.png b/backendpanel/asset/node_modules/icheck/skins/flat/blue.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/blue@2x.png b/backendpanel/asset/node_modules/icheck/skins/flat/blue@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/flat.css b/backendpanel/asset/node_modules/icheck/skins/flat/flat.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/flat.png b/backendpanel/asset/node_modules/icheck/skins/flat/flat.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/flat@2x.png b/backendpanel/asset/node_modules/icheck/skins/flat/flat@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/green.css b/backendpanel/asset/node_modules/icheck/skins/flat/green.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/green.png b/backendpanel/asset/node_modules/icheck/skins/flat/green.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/green@2x.png b/backendpanel/asset/node_modules/icheck/skins/flat/green@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/grey.css b/backendpanel/asset/node_modules/icheck/skins/flat/grey.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/grey.png b/backendpanel/asset/node_modules/icheck/skins/flat/grey.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/grey@2x.png b/backendpanel/asset/node_modules/icheck/skins/flat/grey@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/orange.css b/backendpanel/asset/node_modules/icheck/skins/flat/orange.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/orange.png b/backendpanel/asset/node_modules/icheck/skins/flat/orange.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/orange@2x.png b/backendpanel/asset/node_modules/icheck/skins/flat/orange@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/pink.css b/backendpanel/asset/node_modules/icheck/skins/flat/pink.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/pink.png b/backendpanel/asset/node_modules/icheck/skins/flat/pink.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/pink@2x.png b/backendpanel/asset/node_modules/icheck/skins/flat/pink@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/purple.css b/backendpanel/asset/node_modules/icheck/skins/flat/purple.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/purple.png b/backendpanel/asset/node_modules/icheck/skins/flat/purple.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/purple@2x.png b/backendpanel/asset/node_modules/icheck/skins/flat/purple@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/red.css b/backendpanel/asset/node_modules/icheck/skins/flat/red.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/red.png b/backendpanel/asset/node_modules/icheck/skins/flat/red.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/red@2x.png b/backendpanel/asset/node_modules/icheck/skins/flat/red@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/yellow.css b/backendpanel/asset/node_modules/icheck/skins/flat/yellow.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/yellow.png b/backendpanel/asset/node_modules/icheck/skins/flat/yellow.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/flat/yellow@2x.png b/backendpanel/asset/node_modules/icheck/skins/flat/yellow@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/futurico/futurico.css b/backendpanel/asset/node_modules/icheck/skins/futurico/futurico.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/futurico/futurico.png b/backendpanel/asset/node_modules/icheck/skins/futurico/futurico.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/futurico/futurico@2x.png b/backendpanel/asset/node_modules/icheck/skins/futurico/futurico@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/_all.css b/backendpanel/asset/node_modules/icheck/skins/line/_all.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/aero.css b/backendpanel/asset/node_modules/icheck/skins/line/aero.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/blue.css b/backendpanel/asset/node_modules/icheck/skins/line/blue.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/green.css b/backendpanel/asset/node_modules/icheck/skins/line/green.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/grey.css b/backendpanel/asset/node_modules/icheck/skins/line/grey.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/line.css b/backendpanel/asset/node_modules/icheck/skins/line/line.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/line.png b/backendpanel/asset/node_modules/icheck/skins/line/line.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/line@2x.png b/backendpanel/asset/node_modules/icheck/skins/line/line@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/orange.css b/backendpanel/asset/node_modules/icheck/skins/line/orange.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/pink.css b/backendpanel/asset/node_modules/icheck/skins/line/pink.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/purple.css b/backendpanel/asset/node_modules/icheck/skins/line/purple.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/red.css b/backendpanel/asset/node_modules/icheck/skins/line/red.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/line/yellow.css b/backendpanel/asset/node_modules/icheck/skins/line/yellow.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/_all.css b/backendpanel/asset/node_modules/icheck/skins/minimal/_all.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/aero.css b/backendpanel/asset/node_modules/icheck/skins/minimal/aero.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/aero.png b/backendpanel/asset/node_modules/icheck/skins/minimal/aero.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/aero@2x.png b/backendpanel/asset/node_modules/icheck/skins/minimal/aero@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/blue.css b/backendpanel/asset/node_modules/icheck/skins/minimal/blue.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/blue.png b/backendpanel/asset/node_modules/icheck/skins/minimal/blue.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/blue@2x.png b/backendpanel/asset/node_modules/icheck/skins/minimal/blue@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/green.css b/backendpanel/asset/node_modules/icheck/skins/minimal/green.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/green.png b/backendpanel/asset/node_modules/icheck/skins/minimal/green.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/green@2x.png b/backendpanel/asset/node_modules/icheck/skins/minimal/green@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/grey.css b/backendpanel/asset/node_modules/icheck/skins/minimal/grey.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/grey.png b/backendpanel/asset/node_modules/icheck/skins/minimal/grey.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/grey@2x.png b/backendpanel/asset/node_modules/icheck/skins/minimal/grey@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/minimal.css b/backendpanel/asset/node_modules/icheck/skins/minimal/minimal.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/minimal.png b/backendpanel/asset/node_modules/icheck/skins/minimal/minimal.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/minimal@2x.png b/backendpanel/asset/node_modules/icheck/skins/minimal/minimal@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/orange.css b/backendpanel/asset/node_modules/icheck/skins/minimal/orange.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/orange.png b/backendpanel/asset/node_modules/icheck/skins/minimal/orange.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/orange@2x.png b/backendpanel/asset/node_modules/icheck/skins/minimal/orange@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/pink.css b/backendpanel/asset/node_modules/icheck/skins/minimal/pink.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/pink.png b/backendpanel/asset/node_modules/icheck/skins/minimal/pink.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/pink@2x.png b/backendpanel/asset/node_modules/icheck/skins/minimal/pink@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/purple.css b/backendpanel/asset/node_modules/icheck/skins/minimal/purple.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/purple.png b/backendpanel/asset/node_modules/icheck/skins/minimal/purple.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/purple@2x.png b/backendpanel/asset/node_modules/icheck/skins/minimal/purple@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/red.css b/backendpanel/asset/node_modules/icheck/skins/minimal/red.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/red.png b/backendpanel/asset/node_modules/icheck/skins/minimal/red.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/red@2x.png b/backendpanel/asset/node_modules/icheck/skins/minimal/red@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/yellow.css b/backendpanel/asset/node_modules/icheck/skins/minimal/yellow.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/yellow.png b/backendpanel/asset/node_modules/icheck/skins/minimal/yellow.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/minimal/yellow@2x.png b/backendpanel/asset/node_modules/icheck/skins/minimal/yellow@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/polaris/polaris.css b/backendpanel/asset/node_modules/icheck/skins/polaris/polaris.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/polaris/polaris.png b/backendpanel/asset/node_modules/icheck/skins/polaris/polaris.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/polaris/polaris@2x.png b/backendpanel/asset/node_modules/icheck/skins/polaris/polaris@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/_all.css b/backendpanel/asset/node_modules/icheck/skins/square/_all.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/aero.css b/backendpanel/asset/node_modules/icheck/skins/square/aero.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/aero.png b/backendpanel/asset/node_modules/icheck/skins/square/aero.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/aero@2x.png b/backendpanel/asset/node_modules/icheck/skins/square/aero@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/blue.css b/backendpanel/asset/node_modules/icheck/skins/square/blue.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/blue.png b/backendpanel/asset/node_modules/icheck/skins/square/blue.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/blue@2x.png b/backendpanel/asset/node_modules/icheck/skins/square/blue@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/green.css b/backendpanel/asset/node_modules/icheck/skins/square/green.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/green.png b/backendpanel/asset/node_modules/icheck/skins/square/green.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/green@2x.png b/backendpanel/asset/node_modules/icheck/skins/square/green@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/grey.css b/backendpanel/asset/node_modules/icheck/skins/square/grey.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/grey.png b/backendpanel/asset/node_modules/icheck/skins/square/grey.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/grey@2x.png b/backendpanel/asset/node_modules/icheck/skins/square/grey@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/orange.css b/backendpanel/asset/node_modules/icheck/skins/square/orange.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/orange.png b/backendpanel/asset/node_modules/icheck/skins/square/orange.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/orange@2x.png b/backendpanel/asset/node_modules/icheck/skins/square/orange@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/pink.css b/backendpanel/asset/node_modules/icheck/skins/square/pink.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/pink.png b/backendpanel/asset/node_modules/icheck/skins/square/pink.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/pink@2x.png b/backendpanel/asset/node_modules/icheck/skins/square/pink@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/purple.css b/backendpanel/asset/node_modules/icheck/skins/square/purple.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/purple.png b/backendpanel/asset/node_modules/icheck/skins/square/purple.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/purple@2x.png b/backendpanel/asset/node_modules/icheck/skins/square/purple@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/red.css b/backendpanel/asset/node_modules/icheck/skins/square/red.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/red.png b/backendpanel/asset/node_modules/icheck/skins/square/red.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/red@2x.png b/backendpanel/asset/node_modules/icheck/skins/square/red@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/square.css b/backendpanel/asset/node_modules/icheck/skins/square/square.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/square.png b/backendpanel/asset/node_modules/icheck/skins/square/square.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/square@2x.png b/backendpanel/asset/node_modules/icheck/skins/square/square@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/yellow.css b/backendpanel/asset/node_modules/icheck/skins/square/yellow.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/yellow.png b/backendpanel/asset/node_modules/icheck/skins/square/yellow.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/icheck/skins/square/yellow@2x.png b/backendpanel/asset/node_modules/icheck/skins/square/yellow@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/.npmignore b/backendpanel/asset/node_modules/jquery-bar-rating/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/.travis.yml b/backendpanel/asset/node_modules/jquery-bar-rating/.travis.yml
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/CHANGELOG.md b/backendpanel/asset/node_modules/jquery-bar-rating/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/LICENSE.txt b/backendpanel/asset/node_modules/jquery-bar-rating/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/README.md b/backendpanel/asset/node_modules/jquery-bar-rating/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/bower.json b/backendpanel/asset/node_modules/jquery-bar-rating/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/jquery.barrating.min.js b/backendpanel/asset/node_modules/jquery-bar-rating/dist/jquery.barrating.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/jquery.barrating.min.js.map b/backendpanel/asset/node_modules/jquery-bar-rating/dist/jquery.barrating.min.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-1to10.css b/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-1to10.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-horizontal.css b/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-horizontal.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-movie.css b/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-movie.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-pill.css b/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-pill.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-reversed.css b/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-reversed.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-square.css b/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bars-square.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bootstrap-stars.css b/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/bootstrap-stars.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/css-stars.css b/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/css-stars.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/fontawesome-stars-o.css b/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/fontawesome-stars-o.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/fontawesome-stars.css b/backendpanel/asset/node_modules/jquery-bar-rating/dist/themes/fontawesome-stars.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/css/examples.css b/backendpanel/asset/node_modules/jquery-bar-rating/examples/css/examples.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/css/main.css b/backendpanel/asset/node_modules/jquery-bar-rating/examples/css/main.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/css/normalize.css b/backendpanel/asset/node_modules/jquery-bar-rating/examples/css/normalize.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/css/normalize.min.css b/backendpanel/asset/node_modules/jquery-bar-rating/examples/css/normalize.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/antenna.png b/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/antenna.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/antenna@2x.png b/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/antenna@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/bars.png b/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/bars.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/bars@2x.png b/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/bars@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/github.png b/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/github.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/github@2x.png b/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/github@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/star.png b/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/star.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/star@2x.png b/backendpanel/asset/node_modules/jquery-bar-rating/examples/img/star@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/index.html b/backendpanel/asset/node_modules/jquery-bar-rating/examples/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/js/examples.js b/backendpanel/asset/node_modules/jquery-bar-rating/examples/js/examples.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/js/vendor/html5shiv.js b/backendpanel/asset/node_modules/jquery-bar-rating/examples/js/vendor/html5shiv.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/js/vendor/jquery-1.11.2.min.js b/backendpanel/asset/node_modules/jquery-bar-rating/examples/js/vendor/jquery-1.11.2.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/less/examples.less b/backendpanel/asset/node_modules/jquery-bar-rating/examples/less/examples.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/less/main.less b/backendpanel/asset/node_modules/jquery-bar-rating/examples/less/main.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/less/mixins.less b/backendpanel/asset/node_modules/jquery-bar-rating/examples/less/mixins.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/examples/less/variables.less b/backendpanel/asset/node_modules/jquery-bar-rating/examples/less/variables.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/gulpfile.js b/backendpanel/asset/node_modules/jquery-bar-rating/gulpfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/jquery.barrating.js b/backendpanel/asset/node_modules/jquery-bar-rating/jquery.barrating.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/karma.conf.js b/backendpanel/asset/node_modules/jquery-bar-rating/karma.conf.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/package.json b/backendpanel/asset/node_modules/jquery-bar-rating/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/test/jquery.barrating-spec.js b/backendpanel/asset/node_modules/jquery-bar-rating/test/jquery.barrating-spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-1to10.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-1to10.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-horizontal.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-horizontal.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-movie.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-movie.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-pill.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-pill.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-reversed.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-reversed.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-square.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/bars-square.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/bootstrap-stars.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/bootstrap-stars.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/css-stars.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/css-stars.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/fontawesome-stars-o.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/fontawesome-stars-o.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/fontawesome-stars.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/fontawesome-stars.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/mixins.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/mixins.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-bar-rating/themes/variables.less b/backendpanel/asset/node_modules/jquery-bar-rating/themes/variables.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/.npmignore b/backendpanel/asset/node_modules/jquery-sparkline/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/Changelog.txt b/backendpanel/asset/node_modules/jquery-sparkline/Changelog.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/README.md b/backendpanel/asset/node_modules/jquery-sparkline/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/build.js b/backendpanel/asset/node_modules/jquery-sparkline/build.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/jquery.sparkline.js b/backendpanel/asset/node_modules/jquery-sparkline/jquery.sparkline.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/jquery.sparkline.min.js b/backendpanel/asset/node_modules/jquery-sparkline/jquery.sparkline.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/package.json b/backendpanel/asset/node_modules/jquery-sparkline/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/base.js b/backendpanel/asset/node_modules/jquery-sparkline/src/base.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/chart-bar.js b/backendpanel/asset/node_modules/jquery-sparkline/src/chart-bar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/chart-box.js b/backendpanel/asset/node_modules/jquery-sparkline/src/chart-box.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/chart-bullet.js b/backendpanel/asset/node_modules/jquery-sparkline/src/chart-bullet.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/chart-discrete.js b/backendpanel/asset/node_modules/jquery-sparkline/src/chart-discrete.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/chart-line.js b/backendpanel/asset/node_modules/jquery-sparkline/src/chart-line.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/chart-pie.js b/backendpanel/asset/node_modules/jquery-sparkline/src/chart-pie.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/chart-tristate.js b/backendpanel/asset/node_modules/jquery-sparkline/src/chart-tristate.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/defaults.js b/backendpanel/asset/node_modules/jquery-sparkline/src/defaults.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/footer.js b/backendpanel/asset/node_modules/jquery-sparkline/src/footer.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/header.js b/backendpanel/asset/node_modules/jquery-sparkline/src/header.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/interact.js b/backendpanel/asset/node_modules/jquery-sparkline/src/interact.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/rangemap.js b/backendpanel/asset/node_modules/jquery-sparkline/src/rangemap.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/simpledraw.js b/backendpanel/asset/node_modules/jquery-sparkline/src/simpledraw.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/utils.js b/backendpanel/asset/node_modules/jquery-sparkline/src/utils.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/vcanvas-base.js b/backendpanel/asset/node_modules/jquery-sparkline/src/vcanvas-base.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/vcanvas-canvas.js b/backendpanel/asset/node_modules/jquery-sparkline/src/vcanvas-canvas.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery-sparkline/src/vcanvas-vml.js b/backendpanel/asset/node_modules/jquery-sparkline/src/vcanvas-vml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/AUTHORS.txt b/backendpanel/asset/node_modules/jquery/AUTHORS.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/LICENSE.txt b/backendpanel/asset/node_modules/jquery/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/README.md b/backendpanel/asset/node_modules/jquery/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/bower.json b/backendpanel/asset/node_modules/jquery/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/dist/core.js b/backendpanel/asset/node_modules/jquery/dist/core.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/dist/jquery.js b/backendpanel/asset/node_modules/jquery/dist/jquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/dist/jquery.min.js b/backendpanel/asset/node_modules/jquery/dist/jquery.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/dist/jquery.min.map b/backendpanel/asset/node_modules/jquery/dist/jquery.min.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/dist/jquery.slim.js b/backendpanel/asset/node_modules/jquery/dist/jquery.slim.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/dist/jquery.slim.min.js b/backendpanel/asset/node_modules/jquery/dist/jquery.slim.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/dist/jquery.slim.min.map b/backendpanel/asset/node_modules/jquery/dist/jquery.slim.min.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/external/sizzle/LICENSE.txt b/backendpanel/asset/node_modules/jquery/external/sizzle/LICENSE.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/external/sizzle/dist/sizzle.js b/backendpanel/asset/node_modules/jquery/external/sizzle/dist/sizzle.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/external/sizzle/dist/sizzle.min.js b/backendpanel/asset/node_modules/jquery/external/sizzle/dist/sizzle.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/external/sizzle/dist/sizzle.min.map b/backendpanel/asset/node_modules/jquery/external/sizzle/dist/sizzle.min.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/package.json b/backendpanel/asset/node_modules/jquery/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/.eslintrc.json b/backendpanel/asset/node_modules/jquery/src/.eslintrc.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/ajax.js b/backendpanel/asset/node_modules/jquery/src/ajax.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/ajax/jsonp.js b/backendpanel/asset/node_modules/jquery/src/ajax/jsonp.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/ajax/load.js b/backendpanel/asset/node_modules/jquery/src/ajax/load.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/ajax/parseXML.js b/backendpanel/asset/node_modules/jquery/src/ajax/parseXML.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/ajax/script.js b/backendpanel/asset/node_modules/jquery/src/ajax/script.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/ajax/var/location.js b/backendpanel/asset/node_modules/jquery/src/ajax/var/location.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/ajax/var/nonce.js b/backendpanel/asset/node_modules/jquery/src/ajax/var/nonce.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/ajax/var/rquery.js b/backendpanel/asset/node_modules/jquery/src/ajax/var/rquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/ajax/xhr.js b/backendpanel/asset/node_modules/jquery/src/ajax/xhr.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/attributes.js b/backendpanel/asset/node_modules/jquery/src/attributes.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/attributes/attr.js b/backendpanel/asset/node_modules/jquery/src/attributes/attr.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/attributes/classes.js b/backendpanel/asset/node_modules/jquery/src/attributes/classes.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/attributes/prop.js b/backendpanel/asset/node_modules/jquery/src/attributes/prop.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/attributes/support.js b/backendpanel/asset/node_modules/jquery/src/attributes/support.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/attributes/val.js b/backendpanel/asset/node_modules/jquery/src/attributes/val.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/callbacks.js b/backendpanel/asset/node_modules/jquery/src/callbacks.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core.js b/backendpanel/asset/node_modules/jquery/src/core.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core/DOMEval.js b/backendpanel/asset/node_modules/jquery/src/core/DOMEval.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core/access.js b/backendpanel/asset/node_modules/jquery/src/core/access.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core/init.js b/backendpanel/asset/node_modules/jquery/src/core/init.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core/nodeName.js b/backendpanel/asset/node_modules/jquery/src/core/nodeName.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core/parseHTML.js b/backendpanel/asset/node_modules/jquery/src/core/parseHTML.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core/ready-no-deferred.js b/backendpanel/asset/node_modules/jquery/src/core/ready-no-deferred.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core/ready.js b/backendpanel/asset/node_modules/jquery/src/core/ready.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core/readyException.js b/backendpanel/asset/node_modules/jquery/src/core/readyException.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core/stripAndCollapse.js b/backendpanel/asset/node_modules/jquery/src/core/stripAndCollapse.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core/support.js b/backendpanel/asset/node_modules/jquery/src/core/support.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/core/var/rsingleTag.js b/backendpanel/asset/node_modules/jquery/src/core/var/rsingleTag.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css.js b/backendpanel/asset/node_modules/jquery/src/css.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/addGetHookIf.js b/backendpanel/asset/node_modules/jquery/src/css/addGetHookIf.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/adjustCSS.js b/backendpanel/asset/node_modules/jquery/src/css/adjustCSS.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/curCSS.js b/backendpanel/asset/node_modules/jquery/src/css/curCSS.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/hiddenVisibleSelectors.js b/backendpanel/asset/node_modules/jquery/src/css/hiddenVisibleSelectors.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/showHide.js b/backendpanel/asset/node_modules/jquery/src/css/showHide.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/support.js b/backendpanel/asset/node_modules/jquery/src/css/support.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/var/cssExpand.js b/backendpanel/asset/node_modules/jquery/src/css/var/cssExpand.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/var/getStyles.js b/backendpanel/asset/node_modules/jquery/src/css/var/getStyles.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/var/isHiddenWithinTree.js b/backendpanel/asset/node_modules/jquery/src/css/var/isHiddenWithinTree.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/var/rmargin.js b/backendpanel/asset/node_modules/jquery/src/css/var/rmargin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/var/rnumnonpx.js b/backendpanel/asset/node_modules/jquery/src/css/var/rnumnonpx.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/css/var/swap.js b/backendpanel/asset/node_modules/jquery/src/css/var/swap.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/data.js b/backendpanel/asset/node_modules/jquery/src/data.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/data/Data.js b/backendpanel/asset/node_modules/jquery/src/data/Data.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/data/var/acceptData.js b/backendpanel/asset/node_modules/jquery/src/data/var/acceptData.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/data/var/dataPriv.js b/backendpanel/asset/node_modules/jquery/src/data/var/dataPriv.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/data/var/dataUser.js b/backendpanel/asset/node_modules/jquery/src/data/var/dataUser.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/deferred.js b/backendpanel/asset/node_modules/jquery/src/deferred.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/deferred/exceptionHook.js b/backendpanel/asset/node_modules/jquery/src/deferred/exceptionHook.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/deprecated.js b/backendpanel/asset/node_modules/jquery/src/deprecated.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/dimensions.js b/backendpanel/asset/node_modules/jquery/src/dimensions.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/effects.js b/backendpanel/asset/node_modules/jquery/src/effects.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/effects/Tween.js b/backendpanel/asset/node_modules/jquery/src/effects/Tween.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/effects/animatedSelector.js b/backendpanel/asset/node_modules/jquery/src/effects/animatedSelector.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/event.js b/backendpanel/asset/node_modules/jquery/src/event.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/event/ajax.js b/backendpanel/asset/node_modules/jquery/src/event/ajax.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/event/alias.js b/backendpanel/asset/node_modules/jquery/src/event/alias.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/event/focusin.js b/backendpanel/asset/node_modules/jquery/src/event/focusin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/event/support.js b/backendpanel/asset/node_modules/jquery/src/event/support.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/event/trigger.js b/backendpanel/asset/node_modules/jquery/src/event/trigger.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/exports/amd.js b/backendpanel/asset/node_modules/jquery/src/exports/amd.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/exports/global.js b/backendpanel/asset/node_modules/jquery/src/exports/global.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/jquery.js b/backendpanel/asset/node_modules/jquery/src/jquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/manipulation.js b/backendpanel/asset/node_modules/jquery/src/manipulation.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/manipulation/_evalUrl.js b/backendpanel/asset/node_modules/jquery/src/manipulation/_evalUrl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/manipulation/buildFragment.js b/backendpanel/asset/node_modules/jquery/src/manipulation/buildFragment.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/manipulation/getAll.js b/backendpanel/asset/node_modules/jquery/src/manipulation/getAll.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/manipulation/setGlobalEval.js b/backendpanel/asset/node_modules/jquery/src/manipulation/setGlobalEval.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/manipulation/support.js b/backendpanel/asset/node_modules/jquery/src/manipulation/support.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/manipulation/var/rcheckableType.js b/backendpanel/asset/node_modules/jquery/src/manipulation/var/rcheckableType.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/manipulation/var/rscriptType.js b/backendpanel/asset/node_modules/jquery/src/manipulation/var/rscriptType.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/manipulation/var/rtagName.js b/backendpanel/asset/node_modules/jquery/src/manipulation/var/rtagName.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/manipulation/wrapMap.js b/backendpanel/asset/node_modules/jquery/src/manipulation/wrapMap.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/offset.js b/backendpanel/asset/node_modules/jquery/src/offset.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/queue.js b/backendpanel/asset/node_modules/jquery/src/queue.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/queue/delay.js b/backendpanel/asset/node_modules/jquery/src/queue/delay.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/selector-native.js b/backendpanel/asset/node_modules/jquery/src/selector-native.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/selector-sizzle.js b/backendpanel/asset/node_modules/jquery/src/selector-sizzle.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/selector.js b/backendpanel/asset/node_modules/jquery/src/selector.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/serialize.js b/backendpanel/asset/node_modules/jquery/src/serialize.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/traversing.js b/backendpanel/asset/node_modules/jquery/src/traversing.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/traversing/findFilter.js b/backendpanel/asset/node_modules/jquery/src/traversing/findFilter.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/traversing/var/dir.js b/backendpanel/asset/node_modules/jquery/src/traversing/var/dir.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/traversing/var/rneedsContext.js b/backendpanel/asset/node_modules/jquery/src/traversing/var/rneedsContext.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/traversing/var/siblings.js b/backendpanel/asset/node_modules/jquery/src/traversing/var/siblings.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/ObjectFunctionString.js b/backendpanel/asset/node_modules/jquery/src/var/ObjectFunctionString.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/arr.js b/backendpanel/asset/node_modules/jquery/src/var/arr.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/class2type.js b/backendpanel/asset/node_modules/jquery/src/var/class2type.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/concat.js b/backendpanel/asset/node_modules/jquery/src/var/concat.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/document.js b/backendpanel/asset/node_modules/jquery/src/var/document.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/documentElement.js b/backendpanel/asset/node_modules/jquery/src/var/documentElement.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/fnToString.js b/backendpanel/asset/node_modules/jquery/src/var/fnToString.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/getProto.js b/backendpanel/asset/node_modules/jquery/src/var/getProto.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/hasOwn.js b/backendpanel/asset/node_modules/jquery/src/var/hasOwn.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/indexOf.js b/backendpanel/asset/node_modules/jquery/src/var/indexOf.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/pnum.js b/backendpanel/asset/node_modules/jquery/src/var/pnum.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/push.js b/backendpanel/asset/node_modules/jquery/src/var/push.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/rcssNum.js b/backendpanel/asset/node_modules/jquery/src/var/rcssNum.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/rnothtmlwhite.js b/backendpanel/asset/node_modules/jquery/src/var/rnothtmlwhite.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/slice.js b/backendpanel/asset/node_modules/jquery/src/var/slice.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/support.js b/backendpanel/asset/node_modules/jquery/src/var/support.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/var/toString.js b/backendpanel/asset/node_modules/jquery/src/var/toString.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/jquery/src/wrap.js b/backendpanel/asset/node_modules/jquery/src/wrap.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/README.md b/backendpanel/asset/node_modules/mdi/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/bower.json b/backendpanel/asset/node_modules/mdi/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/css/materialdesignicons.css b/backendpanel/asset/node_modules/mdi/css/materialdesignicons.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/css/materialdesignicons.css.map b/backendpanel/asset/node_modules/mdi/css/materialdesignicons.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/css/materialdesignicons.min.css b/backendpanel/asset/node_modules/mdi/css/materialdesignicons.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/css/materialdesignicons.min.css.map b/backendpanel/asset/node_modules/mdi/css/materialdesignicons.min.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/fonts/materialdesignicons-webfont.eot b/backendpanel/asset/node_modules/mdi/fonts/materialdesignicons-webfont.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/fonts/materialdesignicons-webfont.svg b/backendpanel/asset/node_modules/mdi/fonts/materialdesignicons-webfont.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/fonts/materialdesignicons-webfont.ttf b/backendpanel/asset/node_modules/mdi/fonts/materialdesignicons-webfont.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/fonts/materialdesignicons-webfont.woff b/backendpanel/asset/node_modules/mdi/fonts/materialdesignicons-webfont.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/fonts/materialdesignicons-webfont.woff2 b/backendpanel/asset/node_modules/mdi/fonts/materialdesignicons-webfont.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/license.md b/backendpanel/asset/node_modules/mdi/license.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/package.json b/backendpanel/asset/node_modules/mdi/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/preview.html b/backendpanel/asset/node_modules/mdi/preview.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/scss/_animated.scss b/backendpanel/asset/node_modules/mdi/scss/_animated.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/scss/_core.scss b/backendpanel/asset/node_modules/mdi/scss/_core.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/scss/_extras.scss b/backendpanel/asset/node_modules/mdi/scss/_extras.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/scss/_functions.scss b/backendpanel/asset/node_modules/mdi/scss/_functions.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/scss/_icons.scss b/backendpanel/asset/node_modules/mdi/scss/_icons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/scss/_path.scss b/backendpanel/asset/node_modules/mdi/scss/_path.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/scss/_variables.scss b/backendpanel/asset/node_modules/mdi/scss/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/mdi/scss/materialdesignicons.scss b/backendpanel/asset/node_modules/mdi/scss/materialdesignicons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/.npmignore b/backendpanel/asset/node_modules/morris.js/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/.travis.yml b/backendpanel/asset/node_modules/morris.js/.travis.yml
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/Gruntfile.js b/backendpanel/asset/node_modules/morris.js/Gruntfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/README.md b/backendpanel/asset/node_modules/morris.js/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/bower.json b/backendpanel/asset/node_modules/morris.js/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/bower.travis.json b/backendpanel/asset/node_modules/morris.js/bower.travis.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/_template.html b/backendpanel/asset/node_modules/morris.js/examples/_template.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/area-as-line.html b/backendpanel/asset/node_modules/morris.js/examples/area-as-line.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/area.html b/backendpanel/asset/node_modules/morris.js/examples/area.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/bar-colors.html b/backendpanel/asset/node_modules/morris.js/examples/bar-colors.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/bar-no-axes.html b/backendpanel/asset/node_modules/morris.js/examples/bar-no-axes.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/bar.html b/backendpanel/asset/node_modules/morris.js/examples/bar.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/days.html b/backendpanel/asset/node_modules/morris.js/examples/days.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/decimal-custom-hover.html b/backendpanel/asset/node_modules/morris.js/examples/decimal-custom-hover.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/diagonal-xlabels-bar.html b/backendpanel/asset/node_modules/morris.js/examples/diagonal-xlabels-bar.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/diagonal-xlabels.html b/backendpanel/asset/node_modules/morris.js/examples/diagonal-xlabels.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/donut-colors.html b/backendpanel/asset/node_modules/morris.js/examples/donut-colors.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/donut-formatter.html b/backendpanel/asset/node_modules/morris.js/examples/donut-formatter.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/donut.html b/backendpanel/asset/node_modules/morris.js/examples/donut.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/dst.html b/backendpanel/asset/node_modules/morris.js/examples/dst.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/events.html b/backendpanel/asset/node_modules/morris.js/examples/events.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/goals.html b/backendpanel/asset/node_modules/morris.js/examples/goals.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/lib/example.css b/backendpanel/asset/node_modules/morris.js/examples/lib/example.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/lib/example.js b/backendpanel/asset/node_modules/morris.js/examples/lib/example.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/months-no-smooth.html b/backendpanel/asset/node_modules/morris.js/examples/months-no-smooth.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/negative.html b/backendpanel/asset/node_modules/morris.js/examples/negative.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/no-grid.html b/backendpanel/asset/node_modules/morris.js/examples/no-grid.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/non-continuous.html b/backendpanel/asset/node_modules/morris.js/examples/non-continuous.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/non-date.html b/backendpanel/asset/node_modules/morris.js/examples/non-date.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/quarters.html b/backendpanel/asset/node_modules/morris.js/examples/quarters.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/resize.html b/backendpanel/asset/node_modules/morris.js/examples/resize.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/stacked_bars.html b/backendpanel/asset/node_modules/morris.js/examples/stacked_bars.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/timestamps.html b/backendpanel/asset/node_modules/morris.js/examples/timestamps.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/updating.html b/backendpanel/asset/node_modules/morris.js/examples/updating.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/weeks.html b/backendpanel/asset/node_modules/morris.js/examples/weeks.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/examples/years.html b/backendpanel/asset/node_modules/morris.js/examples/years.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/less/morris.core.less b/backendpanel/asset/node_modules/morris.js/less/morris.core.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/lib/morris.area.coffee b/backendpanel/asset/node_modules/morris.js/lib/morris.area.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/lib/morris.bar.coffee b/backendpanel/asset/node_modules/morris.js/lib/morris.bar.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/lib/morris.coffee b/backendpanel/asset/node_modules/morris.js/lib/morris.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/lib/morris.donut.coffee b/backendpanel/asset/node_modules/morris.js/lib/morris.donut.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/lib/morris.grid.coffee b/backendpanel/asset/node_modules/morris.js/lib/morris.grid.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/lib/morris.hover.coffee b/backendpanel/asset/node_modules/morris.js/lib/morris.hover.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/lib/morris.line.coffee b/backendpanel/asset/node_modules/morris.js/lib/morris.line.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/morris.css b/backendpanel/asset/node_modules/morris.js/morris.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/morris.js b/backendpanel/asset/node_modules/morris.js/morris.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/morris.min.js b/backendpanel/asset/node_modules/morris.js/morris.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/package.json b/backendpanel/asset/node_modules/morris.js/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/area/area_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/area/area_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/bar/bar_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/bar/bar_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/bar/colours.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/bar/colours.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/commas_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/commas_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/donut/donut_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/donut/donut_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/grid/auto_grid_lines_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/grid/auto_grid_lines_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/grid/set_data_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/grid/set_data_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/grid/y_label_format_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/grid/y_label_format_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/hover_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/hover_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/label_series_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/label_series_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/line/line_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/line/line_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/pad_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/pad_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/lib/parse_time_spec.coffee b/backendpanel/asset/node_modules/morris.js/spec/lib/parse_time_spec.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/specs.html b/backendpanel/asset/node_modules/morris.js/spec/specs.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/support/placeholder.coffee b/backendpanel/asset/node_modules/morris.js/spec/support/placeholder.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/viz/examples.js b/backendpanel/asset/node_modules/morris.js/spec/viz/examples.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/viz/exemplary/area0.png b/backendpanel/asset/node_modules/morris.js/spec/viz/exemplary/area0.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/viz/exemplary/bar0.png b/backendpanel/asset/node_modules/morris.js/spec/viz/exemplary/bar0.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/viz/exemplary/line0.png b/backendpanel/asset/node_modules/morris.js/spec/viz/exemplary/line0.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/viz/exemplary/stacked_bar0.png b/backendpanel/asset/node_modules/morris.js/spec/viz/exemplary/stacked_bar0.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/viz/run.sh b/backendpanel/asset/node_modules/morris.js/spec/viz/run.sh
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/viz/test.html b/backendpanel/asset/node_modules/morris.js/spec/viz/test.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/morris.js/spec/viz/visual_specs.js b/backendpanel/asset/node_modules/morris.js/spec/viz/visual_specs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/LICENSE b/backendpanel/asset/node_modules/perfect-scrollbar/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/README.md b/backendpanel/asset/node_modules/perfect-scrollbar/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/dist/css/perfect-scrollbar.css b/backendpanel/asset/node_modules/perfect-scrollbar/dist/css/perfect-scrollbar.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/dist/css/perfect-scrollbar.min.css b/backendpanel/asset/node_modules/perfect-scrollbar/dist/css/perfect-scrollbar.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.js b/backendpanel/asset/node_modules/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.min.js b/backendpanel/asset/node_modules/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/dist/js/perfect-scrollbar.js b/backendpanel/asset/node_modules/perfect-scrollbar/dist/js/perfect-scrollbar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/dist/js/perfect-scrollbar.min.js b/backendpanel/asset/node_modules/perfect-scrollbar/dist/js/perfect-scrollbar.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/index.js b/backendpanel/asset/node_modules/perfect-scrollbar/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/jquery.js b/backendpanel/asset/node_modules/perfect-scrollbar/jquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/package.json b/backendpanel/asset/node_modules/perfect-scrollbar/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/perfect-scrollbar.d.ts b/backendpanel/asset/node_modules/perfect-scrollbar/perfect-scrollbar.d.ts
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/css/main.scss b/backendpanel/asset/node_modules/perfect-scrollbar/src/css/main.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/css/mixins.scss b/backendpanel/asset/node_modules/perfect-scrollbar/src/css/mixins.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/css/themes.scss b/backendpanel/asset/node_modules/perfect-scrollbar/src/css/themes.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/css/variables.scss b/backendpanel/asset/node_modules/perfect-scrollbar/src/css/variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/adaptor/global.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/adaptor/global.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/adaptor/jquery.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/adaptor/jquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/lib/class.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/lib/class.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/lib/dom.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/lib/dom.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/lib/event-manager.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/lib/event-manager.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/lib/guid.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/lib/guid.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/lib/helper.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/lib/helper.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/main.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/main.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/default-setting.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/default-setting.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/destroy.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/destroy.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/click-rail.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/click-rail.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/drag-scrollbar.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/drag-scrollbar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/keyboard.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/keyboard.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/mouse-wheel.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/mouse-wheel.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/native-scroll.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/native-scroll.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/selection.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/selection.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/touch.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/handler/touch.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/initialize.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/initialize.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/instances.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/instances.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/update-geometry.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/update-geometry.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/update-scroll.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/update-scroll.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/update.js b/backendpanel/asset/node_modules/perfect-scrollbar/src/js/plugin/update.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/.eslintignore b/backendpanel/asset/node_modules/popper.js/.eslintignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/.eslintrc.js b/backendpanel/asset/node_modules/popper.js/.eslintrc.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/README.md b/backendpanel/asset/node_modules/popper.js/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/esm/popper-utils.js b/backendpanel/asset/node_modules/popper.js/dist/esm/popper-utils.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/esm/popper-utils.js.map b/backendpanel/asset/node_modules/popper.js/dist/esm/popper-utils.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/esm/popper-utils.min.js b/backendpanel/asset/node_modules/popper.js/dist/esm/popper-utils.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/esm/popper-utils.min.js.br b/backendpanel/asset/node_modules/popper.js/dist/esm/popper-utils.min.js.br
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/esm/popper-utils.min.js.map b/backendpanel/asset/node_modules/popper.js/dist/esm/popper-utils.min.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/esm/popper.js b/backendpanel/asset/node_modules/popper.js/dist/esm/popper.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/esm/popper.js.map b/backendpanel/asset/node_modules/popper.js/dist/esm/popper.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/esm/popper.min.js b/backendpanel/asset/node_modules/popper.js/dist/esm/popper.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/esm/popper.min.js.br b/backendpanel/asset/node_modules/popper.js/dist/esm/popper.min.js.br
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/esm/popper.min.js.map b/backendpanel/asset/node_modules/popper.js/dist/esm/popper.min.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/popper-utils.js b/backendpanel/asset/node_modules/popper.js/dist/popper-utils.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/popper-utils.js.map b/backendpanel/asset/node_modules/popper.js/dist/popper-utils.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/popper-utils.min.js b/backendpanel/asset/node_modules/popper.js/dist/popper-utils.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/popper-utils.min.js.br b/backendpanel/asset/node_modules/popper.js/dist/popper-utils.min.js.br
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/popper-utils.min.js.map b/backendpanel/asset/node_modules/popper.js/dist/popper-utils.min.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/popper.js b/backendpanel/asset/node_modules/popper.js/dist/popper.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/popper.js.map b/backendpanel/asset/node_modules/popper.js/dist/popper.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/popper.min.js b/backendpanel/asset/node_modules/popper.js/dist/popper.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/popper.min.js.br b/backendpanel/asset/node_modules/popper.js/dist/popper.min.js.br
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/popper.min.js.gz b/backendpanel/asset/node_modules/popper.js/dist/popper.min.js.gz
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/popper.min.js.map b/backendpanel/asset/node_modules/popper.js/dist/popper.min.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/umd/popper-utils.js b/backendpanel/asset/node_modules/popper.js/dist/umd/popper-utils.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/umd/popper-utils.js.map b/backendpanel/asset/node_modules/popper.js/dist/umd/popper-utils.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/umd/popper-utils.min.js b/backendpanel/asset/node_modules/popper.js/dist/umd/popper-utils.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/umd/popper-utils.min.js.br b/backendpanel/asset/node_modules/popper.js/dist/umd/popper-utils.min.js.br
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/umd/popper-utils.min.js.map b/backendpanel/asset/node_modules/popper.js/dist/umd/popper-utils.min.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/umd/popper.js b/backendpanel/asset/node_modules/popper.js/dist/umd/popper.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/umd/popper.js.map b/backendpanel/asset/node_modules/popper.js/dist/umd/popper.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/umd/popper.min.js b/backendpanel/asset/node_modules/popper.js/dist/umd/popper.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/umd/popper.min.js.br b/backendpanel/asset/node_modules/popper.js/dist/umd/popper.min.js.br
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/dist/umd/popper.min.js.map b/backendpanel/asset/node_modules/popper.js/dist/umd/popper.min.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/index.d.ts b/backendpanel/asset/node_modules/popper.js/index.d.ts
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/popper.js/package.json b/backendpanel/asset/node_modules/popper.js/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/.npmignore b/backendpanel/asset/node_modules/pwstabs/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/.travis.yml b/backendpanel/asset/node_modules/pwstabs/.travis.yml
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/Gruntfile.js b/backendpanel/asset/node_modules/pwstabs/Gruntfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/LICENSE b/backendpanel/asset/node_modules/pwstabs/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/README.RU.MD b/backendpanel/asset/node_modules/pwstabs/README.RU.MD
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/README.md b/backendpanel/asset/node_modules/pwstabs/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/HELP-US-OUT.txt b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/HELP-US-OUT.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/css/font-awesome.css b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/css/font-awesome.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/css/font-awesome.min.css b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/css/font-awesome.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/FontAwesome.otf b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/FontAwesome.otf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/fontawesome-webfont.eot b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/fontawesome-webfont.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/fontawesome-webfont.svg b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/fontawesome-webfont.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/fontawesome-webfont.ttf b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/fontawesome-webfont.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/fontawesome-webfont.woff b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/fontawesome-webfont.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/fontawesome-webfont.woff2 b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/fonts/fontawesome-webfont.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/animated.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/animated.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/bordered-pulled.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/bordered-pulled.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/core.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/core.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/fixed-width.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/fixed-width.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/font-awesome.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/font-awesome.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/icons.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/icons.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/larger.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/larger.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/list.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/list.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/mixins.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/mixins.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/path.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/path.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/rotated-flipped.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/rotated-flipped.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/stacked.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/stacked.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/variables.less b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/less/variables.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_animated.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_animated.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_bordered-pulled.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_bordered-pulled.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_core.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_core.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_fixed-width.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_fixed-width.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_icons.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_icons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_larger.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_larger.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_list.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_list.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_mixins.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_mixins.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_path.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_path.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_rotated-flipped.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_rotated-flipped.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_stacked.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_stacked.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_variables.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/font-awesome.scss b/backendpanel/asset/node_modules/pwstabs/assets/font-awesome/scss/font-awesome.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/jquery.pwstabs.css b/backendpanel/asset/node_modules/pwstabs/assets/jquery.pwstabs.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/jquery.pwstabs.js b/backendpanel/asset/node_modules/pwstabs/assets/jquery.pwstabs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/jquery.pwstabs.min.css b/backendpanel/asset/node_modules/pwstabs/assets/jquery.pwstabs.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/jquery.pwstabs.min.js b/backendpanel/asset/node_modules/pwstabs/assets/jquery.pwstabs.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/_crosass_init.scss b/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/_crosass_init.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/lib/_borderradius.scss b/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/lib/_borderradius.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/lib/_boxsizing.scss b/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/lib/_boxsizing.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/lib/_functions.scss b/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/lib/_functions.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/lib/_global.scss b/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/lib/_global.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/lib/_transitions.scss b/backendpanel/asset/node_modules/pwstabs/assets/sass/crosass/lib/_transitions.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/assets/sass/jquery.pwstabs.scss b/backendpanel/asset/node_modules/pwstabs/assets/sass/jquery.pwstabs.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/bower.json b/backendpanel/asset/node_modules/pwstabs/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/examples/examples.html b/backendpanel/asset/node_modules/pwstabs/examples/examples.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/examples/mixedexample.jpg b/backendpanel/asset/node_modules/pwstabs/examples/mixedexample.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/examples/responsive.html b/backendpanel/asset/node_modules/pwstabs/examples/responsive.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/examples/styles.css b/backendpanel/asset/node_modules/pwstabs/examples/styles.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/grunt/aliases.yaml b/backendpanel/asset/node_modules/pwstabs/grunt/aliases.yaml
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/grunt/autoprefixer.js b/backendpanel/asset/node_modules/pwstabs/grunt/autoprefixer.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/grunt/sass.js b/backendpanel/asset/node_modules/pwstabs/grunt/sass.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/grunt/watch.js b/backendpanel/asset/node_modules/pwstabs/grunt/watch.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/pwstabs/package.json b/backendpanel/asset/node_modules/pwstabs/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/CHANGELOG.md b/backendpanel/asset/node_modules/quill/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/LICENSE b/backendpanel/asset/node_modules/quill/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/README.md b/backendpanel/asset/node_modules/quill/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/base.styl b/backendpanel/asset/node_modules/quill/assets/base.styl
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/bubble.styl b/backendpanel/asset/node_modules/quill/assets/bubble.styl
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/bubble/toolbar.styl b/backendpanel/asset/node_modules/quill/assets/bubble/toolbar.styl
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/bubble/tooltip.styl b/backendpanel/asset/node_modules/quill/assets/bubble/tooltip.styl
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/core.styl b/backendpanel/asset/node_modules/quill/assets/core.styl
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/favicon.png b/backendpanel/asset/node_modules/quill/assets/favicon.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/align-center.svg b/backendpanel/asset/node_modules/quill/assets/icons/align-center.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/align-justify.svg b/backendpanel/asset/node_modules/quill/assets/icons/align-justify.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/align-left.svg b/backendpanel/asset/node_modules/quill/assets/icons/align-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/align-right.svg b/backendpanel/asset/node_modules/quill/assets/icons/align-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/attachment.svg b/backendpanel/asset/node_modules/quill/assets/icons/attachment.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/audio.svg b/backendpanel/asset/node_modules/quill/assets/icons/audio.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/authorship.svg b/backendpanel/asset/node_modules/quill/assets/icons/authorship.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/background.svg b/backendpanel/asset/node_modules/quill/assets/icons/background.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/blockquote.svg b/backendpanel/asset/node_modules/quill/assets/icons/blockquote.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/bold.svg b/backendpanel/asset/node_modules/quill/assets/icons/bold.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/clean.svg b/backendpanel/asset/node_modules/quill/assets/icons/clean.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/code.svg b/backendpanel/asset/node_modules/quill/assets/icons/code.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/color.svg b/backendpanel/asset/node_modules/quill/assets/icons/color.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/comment.svg b/backendpanel/asset/node_modules/quill/assets/icons/comment.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/direction-ltr.svg b/backendpanel/asset/node_modules/quill/assets/icons/direction-ltr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/direction-rtl.svg b/backendpanel/asset/node_modules/quill/assets/icons/direction-rtl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/dropdown.svg b/backendpanel/asset/node_modules/quill/assets/icons/dropdown.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/emoji.svg b/backendpanel/asset/node_modules/quill/assets/icons/emoji.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/float-center.svg b/backendpanel/asset/node_modules/quill/assets/icons/float-center.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/float-full.svg b/backendpanel/asset/node_modules/quill/assets/icons/float-full.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/float-left.svg b/backendpanel/asset/node_modules/quill/assets/icons/float-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/float-right.svg b/backendpanel/asset/node_modules/quill/assets/icons/float-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/font.svg b/backendpanel/asset/node_modules/quill/assets/icons/font.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/formula.svg b/backendpanel/asset/node_modules/quill/assets/icons/formula.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/hashtag.svg b/backendpanel/asset/node_modules/quill/assets/icons/hashtag.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/header-2.svg b/backendpanel/asset/node_modules/quill/assets/icons/header-2.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/header.svg b/backendpanel/asset/node_modules/quill/assets/icons/header.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/image.svg b/backendpanel/asset/node_modules/quill/assets/icons/image.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/indent.svg b/backendpanel/asset/node_modules/quill/assets/icons/indent.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/italic.svg b/backendpanel/asset/node_modules/quill/assets/icons/italic.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/link.svg b/backendpanel/asset/node_modules/quill/assets/icons/link.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/list-bullet.svg b/backendpanel/asset/node_modules/quill/assets/icons/list-bullet.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/list-check.svg b/backendpanel/asset/node_modules/quill/assets/icons/list-check.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/list-ordered.svg b/backendpanel/asset/node_modules/quill/assets/icons/list-ordered.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/map.svg b/backendpanel/asset/node_modules/quill/assets/icons/map.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/mention.svg b/backendpanel/asset/node_modules/quill/assets/icons/mention.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/outdent.svg b/backendpanel/asset/node_modules/quill/assets/icons/outdent.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/redo.svg b/backendpanel/asset/node_modules/quill/assets/icons/redo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/size-decrease.svg b/backendpanel/asset/node_modules/quill/assets/icons/size-decrease.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/size-increase.svg b/backendpanel/asset/node_modules/quill/assets/icons/size-increase.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/size.svg b/backendpanel/asset/node_modules/quill/assets/icons/size.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/spacing.svg b/backendpanel/asset/node_modules/quill/assets/icons/spacing.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/speech.svg b/backendpanel/asset/node_modules/quill/assets/icons/speech.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/strike.svg b/backendpanel/asset/node_modules/quill/assets/icons/strike.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/subscript.svg b/backendpanel/asset/node_modules/quill/assets/icons/subscript.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/superscript.svg b/backendpanel/asset/node_modules/quill/assets/icons/superscript.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-border-all.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-border-all.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-border-bottom.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-border-bottom.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-border-left.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-border-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-border-none.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-border-none.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-border-outside.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-border-outside.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-border-right.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-border-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-border-top.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-border-top.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-delete-cells.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-delete-cells.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-delete-columns.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-delete-columns.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-delete-rows.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-delete-rows.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-insert-cells.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-insert-cells.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-insert-columns.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-insert-columns.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-insert-rows.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-insert-rows.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-merge-cells.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-merge-cells.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table-unmerge-cells.svg b/backendpanel/asset/node_modules/quill/assets/icons/table-unmerge-cells.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/table.svg b/backendpanel/asset/node_modules/quill/assets/icons/table.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/underline.svg b/backendpanel/asset/node_modules/quill/assets/icons/underline.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/undo.svg b/backendpanel/asset/node_modules/quill/assets/icons/undo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/icons/video.svg b/backendpanel/asset/node_modules/quill/assets/icons/video.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/snow.styl b/backendpanel/asset/node_modules/quill/assets/snow.styl
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/snow/toolbar.styl b/backendpanel/asset/node_modules/quill/assets/snow/toolbar.styl
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/assets/snow/tooltip.styl b/backendpanel/asset/node_modules/quill/assets/snow/tooltip.styl
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/blots/block.js b/backendpanel/asset/node_modules/quill/blots/block.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/blots/break.js b/backendpanel/asset/node_modules/quill/blots/break.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/blots/container.js b/backendpanel/asset/node_modules/quill/blots/container.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/blots/cursor.js b/backendpanel/asset/node_modules/quill/blots/cursor.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/blots/embed.js b/backendpanel/asset/node_modules/quill/blots/embed.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/blots/inline.js b/backendpanel/asset/node_modules/quill/blots/inline.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/blots/scroll.js b/backendpanel/asset/node_modules/quill/blots/scroll.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/blots/text.js b/backendpanel/asset/node_modules/quill/blots/text.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/core.js b/backendpanel/asset/node_modules/quill/core.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/core/editor.js b/backendpanel/asset/node_modules/quill/core/editor.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/core/emitter.js b/backendpanel/asset/node_modules/quill/core/emitter.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/core/logger.js b/backendpanel/asset/node_modules/quill/core/logger.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/core/module.js b/backendpanel/asset/node_modules/quill/core/module.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/core/polyfill.js b/backendpanel/asset/node_modules/quill/core/polyfill.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/core/quill.js b/backendpanel/asset/node_modules/quill/core/quill.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/core/selection.js b/backendpanel/asset/node_modules/quill/core/selection.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/core/theme.js b/backendpanel/asset/node_modules/quill/core/theme.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/dist/quill.bubble.css b/backendpanel/asset/node_modules/quill/dist/quill.bubble.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/dist/quill.core.css b/backendpanel/asset/node_modules/quill/dist/quill.core.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/dist/quill.core.js b/backendpanel/asset/node_modules/quill/dist/quill.core.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/dist/quill.js b/backendpanel/asset/node_modules/quill/dist/quill.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/dist/quill.min.js b/backendpanel/asset/node_modules/quill/dist/quill.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/dist/quill.min.js.map b/backendpanel/asset/node_modules/quill/dist/quill.min.js.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/dist/quill.snow.css b/backendpanel/asset/node_modules/quill/dist/quill.snow.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/align.js b/backendpanel/asset/node_modules/quill/formats/align.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/background.js b/backendpanel/asset/node_modules/quill/formats/background.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/blockquote.js b/backendpanel/asset/node_modules/quill/formats/blockquote.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/bold.js b/backendpanel/asset/node_modules/quill/formats/bold.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/code.js b/backendpanel/asset/node_modules/quill/formats/code.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/color.js b/backendpanel/asset/node_modules/quill/formats/color.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/direction.js b/backendpanel/asset/node_modules/quill/formats/direction.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/font.js b/backendpanel/asset/node_modules/quill/formats/font.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/header.js b/backendpanel/asset/node_modules/quill/formats/header.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/image.js b/backendpanel/asset/node_modules/quill/formats/image.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/indent.js b/backendpanel/asset/node_modules/quill/formats/indent.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/italic.js b/backendpanel/asset/node_modules/quill/formats/italic.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/link.js b/backendpanel/asset/node_modules/quill/formats/link.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/list.js b/backendpanel/asset/node_modules/quill/formats/list.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/mention.js b/backendpanel/asset/node_modules/quill/formats/mention.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/script.js b/backendpanel/asset/node_modules/quill/formats/script.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/size.js b/backendpanel/asset/node_modules/quill/formats/size.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/strike.js b/backendpanel/asset/node_modules/quill/formats/strike.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/underline.js b/backendpanel/asset/node_modules/quill/formats/underline.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/formats/video.js b/backendpanel/asset/node_modules/quill/formats/video.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/modules/clipboard.js b/backendpanel/asset/node_modules/quill/modules/clipboard.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/modules/formula.js b/backendpanel/asset/node_modules/quill/modules/formula.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/modules/history.js b/backendpanel/asset/node_modules/quill/modules/history.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/modules/keyboard.js b/backendpanel/asset/node_modules/quill/modules/keyboard.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/modules/syntax.js b/backendpanel/asset/node_modules/quill/modules/syntax.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/modules/toolbar.js b/backendpanel/asset/node_modules/quill/modules/toolbar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/package.json b/backendpanel/asset/node_modules/quill/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/quill.js b/backendpanel/asset/node_modules/quill/quill.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/themes/base.js b/backendpanel/asset/node_modules/quill/themes/base.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/themes/bubble.js b/backendpanel/asset/node_modules/quill/themes/bubble.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/themes/snow.js b/backendpanel/asset/node_modules/quill/themes/snow.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/ui/color-picker.js b/backendpanel/asset/node_modules/quill/ui/color-picker.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/ui/icon-picker.js b/backendpanel/asset/node_modules/quill/ui/icon-picker.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/ui/icons.js b/backendpanel/asset/node_modules/quill/ui/icons.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/ui/picker.js b/backendpanel/asset/node_modules/quill/ui/picker.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/quill/ui/tooltip.js b/backendpanel/asset/node_modules/quill/ui/tooltip.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/.eslintrc.js b/backendpanel/asset/node_modules/raphael/.eslintrc.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/.npmignore b/backendpanel/asset/node_modules/raphael/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/CONTRIBUTING.md b/backendpanel/asset/node_modules/raphael/CONTRIBUTING.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/Gruntfile.js b/backendpanel/asset/node_modules/raphael/Gruntfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/README.md b/backendpanel/asset/node_modules/raphael/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/bower.json b/backendpanel/asset/node_modules/raphael/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/dev/banner.txt b/backendpanel/asset/node_modules/raphael/dev/banner.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/dev/raphael.amd.js b/backendpanel/asset/node_modules/raphael/dev/raphael.amd.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/dev/raphael.core.js b/backendpanel/asset/node_modules/raphael/dev/raphael.core.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/dev/raphael.svg.js b/backendpanel/asset/node_modules/raphael/dev/raphael.svg.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/dev/raphael.vml.js b/backendpanel/asset/node_modules/raphael/dev/raphael.vml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/dev/raphaelTest.html b/backendpanel/asset/node_modules/raphael/dev/raphaelTest.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/dev/test/index.html b/backendpanel/asset/node_modules/raphael/dev/test/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/dev/test/svg/dom.js b/backendpanel/asset/node_modules/raphael/dev/test/svg/dom.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/dev/test/vml/dom.js b/backendpanel/asset/node_modules/raphael/dev/test/vml/dom.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/history.md b/backendpanel/asset/node_modules/raphael/history.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/license.txt b/backendpanel/asset/node_modules/raphael/license.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/package.json b/backendpanel/asset/node_modules/raphael/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/raphael.js b/backendpanel/asset/node_modules/raphael/raphael.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/raphael.min.js b/backendpanel/asset/node_modules/raphael/raphael.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/raphael.no-deps.js b/backendpanel/asset/node_modules/raphael/raphael.no-deps.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/raphael.no-deps.min.js b/backendpanel/asset/node_modules/raphael/raphael.no-deps.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/webpack.config.js b/backendpanel/asset/node_modules/raphael/webpack.config.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/raphael/yarn.lock b/backendpanel/asset/node_modules/raphael/yarn.lock
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/.npmignore b/backendpanel/asset/node_modules/select2-bootstrap-theme/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/Gruntfile.js b/backendpanel/asset/node_modules/select2-bootstrap-theme/Gruntfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/LICENSE b/backendpanel/asset/node_modules/select2-bootstrap-theme/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/README.md b/backendpanel/asset/node_modules/select2-bootstrap-theme/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/bower.json b/backendpanel/asset/node_modules/select2-bootstrap-theme/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/dist/select2-bootstrap.css b/backendpanel/asset/node_modules/select2-bootstrap-theme/dist/select2-bootstrap.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/dist/select2-bootstrap.min.css b/backendpanel/asset/node_modules/select2-bootstrap-theme/dist/select2-bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/.npmignore b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/4.0.0.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/4.0.0.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/4.0.1.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/4.0.1.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/4.0.2.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/4.0.2.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/4.0.3.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/4.0.3.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_config.yml b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_config.yml
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/footer-links.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/footer-links.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/footer.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/footer.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/head.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/head.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/navbar.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/navbar.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/scripts.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/scripts.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/select2-select.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_includes/select2-select.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_layouts/default.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_layouts/default.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_layouts/minimal.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_layouts/minimal.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_alert.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_alert.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_anchorjs.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_anchorjs.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_buttons.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_buttons.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_common.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_common.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_extends.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_extends.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_footer.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_footer.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_home.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_home.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_jumbotron.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_jumbotron.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_mixins.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_mixins.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_navbar.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_navbar.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_select2-result-repository.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_select2-result-repository.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_variables.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/_sass/_variables.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/css/bootstrap.min.css b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/css/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/css/gh-pages.sass b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/css/gh-pages.sass
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/css/select2-bootstrap.css b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/css/select2-bootstrap.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/favicon.ico b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/favicon.ico
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.eot b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.svg b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.ttf b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.woff b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.woff2 b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/fonts/glyphicons-halflings-regular.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/images/logo.png b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/images/logo.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/index.html b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/js/anchor.min.js b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/js/anchor.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/js/bootstrap.min.js b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/js/bootstrap.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/js/respond.min.js b/backendpanel/asset/node_modules/select2-bootstrap-theme/docs/js/respond.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/package.json b/backendpanel/asset/node_modules/select2-bootstrap-theme/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/src/build.less b/backendpanel/asset/node_modules/select2-bootstrap-theme/src/build.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/src/build.scss b/backendpanel/asset/node_modules/select2-bootstrap-theme/src/build.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/src/select2-bootstrap.less b/backendpanel/asset/node_modules/select2-bootstrap-theme/src/select2-bootstrap.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/src/select2-bootstrap.scss b/backendpanel/asset/node_modules/select2-bootstrap-theme/src/select2-bootstrap.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/tests/less_test.js b/backendpanel/asset/node_modules/select2-bootstrap-theme/tests/less_test.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/tests/scss_test.js b/backendpanel/asset/node_modules/select2-bootstrap-theme/tests/scss_test.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/tests/support/less.patch b/backendpanel/asset/node_modules/select2-bootstrap-theme/tests/support/less.patch
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2-bootstrap-theme/tests/support/scss.patch b/backendpanel/asset/node_modules/select2-bootstrap-theme/tests/support/scss.patch
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/README.md b/backendpanel/asset/node_modules/select2/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/css/select2.css b/backendpanel/asset/node_modules/select2/dist/css/select2.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/css/select2.min.css b/backendpanel/asset/node_modules/select2/dist/css/select2.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/ar.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/ar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/az.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/az.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/bg.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/bg.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/build.txt b/backendpanel/asset/node_modules/select2/dist/js/i18n/build.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/ca.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/ca.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/cs.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/cs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/da.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/da.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/de.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/de.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/el.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/el.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/en.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/en.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/es.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/es.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/et.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/et.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/eu.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/eu.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/fa.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/fa.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/fi.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/fi.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/fr.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/fr.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/gl.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/gl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/he.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/he.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/hi.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/hi.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/hr.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/hr.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/hu.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/hu.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/id.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/id.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/is.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/is.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/it.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/it.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/ja.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/ja.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/km.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/km.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/ko.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/ko.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/lt.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/lt.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/lv.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/lv.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/mk.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/mk.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/ms.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/ms.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/nb.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/nb.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/nl.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/nl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/pl.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/pl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/pt-BR.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/pt-BR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/pt.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/pt.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/ro.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/ro.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/ru.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/ru.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/sk.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/sk.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/sr-Cyrl.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/sr-Cyrl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/sr.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/sr.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/sv.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/sv.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/th.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/th.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/tr.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/tr.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/uk.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/uk.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/vi.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/vi.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/zh-CN.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/zh-CN.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/i18n/zh-TW.js b/backendpanel/asset/node_modules/select2/dist/js/i18n/zh-TW.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/select2.full.js b/backendpanel/asset/node_modules/select2/dist/js/select2.full.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/select2.full.min.js b/backendpanel/asset/node_modules/select2/dist/js/select2.full.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/select2.js b/backendpanel/asset/node_modules/select2/dist/js/select2.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/dist/js/select2.min.js b/backendpanel/asset/node_modules/select2/dist/js/select2.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/package.json b/backendpanel/asset/node_modules/select2/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/banner.end.js b/backendpanel/asset/node_modules/select2/src/js/banner.end.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/banner.start.js b/backendpanel/asset/node_modules/select2/src/js/banner.start.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/jquery.mousewheel.shim.js b/backendpanel/asset/node_modules/select2/src/js/jquery.mousewheel.shim.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/jquery.select2.js b/backendpanel/asset/node_modules/select2/src/js/jquery.select2.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/jquery.shim.js b/backendpanel/asset/node_modules/select2/src/js/jquery.shim.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/compat/containerCss.js b/backendpanel/asset/node_modules/select2/src/js/select2/compat/containerCss.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/compat/dropdownCss.js b/backendpanel/asset/node_modules/select2/src/js/select2/compat/dropdownCss.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/compat/initSelection.js b/backendpanel/asset/node_modules/select2/src/js/select2/compat/initSelection.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/compat/inputData.js b/backendpanel/asset/node_modules/select2/src/js/select2/compat/inputData.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/compat/matcher.js b/backendpanel/asset/node_modules/select2/src/js/select2/compat/matcher.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/compat/query.js b/backendpanel/asset/node_modules/select2/src/js/select2/compat/query.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/compat/utils.js b/backendpanel/asset/node_modules/select2/src/js/select2/compat/utils.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/core.js b/backendpanel/asset/node_modules/select2/src/js/select2/core.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/data/ajax.js b/backendpanel/asset/node_modules/select2/src/js/select2/data/ajax.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/data/array.js b/backendpanel/asset/node_modules/select2/src/js/select2/data/array.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/data/base.js b/backendpanel/asset/node_modules/select2/src/js/select2/data/base.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/data/maximumInputLength.js b/backendpanel/asset/node_modules/select2/src/js/select2/data/maximumInputLength.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/data/maximumSelectionLength.js b/backendpanel/asset/node_modules/select2/src/js/select2/data/maximumSelectionLength.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/data/minimumInputLength.js b/backendpanel/asset/node_modules/select2/src/js/select2/data/minimumInputLength.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/data/select.js b/backendpanel/asset/node_modules/select2/src/js/select2/data/select.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/data/tags.js b/backendpanel/asset/node_modules/select2/src/js/select2/data/tags.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/data/tokenizer.js b/backendpanel/asset/node_modules/select2/src/js/select2/data/tokenizer.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/defaults.js b/backendpanel/asset/node_modules/select2/src/js/select2/defaults.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/diacritics.js b/backendpanel/asset/node_modules/select2/src/js/select2/diacritics.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/dropdown.js b/backendpanel/asset/node_modules/select2/src/js/select2/dropdown.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/attachBody.js b/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/attachBody.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/attachContainer.js b/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/attachContainer.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/closeOnSelect.js b/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/closeOnSelect.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/hidePlaceholder.js b/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/hidePlaceholder.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/infiniteScroll.js b/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/infiniteScroll.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/minimumResultsForSearch.js b/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/minimumResultsForSearch.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/search.js b/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/search.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/selectOnClose.js b/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/selectOnClose.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/stopPropagation.js b/backendpanel/asset/node_modules/select2/src/js/select2/dropdown/stopPropagation.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ar.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/az.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/az.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/bg.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/bg.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ca.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ca.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/cs.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/cs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/da.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/da.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/de.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/de.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/el.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/el.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/en.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/en.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/es.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/es.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/et.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/et.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/eu.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/eu.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/fa.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/fa.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/fi.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/fi.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/fr.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/fr.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/gl.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/gl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/he.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/he.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/hi.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/hi.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/hr.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/hr.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/hu.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/hu.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/id.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/id.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/is.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/is.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/it.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/it.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ja.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ja.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/km.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/km.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ko.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ko.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/lt.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/lt.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/lv.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/lv.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/mk.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/mk.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ms.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ms.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/nb.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/nb.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/nl.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/nl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/pl.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/pl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/pt-BR.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/pt-BR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/pt.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/pt.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ro.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ro.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ru.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/ru.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/sk.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/sk.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/sr-Cyrl.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/sr-Cyrl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/sr.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/sr.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/sv.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/sv.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/th.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/th.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/tr.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/tr.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/uk.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/uk.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/vi.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/vi.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/zh-CN.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/zh-CN.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/i18n/zh-TW.js b/backendpanel/asset/node_modules/select2/src/js/select2/i18n/zh-TW.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/keys.js b/backendpanel/asset/node_modules/select2/src/js/select2/keys.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/options.js b/backendpanel/asset/node_modules/select2/src/js/select2/options.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/results.js b/backendpanel/asset/node_modules/select2/src/js/select2/results.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/selection/allowClear.js b/backendpanel/asset/node_modules/select2/src/js/select2/selection/allowClear.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/selection/base.js b/backendpanel/asset/node_modules/select2/src/js/select2/selection/base.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/selection/clickMask.js b/backendpanel/asset/node_modules/select2/src/js/select2/selection/clickMask.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/selection/eventRelay.js b/backendpanel/asset/node_modules/select2/src/js/select2/selection/eventRelay.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/selection/multiple.js b/backendpanel/asset/node_modules/select2/src/js/select2/selection/multiple.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/selection/placeholder.js b/backendpanel/asset/node_modules/select2/src/js/select2/selection/placeholder.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/selection/search.js b/backendpanel/asset/node_modules/select2/src/js/select2/selection/search.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/selection/single.js b/backendpanel/asset/node_modules/select2/src/js/select2/selection/single.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/selection/stopPropagation.js b/backendpanel/asset/node_modules/select2/src/js/select2/selection/stopPropagation.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/translation.js b/backendpanel/asset/node_modules/select2/src/js/select2/translation.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/select2/utils.js b/backendpanel/asset/node_modules/select2/src/js/select2/utils.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/wrapper.end.js b/backendpanel/asset/node_modules/select2/src/js/wrapper.end.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/js/wrapper.start.js b/backendpanel/asset/node_modules/select2/src/js/wrapper.start.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/_dropdown.scss b/backendpanel/asset/node_modules/select2/src/scss/_dropdown.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/_multiple.scss b/backendpanel/asset/node_modules/select2/src/scss/_multiple.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/_single.scss b/backendpanel/asset/node_modules/select2/src/scss/_single.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/core.scss b/backendpanel/asset/node_modules/select2/src/scss/core.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/mixins/_gradients.scss b/backendpanel/asset/node_modules/select2/src/scss/mixins/_gradients.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/theme/classic/_defaults.scss b/backendpanel/asset/node_modules/select2/src/scss/theme/classic/_defaults.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/theme/classic/_multiple.scss b/backendpanel/asset/node_modules/select2/src/scss/theme/classic/_multiple.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/theme/classic/_single.scss b/backendpanel/asset/node_modules/select2/src/scss/theme/classic/_single.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/theme/classic/layout.scss b/backendpanel/asset/node_modules/select2/src/scss/theme/classic/layout.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/theme/default/_multiple.scss b/backendpanel/asset/node_modules/select2/src/scss/theme/default/_multiple.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/theme/default/_single.scss b/backendpanel/asset/node_modules/select2/src/scss/theme/default/_single.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/select2/src/scss/theme/default/layout.scss b/backendpanel/asset/node_modules/select2/src/scss/theme/default/layout.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/.npmignore b/backendpanel/asset/node_modules/simple-line-icons/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/CODE_OF_CONDUCT.md b/backendpanel/asset/node_modules/simple-line-icons/CODE_OF_CONDUCT.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/CONTRIBUTING.md b/backendpanel/asset/node_modules/simple-line-icons/CONTRIBUTING.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/History.md b/backendpanel/asset/node_modules/simple-line-icons/History.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/LICENSE.md b/backendpanel/asset/node_modules/simple-line-icons/LICENSE.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/README.md b/backendpanel/asset/node_modules/simple-line-icons/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/bower.json b/backendpanel/asset/node_modules/simple-line-icons/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/css/simple-line-icons.css b/backendpanel/asset/node_modules/simple-line-icons/css/simple-line-icons.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/fonts/Simple-Line-Icons.eot b/backendpanel/asset/node_modules/simple-line-icons/fonts/Simple-Line-Icons.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/fonts/Simple-Line-Icons.svg b/backendpanel/asset/node_modules/simple-line-icons/fonts/Simple-Line-Icons.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/fonts/Simple-Line-Icons.ttf b/backendpanel/asset/node_modules/simple-line-icons/fonts/Simple-Line-Icons.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/fonts/Simple-Line-Icons.woff b/backendpanel/asset/node_modules/simple-line-icons/fonts/Simple-Line-Icons.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/fonts/Simple-Line-Icons.woff2 b/backendpanel/asset/node_modules/simple-line-icons/fonts/Simple-Line-Icons.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/less/simple-line-icons.less b/backendpanel/asset/node_modules/simple-line-icons/less/simple-line-icons.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/package.json b/backendpanel/asset/node_modules/simple-line-icons/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simple-line-icons/scss/simple-line-icons.scss b/backendpanel/asset/node_modules/simple-line-icons/scss/simple-line-icons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/.eslintrc b/backendpanel/asset/node_modules/simplemde/.eslintrc
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/.npmignore b/backendpanel/asset/node_modules/simplemde/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/.travis.yml b/backendpanel/asset/node_modules/simplemde/.travis.yml
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/CONTRIBUTING.md b/backendpanel/asset/node_modules/simplemde/CONTRIBUTING.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/LICENSE b/backendpanel/asset/node_modules/simplemde/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/README.md b/backendpanel/asset/node_modules/simplemde/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/bower.json b/backendpanel/asset/node_modules/simplemde/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/debug/simplemde.css b/backendpanel/asset/node_modules/simplemde/debug/simplemde.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/debug/simplemde.debug.js b/backendpanel/asset/node_modules/simplemde/debug/simplemde.debug.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/debug/simplemde.js b/backendpanel/asset/node_modules/simplemde/debug/simplemde.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/dist/simplemde.min.css b/backendpanel/asset/node_modules/simplemde/dist/simplemde.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/dist/simplemde.min.js b/backendpanel/asset/node_modules/simplemde/dist/simplemde.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/gulpfile.js b/backendpanel/asset/node_modules/simplemde/gulpfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/package.json b/backendpanel/asset/node_modules/simplemde/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/src/css/simplemde.css b/backendpanel/asset/node_modules/simplemde/src/css/simplemde.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/src/js/codemirror/tablist.js b/backendpanel/asset/node_modules/simplemde/src/js/codemirror/tablist.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/simplemde/src/js/simplemde.js b/backendpanel/asset/node_modules/simplemde/src/js/simplemde.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/.editorconfig b/backendpanel/asset/node_modules/summernote/.editorconfig
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/.jscsrc b/backendpanel/asset/node_modules/summernote/.jscsrc
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/.npmignore b/backendpanel/asset/node_modules/summernote/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/LICENSE b/backendpanel/asset/node_modules/summernote/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/README.md b/backendpanel/asset/node_modules/summernote/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/bower.json b/backendpanel/asset/node_modules/summernote/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/bs4.html b/backendpanel/asset/node_modules/summernote/bs4.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/composer.json b/backendpanel/asset/node_modules/summernote/composer.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/font/summernote.eot b/backendpanel/asset/node_modules/summernote/dist/font/summernote.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/font/summernote.ttf b/backendpanel/asset/node_modules/summernote/dist/font/summernote.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/font/summernote.woff b/backendpanel/asset/node_modules/summernote/dist/font/summernote.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ar-AR.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ar-AR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ar-AR.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ar-AR.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-bg-BG.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-bg-BG.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-bg-BG.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-bg-BG.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ca-ES.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ca-ES.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ca-ES.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ca-ES.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-cs-CZ.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-cs-CZ.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-cs-CZ.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-cs-CZ.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-da-DK.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-da-DK.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-da-DK.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-da-DK.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-de-DE.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-de-DE.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-de-DE.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-de-DE.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-el-GR.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-el-GR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-el-GR.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-el-GR.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-es-ES.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-es-ES.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-es-ES.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-es-ES.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-es-EU.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-es-EU.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-es-EU.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-es-EU.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fa-IR.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fa-IR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fa-IR.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fa-IR.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fi-FI.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fi-FI.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fi-FI.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fi-FI.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fr-FR.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fr-FR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fr-FR.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-fr-FR.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-gl-ES.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-gl-ES.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-gl-ES.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-gl-ES.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-he-IL.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-he-IL.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-he-IL.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-he-IL.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-hr-HR.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-hr-HR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-hr-HR.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-hr-HR.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-hu-HU.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-hu-HU.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-hu-HU.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-hu-HU.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-id-ID.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-id-ID.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-id-ID.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-id-ID.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-it-IT.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-it-IT.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-it-IT.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-it-IT.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ja-JP.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ja-JP.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ja-JP.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ja-JP.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ko-KR.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ko-KR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ko-KR.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ko-KR.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-lt-LT.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-lt-LT.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-lt-LT.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-lt-LT.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-lt-LV.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-lt-LV.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-lt-LV.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-lt-LV.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-mn-MN.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-mn-MN.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-mn-MN.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-mn-MN.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-nb-NO.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-nb-NO.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-nb-NO.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-nb-NO.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-nl-NL.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-nl-NL.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-nl-NL.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-nl-NL.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pl-PL.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pl-PL.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pl-PL.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pl-PL.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pt-BR.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pt-BR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pt-BR.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pt-BR.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pt-PT.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pt-PT.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pt-PT.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-pt-PT.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ro-RO.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ro-RO.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ro-RO.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ro-RO.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ru-RU.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ru-RU.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ru-RU.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ru-RU.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sk-SK.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sk-SK.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sk-SK.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sk-SK.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sl-SI.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sl-SI.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sl-SI.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sl-SI.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sr-RS-Latin.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sr-RS-Latin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sr-RS-Latin.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sr-RS-Latin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sr-RS.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sr-RS.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sr-RS.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sr-RS.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sv-SE.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sv-SE.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sv-SE.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-sv-SE.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ta-IN.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ta-IN.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ta-IN.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-ta-IN.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-th-TH.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-th-TH.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-th-TH.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-th-TH.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-tr-TR.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-tr-TR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-tr-TR.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-tr-TR.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-uk-UA.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-uk-UA.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-uk-UA.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-uk-UA.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-vi-VN.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-vi-VN.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-vi-VN.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-vi-VN.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-zh-CN.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-zh-CN.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-zh-CN.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-zh-CN.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-zh-TW.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-zh-TW.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/lang/summernote-zh-TW.min.js b/backendpanel/asset/node_modules/summernote/dist/lang/summernote-zh-TW.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/summernote-bs4.css b/backendpanel/asset/node_modules/summernote/dist/summernote-bs4.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/summernote-bs4.js b/backendpanel/asset/node_modules/summernote/dist/summernote-bs4.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/summernote-bs4.min.js b/backendpanel/asset/node_modules/summernote/dist/summernote-bs4.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/summernote-lite.css b/backendpanel/asset/node_modules/summernote/dist/summernote-lite.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/summernote-lite.js b/backendpanel/asset/node_modules/summernote/dist/summernote-lite.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/summernote.css b/backendpanel/asset/node_modules/summernote/dist/summernote.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/summernote.js b/backendpanel/asset/node_modules/summernote/dist/summernote.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/dist/summernote.min.js b/backendpanel/asset/node_modules/summernote/dist/summernote.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/airmode.html b/backendpanel/asset/node_modules/summernote/examples/airmode.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/bs3.html b/backendpanel/asset/node_modules/summernote/examples/bs3.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/codemirror.html b/backendpanel/asset/node_modules/summernote/examples/codemirror.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/external-api.html b/backendpanel/asset/node_modules/summernote/examples/external-api.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/hint-emoji.html b/backendpanel/asset/node_modules/summernote/examples/hint-emoji.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/hint-symbols_mathematical-symbols_Greek-letters.html b/backendpanel/asset/node_modules/summernote/examples/hint-symbols_mathematical-symbols_Greek-letters.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/hint-userdefine.html b/backendpanel/asset/node_modules/summernote/examples/hint-userdefine.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/jquery-custom-event.html b/backendpanel/asset/node_modules/summernote/examples/jquery-custom-event.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/jquery18lt.html b/backendpanel/asset/node_modules/summernote/examples/jquery18lt.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/lang.html b/backendpanel/asset/node_modules/summernote/examples/lang.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/link-blank.html b/backendpanel/asset/node_modules/summernote/examples/link-blank.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/nativestyle.html b/backendpanel/asset/node_modules/summernote/examples/nativestyle.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/ondialog-multitab.html b/backendpanel/asset/node_modules/summernote/examples/ondialog-multitab.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/ondialog.html b/backendpanel/asset/node_modules/summernote/examples/ondialog.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/plugin-hello.html b/backendpanel/asset/node_modules/summernote/examples/plugin-hello.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/rtl.html b/backendpanel/asset/node_modules/summernote/examples/rtl.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/symbols_mathematical-symbols_Greek-letters.json b/backendpanel/asset/node_modules/summernote/examples/symbols_mathematical-symbols_Greek-letters.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/textarea.html b/backendpanel/asset/node_modules/summernote/examples/textarea.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/examples/toolbar-container.html b/backendpanel/asset/node_modules/summernote/examples/toolbar-container.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/ie8.html b/backendpanel/asset/node_modules/summernote/ie8.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/index.html b/backendpanel/asset/node_modules/summernote/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/issue_template.md b/backendpanel/asset/node_modules/summernote/issue_template.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-ar-AR.js b/backendpanel/asset/node_modules/summernote/lang/summernote-ar-AR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-bg-BG.js b/backendpanel/asset/node_modules/summernote/lang/summernote-bg-BG.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-ca-ES.js b/backendpanel/asset/node_modules/summernote/lang/summernote-ca-ES.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-cs-CZ.js b/backendpanel/asset/node_modules/summernote/lang/summernote-cs-CZ.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-da-DK.js b/backendpanel/asset/node_modules/summernote/lang/summernote-da-DK.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-de-DE.js b/backendpanel/asset/node_modules/summernote/lang/summernote-de-DE.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-el-GR.js b/backendpanel/asset/node_modules/summernote/lang/summernote-el-GR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-es-ES.js b/backendpanel/asset/node_modules/summernote/lang/summernote-es-ES.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-es-EU.js b/backendpanel/asset/node_modules/summernote/lang/summernote-es-EU.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-fa-IR.js b/backendpanel/asset/node_modules/summernote/lang/summernote-fa-IR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-fi-FI.js b/backendpanel/asset/node_modules/summernote/lang/summernote-fi-FI.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-fr-FR.js b/backendpanel/asset/node_modules/summernote/lang/summernote-fr-FR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-gl-ES.js b/backendpanel/asset/node_modules/summernote/lang/summernote-gl-ES.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-he-IL.js b/backendpanel/asset/node_modules/summernote/lang/summernote-he-IL.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-hr-HR.js b/backendpanel/asset/node_modules/summernote/lang/summernote-hr-HR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-hu-HU.js b/backendpanel/asset/node_modules/summernote/lang/summernote-hu-HU.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-id-ID.js b/backendpanel/asset/node_modules/summernote/lang/summernote-id-ID.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-it-IT.js b/backendpanel/asset/node_modules/summernote/lang/summernote-it-IT.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-ja-JP.js b/backendpanel/asset/node_modules/summernote/lang/summernote-ja-JP.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-ko-KR.js b/backendpanel/asset/node_modules/summernote/lang/summernote-ko-KR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-lt-LT.js b/backendpanel/asset/node_modules/summernote/lang/summernote-lt-LT.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-lt-LV.js b/backendpanel/asset/node_modules/summernote/lang/summernote-lt-LV.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-mn-MN.js b/backendpanel/asset/node_modules/summernote/lang/summernote-mn-MN.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-nb-NO.js b/backendpanel/asset/node_modules/summernote/lang/summernote-nb-NO.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-nl-NL.js b/backendpanel/asset/node_modules/summernote/lang/summernote-nl-NL.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-pl-PL.js b/backendpanel/asset/node_modules/summernote/lang/summernote-pl-PL.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-pt-BR.js b/backendpanel/asset/node_modules/summernote/lang/summernote-pt-BR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-pt-PT.js b/backendpanel/asset/node_modules/summernote/lang/summernote-pt-PT.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-ro-RO.js b/backendpanel/asset/node_modules/summernote/lang/summernote-ro-RO.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-ru-RU.js b/backendpanel/asset/node_modules/summernote/lang/summernote-ru-RU.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-sk-SK.js b/backendpanel/asset/node_modules/summernote/lang/summernote-sk-SK.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-sl-SI.js b/backendpanel/asset/node_modules/summernote/lang/summernote-sl-SI.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-sr-RS-Latin.js b/backendpanel/asset/node_modules/summernote/lang/summernote-sr-RS-Latin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-sr-RS.js b/backendpanel/asset/node_modules/summernote/lang/summernote-sr-RS.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-sv-SE.js b/backendpanel/asset/node_modules/summernote/lang/summernote-sv-SE.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-ta-IN.js b/backendpanel/asset/node_modules/summernote/lang/summernote-ta-IN.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-th-TH.js b/backendpanel/asset/node_modules/summernote/lang/summernote-th-TH.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-tr-TR.js b/backendpanel/asset/node_modules/summernote/lang/summernote-tr-TR.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-uk-UA.js b/backendpanel/asset/node_modules/summernote/lang/summernote-uk-UA.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-vi-VN.js b/backendpanel/asset/node_modules/summernote/lang/summernote-vi-VN.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-zh-CN.js b/backendpanel/asset/node_modules/summernote/lang/summernote-zh-CN.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lang/summernote-zh-TW.js b/backendpanel/asset/node_modules/summernote/lang/summernote-zh-TW.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/lite.html b/backendpanel/asset/node_modules/summernote/lite.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/meteor/README.md b/backendpanel/asset/node_modules/summernote/meteor/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/meteor/package-standalone.js b/backendpanel/asset/node_modules/summernote/meteor/package-standalone.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/meteor/package.js b/backendpanel/asset/node_modules/summernote/meteor/package.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/meteor/publish.sh b/backendpanel/asset/node_modules/summernote/meteor/publish.sh
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/meteor/runtests.sh b/backendpanel/asset/node_modules/summernote/meteor/runtests.sh
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/meteor/test.js b/backendpanel/asset/node_modules/summernote/meteor/test.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/CHANGELOG.md b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/Gruntfile.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/Gruntfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/LICENSE b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/README.md b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap-theme.css b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap-theme.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap-theme.css.map b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap-theme.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap-theme.min.css b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap-theme.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap-theme.min.css.map b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap-theme.min.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap.css b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap.css.map b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap.min.css b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap.min.css.map b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/css/bootstrap.min.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/js/bootstrap.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/js/bootstrap.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/js/bootstrap.min.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/js/bootstrap.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/js/npm.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/dist/js/npm.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/fonts/glyphicons-halflings-regular.eot b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/fonts/glyphicons-halflings-regular.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/fonts/glyphicons-halflings-regular.svg b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/fonts/glyphicons-halflings-regular.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/fonts/glyphicons-halflings-regular.ttf b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/fonts/glyphicons-halflings-regular.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/fonts/glyphicons-halflings-regular.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/.jshintrc b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/.jshintrc
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/bs-commonjs-generator.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/bs-commonjs-generator.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/bs-glyphicons-data-generator.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/bs-glyphicons-data-generator.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/bs-lessdoc-parser.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/bs-lessdoc-parser.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/bs-raw-files-generator.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/bs-raw-files-generator.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/change-version.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/change-version.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/configBridge.json b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/configBridge.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/npm-shrinkwrap.json b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/npm-shrinkwrap.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/sauce_browsers.yml b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/grunt/sauce_browsers.yml
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/affix.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/affix.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/alert.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/alert.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/button.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/button.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/carousel.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/carousel.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/collapse.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/collapse.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/dropdown.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/dropdown.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/modal.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/modal.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/popover.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/popover.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/scrollspy.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/scrollspy.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/tab.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/tab.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/tooltip.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/tooltip.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/transition.js b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/js/transition.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/alerts.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/alerts.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/badges.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/badges.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/bootstrap.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/bootstrap.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/breadcrumbs.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/breadcrumbs.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/button-groups.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/button-groups.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/buttons.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/buttons.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/carousel.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/carousel.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/close.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/close.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/code.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/code.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/component-animations.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/component-animations.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/dropdowns.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/dropdowns.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/forms.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/forms.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/glyphicons.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/glyphicons.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/grid.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/grid.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/input-groups.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/input-groups.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/jumbotron.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/jumbotron.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/labels.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/labels.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/list-group.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/list-group.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/media.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/media.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/alerts.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/alerts.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/background-variant.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/background-variant.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/border-radius.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/border-radius.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/buttons.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/buttons.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/center-block.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/center-block.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/clearfix.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/clearfix.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/forms.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/forms.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/gradients.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/gradients.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/grid-framework.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/grid-framework.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/grid.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/grid.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/hide-text.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/hide-text.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/image.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/image.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/labels.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/labels.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/list-group.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/list-group.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/nav-divider.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/nav-divider.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/nav-vertical-align.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/nav-vertical-align.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/opacity.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/opacity.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/pagination.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/pagination.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/panels.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/panels.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/progress-bar.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/progress-bar.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/reset-filter.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/reset-filter.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/reset-text.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/reset-text.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/resize.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/resize.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/responsive-visibility.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/responsive-visibility.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/size.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/size.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/tab-focus.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/tab-focus.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/table-row.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/table-row.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/text-emphasis.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/text-emphasis.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/text-overflow.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/text-overflow.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/vendor-prefixes.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/mixins/vendor-prefixes.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/modals.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/modals.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/navbar.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/navbar.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/navs.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/navs.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/normalize.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/normalize.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/pager.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/pager.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/pagination.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/pagination.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/panels.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/panels.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/popovers.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/popovers.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/print.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/print.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/progress-bars.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/progress-bars.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/responsive-embed.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/responsive-embed.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/responsive-utilities.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/responsive-utilities.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/scaffolding.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/scaffolding.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/tables.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/tables.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/theme.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/theme.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/thumbnails.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/thumbnails.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/tooltip.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/tooltip.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/type.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/type.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/utilities.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/utilities.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/variables.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/variables.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/wells.less b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/less/wells.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/package.json b/backendpanel/asset/node_modules/summernote/node_modules/bootstrap/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/nuget-build.cmd b/backendpanel/asset/node_modules/summernote/nuget-build.cmd
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/package.json b/backendpanel/asset/node_modules/summernote/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/plugin/databasic/summernote-ext-databasic.css b/backendpanel/asset/node_modules/summernote/plugin/databasic/summernote-ext-databasic.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/plugin/databasic/summernote-ext-databasic.js b/backendpanel/asset/node_modules/summernote/plugin/databasic/summernote-ext-databasic.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/plugin/hello/summernote-ext-hello.js b/backendpanel/asset/node_modules/summernote/plugin/hello/summernote-ext-hello.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/plugin/specialchars/summernote-ext-specialchars.js b/backendpanel/asset/node_modules/summernote/plugin/specialchars/summernote-ext-specialchars.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/pull_request_template.md b/backendpanel/asset/node_modules/summernote/pull_request_template.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/align-center.svg b/backendpanel/asset/node_modules/summernote/src/icons/align-center.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/align-indent.svg b/backendpanel/asset/node_modules/summernote/src/icons/align-indent.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/align-justify.svg b/backendpanel/asset/node_modules/summernote/src/icons/align-justify.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/align-left.svg b/backendpanel/asset/node_modules/summernote/src/icons/align-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/align-outdent.svg b/backendpanel/asset/node_modules/summernote/src/icons/align-outdent.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/align-right.svg b/backendpanel/asset/node_modules/summernote/src/icons/align-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/align.svg b/backendpanel/asset/node_modules/summernote/src/icons/align.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/arrow-circle-down.svg b/backendpanel/asset/node_modules/summernote/src/icons/arrow-circle-down.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/arrow-circle-left.svg b/backendpanel/asset/node_modules/summernote/src/icons/arrow-circle-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/arrow-circle-right.svg b/backendpanel/asset/node_modules/summernote/src/icons/arrow-circle-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/arrow-circle-up.svg b/backendpanel/asset/node_modules/summernote/src/icons/arrow-circle-up.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/arrows-alt.svg b/backendpanel/asset/node_modules/summernote/src/icons/arrows-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/arrows-h.svg b/backendpanel/asset/node_modules/summernote/src/icons/arrows-h.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/arrows-v.svg b/backendpanel/asset/node_modules/summernote/src/icons/arrows-v.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/bold.svg b/backendpanel/asset/node_modules/summernote/src/icons/bold.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/caret.svg b/backendpanel/asset/node_modules/summernote/src/icons/caret.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/chain-broken.svg b/backendpanel/asset/node_modules/summernote/src/icons/chain-broken.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/circle.svg b/backendpanel/asset/node_modules/summernote/src/icons/circle.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/close.svg b/backendpanel/asset/node_modules/summernote/src/icons/close.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/code.svg b/backendpanel/asset/node_modules/summernote/src/icons/code.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/col-after.svg b/backendpanel/asset/node_modules/summernote/src/icons/col-after.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/col-before.svg b/backendpanel/asset/node_modules/summernote/src/icons/col-before.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/col-remove.svg b/backendpanel/asset/node_modules/summernote/src/icons/col-remove.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/dist/_summernote.scss b/backendpanel/asset/node_modules/summernote/src/icons/dist/_summernote.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/dist/font/summernote.eot b/backendpanel/asset/node_modules/summernote/src/icons/dist/font/summernote.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/dist/font/summernote.ttf b/backendpanel/asset/node_modules/summernote/src/icons/dist/font/summernote.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/dist/font/summernote.woff b/backendpanel/asset/node_modules/summernote/src/icons/dist/font/summernote.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/dist/summernote.html b/backendpanel/asset/node_modules/summernote/src/icons/dist/summernote.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/dist/summernote.less b/backendpanel/asset/node_modules/summernote/src/icons/dist/summernote.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/eraser.svg b/backendpanel/asset/node_modules/summernote/src/icons/eraser.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/font.svg b/backendpanel/asset/node_modules/summernote/src/icons/font.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/frame.svg b/backendpanel/asset/node_modules/summernote/src/icons/frame.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/italic.svg b/backendpanel/asset/node_modules/summernote/src/icons/italic.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/link.svg b/backendpanel/asset/node_modules/summernote/src/icons/link.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/magic.svg b/backendpanel/asset/node_modules/summernote/src/icons/magic.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/menu-check.svg b/backendpanel/asset/node_modules/summernote/src/icons/menu-check.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/minus.svg b/backendpanel/asset/node_modules/summernote/src/icons/minus.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/orderedlist.svg b/backendpanel/asset/node_modules/summernote/src/icons/orderedlist.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/pencil.svg b/backendpanel/asset/node_modules/summernote/src/icons/pencil.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/picture.svg b/backendpanel/asset/node_modules/summernote/src/icons/picture.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/question.svg b/backendpanel/asset/node_modules/summernote/src/icons/question.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/redo.svg b/backendpanel/asset/node_modules/summernote/src/icons/redo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/row-above.svg b/backendpanel/asset/node_modules/summernote/src/icons/row-above.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/row-below.svg b/backendpanel/asset/node_modules/summernote/src/icons/row-below.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/row-remove.svg b/backendpanel/asset/node_modules/summernote/src/icons/row-remove.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/special-character.svg b/backendpanel/asset/node_modules/summernote/src/icons/special-character.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/square.svg b/backendpanel/asset/node_modules/summernote/src/icons/square.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/strikethrough.svg b/backendpanel/asset/node_modules/summernote/src/icons/strikethrough.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/subscript.svg b/backendpanel/asset/node_modules/summernote/src/icons/subscript.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/summernote.svg b/backendpanel/asset/node_modules/summernote/src/icons/summernote.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/superscript.svg b/backendpanel/asset/node_modules/summernote/src/icons/superscript.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/table.svg b/backendpanel/asset/node_modules/summernote/src/icons/table.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/templates/summernote.css b/backendpanel/asset/node_modules/summernote/src/icons/templates/summernote.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/templates/summernote.json b/backendpanel/asset/node_modules/summernote/src/icons/templates/summernote.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/text-height.svg b/backendpanel/asset/node_modules/summernote/src/icons/text-height.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/trash.svg b/backendpanel/asset/node_modules/summernote/src/icons/trash.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/underline.svg b/backendpanel/asset/node_modules/summernote/src/icons/underline.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/undo.svg b/backendpanel/asset/node_modules/summernote/src/icons/undo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/unorderedlist.svg b/backendpanel/asset/node_modules/summernote/src/icons/unorderedlist.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/icons/video.svg b/backendpanel/asset/node_modules/summernote/src/icons/video.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/app.js b/backendpanel/asset/node_modules/summernote/src/js/app.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/Context.js b/backendpanel/asset/node_modules/summernote/src/js/base/Context.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/core/agent.js b/backendpanel/asset/node_modules/summernote/src/js/base/core/agent.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/core/async.js b/backendpanel/asset/node_modules/summernote/src/js/base/core/async.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/core/dom.js b/backendpanel/asset/node_modules/summernote/src/js/base/core/dom.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/core/func.js b/backendpanel/asset/node_modules/summernote/src/js/base/core/func.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/core/key.js b/backendpanel/asset/node_modules/summernote/src/js/base/core/key.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/core/list.js b/backendpanel/asset/node_modules/summernote/src/js/base/core/list.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/core/range.js b/backendpanel/asset/node_modules/summernote/src/js/base/core/range.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/editing/Bullet.js b/backendpanel/asset/node_modules/summernote/src/js/base/editing/Bullet.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/editing/History.js b/backendpanel/asset/node_modules/summernote/src/js/base/editing/History.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/editing/Style.js b/backendpanel/asset/node_modules/summernote/src/js/base/editing/Style.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/editing/Table.js b/backendpanel/asset/node_modules/summernote/src/js/base/editing/Table.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/editing/Typing.js b/backendpanel/asset/node_modules/summernote/src/js/base/editing/Typing.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/AirPopover.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/AirPopover.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/AutoLink.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/AutoLink.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/AutoSync.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/AutoSync.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/Buttons.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/Buttons.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/Clipboard.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/Clipboard.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/Codeview.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/Codeview.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/Dropzone.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/Dropzone.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/Editor.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/Editor.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/Fullscreen.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/Fullscreen.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/Handle.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/Handle.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/HelpDialog.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/HelpDialog.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/HintPopover.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/HintPopover.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/ImageDialog.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/ImageDialog.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/ImagePopover.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/ImagePopover.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/LinkDialog.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/LinkDialog.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/LinkPopover.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/LinkPopover.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/Placeholder.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/Placeholder.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/Statusbar.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/Statusbar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/TablePopover.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/TablePopover.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/Toolbar.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/Toolbar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/module/VideoDialog.js b/backendpanel/asset/node_modules/summernote/src/js/base/module/VideoDialog.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/renderer.js b/backendpanel/asset/node_modules/summernote/src/js/base/renderer.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/base/summernote-en-US.js b/backendpanel/asset/node_modules/summernote/src/js/base/summernote-en-US.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/bs3/settings.js b/backendpanel/asset/node_modules/summernote/src/js/bs3/settings.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/bs3/ui.js b/backendpanel/asset/node_modules/summernote/src/js/bs3/ui.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/bs4/settings.js b/backendpanel/asset/node_modules/summernote/src/js/bs4/settings.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/bs4/ui.js b/backendpanel/asset/node_modules/summernote/src/js/bs4/ui.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/intro.js b/backendpanel/asset/node_modules/summernote/src/js/intro.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/lite/settings.js b/backendpanel/asset/node_modules/summernote/src/js/lite/settings.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/lite/ui.js b/backendpanel/asset/node_modules/summernote/src/js/lite/ui.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/lite/ui/dropdown.js b/backendpanel/asset/node_modules/summernote/src/js/lite/ui/dropdown.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/lite/ui/modal.js b/backendpanel/asset/node_modules/summernote/src/js/lite/ui/modal.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/lite/ui/popover.js b/backendpanel/asset/node_modules/summernote/src/js/lite/ui/popover.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/lite/ui/tooltip.js b/backendpanel/asset/node_modules/summernote/src/js/lite/ui/tooltip.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/outro.js b/backendpanel/asset/node_modules/summernote/src/js/outro.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/js/summernote.js b/backendpanel/asset/node_modules/summernote/src/js/summernote.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/elements.less b/backendpanel/asset/node_modules/summernote/src/less/elements.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/elements.scss b/backendpanel/asset/node_modules/summernote/src/less/elements.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/all.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/all.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/btn-group.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/btn-group.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/buttons.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/buttons.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/common.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/common.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/dropdown.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/dropdown.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/form.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/form.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/mixins.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/mixins.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/mixins/buttons.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/mixins/buttons.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/modal.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/modal.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/popover.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/popover.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/toolbar.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/toolbar.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/tooltip.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/tooltip.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/lite-ui/variables.less b/backendpanel/asset/node_modules/summernote/src/less/lite-ui/variables.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/summernote-bs4.less b/backendpanel/asset/node_modules/summernote/src/less/summernote-bs4.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/summernote-bs4.scss b/backendpanel/asset/node_modules/summernote/src/less/summernote-bs4.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/summernote-lite.less b/backendpanel/asset/node_modules/summernote/src/less/summernote-lite.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/summernote.less b/backendpanel/asset/node_modules/summernote/src/less/summernote.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/src/less/summernote.scss b/backendpanel/asset/node_modules/summernote/src/less/summernote.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/summernote.nuspec b/backendpanel/asset/node_modules/summernote/summernote.nuspec
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/tools/NuGet.Config b/backendpanel/asset/node_modules/summernote/tools/NuGet.Config
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/summernote/tools/nuget.exe b/backendpanel/asset/node_modules/summernote/tools/nuget.exe
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/.jshintrc b/backendpanel/asset/node_modules/typeahead.js/.jshintrc
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/.npmignore b/backendpanel/asset/node_modules/typeahead.js/.npmignore
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/.travis.yml b/backendpanel/asset/node_modules/typeahead.js/.travis.yml
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/CHANGELOG.md b/backendpanel/asset/node_modules/typeahead.js/CHANGELOG.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/CONTRIBUTING.md b/backendpanel/asset/node_modules/typeahead.js/CONTRIBUTING.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/Gruntfile.js b/backendpanel/asset/node_modules/typeahead.js/Gruntfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/LICENSE b/backendpanel/asset/node_modules/typeahead.js/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/README.md b/backendpanel/asset/node_modules/typeahead.js/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/bower.json b/backendpanel/asset/node_modules/typeahead.js/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/composer.json b/backendpanel/asset/node_modules/typeahead.js/composer.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/dist/bloodhound.js b/backendpanel/asset/node_modules/typeahead.js/dist/bloodhound.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/dist/bloodhound.min.js b/backendpanel/asset/node_modules/typeahead.js/dist/bloodhound.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/dist/typeahead.bundle.js b/backendpanel/asset/node_modules/typeahead.js/dist/typeahead.bundle.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/dist/typeahead.bundle.min.js b/backendpanel/asset/node_modules/typeahead.js/dist/typeahead.bundle.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/dist/typeahead.jquery.js b/backendpanel/asset/node_modules/typeahead.js/dist/typeahead.jquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/dist/typeahead.jquery.min.js b/backendpanel/asset/node_modules/typeahead.js/dist/typeahead.jquery.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/doc/bloodhound.md b/backendpanel/asset/node_modules/typeahead.js/doc/bloodhound.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/doc/jquery_typeahead.md b/backendpanel/asset/node_modules/typeahead.js/doc/jquery_typeahead.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/doc/migration/0.10.0.md b/backendpanel/asset/node_modules/typeahead.js/doc/migration/0.10.0.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/karma.conf.js b/backendpanel/asset/node_modules/typeahead.js/karma.conf.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/package.json b/backendpanel/asset/node_modules/typeahead.js/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/bloodhound.js b/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/bloodhound.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/lru_cache.js b/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/lru_cache.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/options_parser.js b/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/options_parser.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/persistent_storage.js b/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/persistent_storage.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/prefetch.js b/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/prefetch.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/remote.js b/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/remote.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/search_index.js b/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/search_index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/tokenizers.js b/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/tokenizers.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/transport.js b/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/transport.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/version.js b/backendpanel/asset/node_modules/typeahead.js/src/bloodhound/version.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/common/utils.js b/backendpanel/asset/node_modules/typeahead.js/src/common/utils.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/typeahead/dataset.js b/backendpanel/asset/node_modules/typeahead.js/src/typeahead/dataset.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/typeahead/default_menu.js b/backendpanel/asset/node_modules/typeahead.js/src/typeahead/default_menu.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/typeahead/event_bus.js b/backendpanel/asset/node_modules/typeahead.js/src/typeahead/event_bus.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/typeahead/event_emitter.js b/backendpanel/asset/node_modules/typeahead.js/src/typeahead/event_emitter.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/typeahead/highlight.js b/backendpanel/asset/node_modules/typeahead.js/src/typeahead/highlight.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/typeahead/input.js b/backendpanel/asset/node_modules/typeahead.js/src/typeahead/input.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/typeahead/menu.js b/backendpanel/asset/node_modules/typeahead.js/src/typeahead/menu.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/typeahead/plugin.js b/backendpanel/asset/node_modules/typeahead.js/src/typeahead/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/typeahead/typeahead.js b/backendpanel/asset/node_modules/typeahead.js/src/typeahead/typeahead.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/src/typeahead/www.js b/backendpanel/asset/node_modules/typeahead.js/src/typeahead/www.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/bloodhound_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/bloodhound_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/lru_cache_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/lru_cache_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/options_parser_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/options_parser_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/persistent_storage_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/persistent_storage_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/prefetch_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/prefetch_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/remote_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/remote_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/search_index_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/search_index_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/tokenizers_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/tokenizers_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/transport_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/bloodhound/transport_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/ci b/backendpanel/asset/node_modules/typeahead.js/test/ci
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/fixtures/ajax_responses.js b/backendpanel/asset/node_modules/typeahead.js/test/fixtures/ajax_responses.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/fixtures/data.js b/backendpanel/asset/node_modules/typeahead.js/test/fixtures/data.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/fixtures/html.js b/backendpanel/asset/node_modules/typeahead.js/test/fixtures/html.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/helpers/typeahead_mocks.js b/backendpanel/asset/node_modules/typeahead.js/test/helpers/typeahead_mocks.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/integration/test.html b/backendpanel/asset/node_modules/typeahead.js/test/integration/test.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/integration/test.js b/backendpanel/asset/node_modules/typeahead.js/test/integration/test.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/playground.html b/backendpanel/asset/node_modules/typeahead.js/test/playground.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/typeahead/dataset_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/typeahead/dataset_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/typeahead/default_results_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/typeahead/default_results_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/typeahead/event_bus_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/typeahead/event_bus_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/typeahead/event_emitter_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/typeahead/event_emitter_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/typeahead/highlight_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/typeahead/highlight_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/typeahead/input_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/typeahead/input_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/typeahead/plugin_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/typeahead/plugin_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/typeahead/results_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/typeahead/results_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/test/typeahead/typeahead_spec.js b/backendpanel/asset/node_modules/typeahead.js/test/typeahead/typeahead_spec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/node_modules/typeahead.js/typeahead.js.jquery.json b/backendpanel/asset/node_modules/typeahead.js/typeahead.js.jquery.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_demo.scss b/backendpanel/asset/scss/_demo.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_fonts.scss b/backendpanel/asset/scss/_fonts.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_footer.scss b/backendpanel/asset/scss/_footer.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_functions.scss b/backendpanel/asset/scss/_functions.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_layouts.scss b/backendpanel/asset/scss/_layouts.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_misc.scss b/backendpanel/asset/scss/_misc.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_navbar.scss b/backendpanel/asset/scss/_navbar.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_reset.scss b/backendpanel/asset/scss/_reset.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_sidebar.scss b/backendpanel/asset/scss/_sidebar.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_typography.scss b/backendpanel/asset/scss/_typography.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_utilities.scss b/backendpanel/asset/scss/_utilities.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_variables.scss b/backendpanel/asset/scss/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/_widget-grid.scss b/backendpanel/asset/scss/_widget-grid.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_accordions.scss b/backendpanel/asset/scss/components/_accordions.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_badges.scss b/backendpanel/asset/scss/components/_badges.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_bootstrap-alerts.scss b/backendpanel/asset/scss/components/_bootstrap-alerts.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_bootstrap-progress.scss b/backendpanel/asset/scss/components/_bootstrap-progress.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_breadcrumbs.scss b/backendpanel/asset/scss/components/_breadcrumbs.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_buttons.scss b/backendpanel/asset/scss/components/_buttons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_cards.scss b/backendpanel/asset/scss/components/_cards.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_checkbox-radio.scss b/backendpanel/asset/scss/components/_checkbox-radio.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_dropdown.scss b/backendpanel/asset/scss/components/_dropdown.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_forms.scss b/backendpanel/asset/scss/components/_forms.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_google-maps.scss b/backendpanel/asset/scss/components/_google-maps.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_icons.scss b/backendpanel/asset/scss/components/_icons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_lists.scss b/backendpanel/asset/scss/components/_lists.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_modals.scss b/backendpanel/asset/scss/components/_modals.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_pagination.scss b/backendpanel/asset/scss/components/_pagination.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_popovers.scss b/backendpanel/asset/scss/components/_popovers.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_portfolio.scss b/backendpanel/asset/scss/components/_portfolio.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_preview.scss b/backendpanel/asset/scss/components/_preview.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_pricing-table.scss b/backendpanel/asset/scss/components/_pricing-table.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_settings-panel.scss b/backendpanel/asset/scss/components/_settings-panel.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_tables.scss b/backendpanel/asset/scss/components/_tables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_tabs.scss b/backendpanel/asset/scss/components/_tabs.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_timeline.scss b/backendpanel/asset/scss/components/_timeline.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_todo-list.scss b/backendpanel/asset/scss/components/_todo-list.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_tooltips.scss b/backendpanel/asset/scss/components/_tooltips.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/_user-profile.scss b/backendpanel/asset/scss/components/_user-profile.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_bar-loader.scss b/backendpanel/asset/scss/components/loaders/_bar-loader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_circle-loader.scss b/backendpanel/asset/scss/components/loaders/_circle-loader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_colored-balls.scss b/backendpanel/asset/scss/components/loaders/_colored-balls.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_dot-opacity-loader.scss b/backendpanel/asset/scss/components/loaders/_dot-opacity-loader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_flip-square-loader.scss b/backendpanel/asset/scss/components/loaders/_flip-square-loader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_glowing-ball.scss b/backendpanel/asset/scss/components/loaders/_glowing-ball.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_jumping-dots-loader.scss b/backendpanel/asset/scss/components/loaders/_jumping-dots-loader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_loaders.scss b/backendpanel/asset/scss/components/loaders/_loaders.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_moving-square-loader.scss b/backendpanel/asset/scss/components/loaders/_moving-square-loader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_pixel-loader.scss b/backendpanel/asset/scss/components/loaders/_pixel-loader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_square-box.scss b/backendpanel/asset/scss/components/loaders/_square-box.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_square-path-loader.scss b/backendpanel/asset/scss/components/loaders/_square-path-loader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/loaders/_variables.scss b/backendpanel/asset/scss/components/loaders/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/mail-components/_mail-list-container.scss b/backendpanel/asset/scss/components/mail-components/_mail-list-container.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/mail-components/_mail-sidebar.scss b/backendpanel/asset/scss/components/mail-components/_mail-sidebar.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/mail-components/_messagecontent.scss b/backendpanel/asset/scss/components/mail-components/_messagecontent.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_ace.scss b/backendpanel/asset/scss/components/plugin-overrides/_ace.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_avgrund.scss b/backendpanel/asset/scss/components/plugin-overrides/_avgrund.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_bootstrap-tour.scss b/backendpanel/asset/scss/components/plugin-overrides/_bootstrap-tour.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_chartist.scss b/backendpanel/asset/scss/components/plugin-overrides/_chartist.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_chartjs.scss b/backendpanel/asset/scss/components/plugin-overrides/_chartjs.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_clockpicker.scss b/backendpanel/asset/scss/components/plugin-overrides/_clockpicker.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_codemirror.scss b/backendpanel/asset/scss/components/plugin-overrides/_codemirror.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_colcade.scss b/backendpanel/asset/scss/components/plugin-overrides/_colcade.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_colorpicker.scss b/backendpanel/asset/scss/components/plugin-overrides/_colorpicker.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_context-menu.scss b/backendpanel/asset/scss/components/plugin-overrides/_context-menu.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_data-tables.scss b/backendpanel/asset/scss/components/plugin-overrides/_data-tables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_datepicker.scss b/backendpanel/asset/scss/components/plugin-overrides/_datepicker.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_dropify.scss b/backendpanel/asset/scss/components/plugin-overrides/_dropify.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_dropzone.scss b/backendpanel/asset/scss/components/plugin-overrides/_dropzone.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_flot-chart.scss b/backendpanel/asset/scss/components/plugin-overrides/_flot-chart.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_full-calendar.scss b/backendpanel/asset/scss/components/plugin-overrides/_full-calendar.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_google-charts.scss b/backendpanel/asset/scss/components/plugin-overrides/_google-charts.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_icheck.scss b/backendpanel/asset/scss/components/plugin-overrides/_icheck.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_jquery-file-upload.scss b/backendpanel/asset/scss/components/plugin-overrides/_jquery-file-upload.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_js-grid.scss b/backendpanel/asset/scss/components/plugin-overrides/_js-grid.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_jvectormap.scss b/backendpanel/asset/scss/components/plugin-overrides/_jvectormap.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_light-gallery.scss b/backendpanel/asset/scss/components/plugin-overrides/_light-gallery.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_listify.scss b/backendpanel/asset/scss/components/plugin-overrides/_listify.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_no-ui-slider.scss b/backendpanel/asset/scss/components/plugin-overrides/_no-ui-slider.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_owl-carousel.scss b/backendpanel/asset/scss/components/plugin-overrides/_owl-carousel.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_progressbar-js.scss b/backendpanel/asset/scss/components/plugin-overrides/_progressbar-js.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_pws-tabs.scss b/backendpanel/asset/scss/components/plugin-overrides/_pws-tabs.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_quill.scss b/backendpanel/asset/scss/components/plugin-overrides/_quill.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_rating.scss b/backendpanel/asset/scss/components/plugin-overrides/_rating.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_select2.scss b/backendpanel/asset/scss/components/plugin-overrides/_select2.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_summernote.scss b/backendpanel/asset/scss/components/plugin-overrides/_summernote.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_sweet-alert.scss b/backendpanel/asset/scss/components/plugin-overrides/_sweet-alert.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_switchery.scss b/backendpanel/asset/scss/components/plugin-overrides/_switchery.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_tags.scss b/backendpanel/asset/scss/components/plugin-overrides/_tags.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_tinymce.scss b/backendpanel/asset/scss/components/plugin-overrides/_tinymce.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_toast.scss b/backendpanel/asset/scss/components/plugin-overrides/_toast.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_typeahead.scss b/backendpanel/asset/scss/components/plugin-overrides/_typeahead.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_wizard.scss b/backendpanel/asset/scss/components/plugin-overrides/_wizard.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_wysieditor.scss b/backendpanel/asset/scss/components/plugin-overrides/_wysieditor.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/components/plugin-overrides/_x-editable.scss b/backendpanel/asset/scss/components/plugin-overrides/_x-editable.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/dashboard.scss b/backendpanel/asset/scss/dashboard.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/landing-screens/_auth.scss b/backendpanel/asset/scss/landing-screens/_auth.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/landing-screens/_error.scss b/backendpanel/asset/scss/landing-screens/_error.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/landing-screens/_landing.scss b/backendpanel/asset/scss/landing-screens/_landing.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/landing-screens/_lock-screen.scss b/backendpanel/asset/scss/landing-screens/_lock-screen.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/mixins/_animation.scss b/backendpanel/asset/scss/mixins/_animation.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/mixins/_background.scss b/backendpanel/asset/scss/mixins/_background.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/mixins/_blockqoute.scss b/backendpanel/asset/scss/mixins/_blockqoute.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/mixins/_cards.scss b/backendpanel/asset/scss/mixins/_cards.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/mixins/_color-functions.scss b/backendpanel/asset/scss/mixins/_color-functions.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/mixins/_misc.scss b/backendpanel/asset/scss/mixins/_misc.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/mixins/_popovers.scss b/backendpanel/asset/scss/mixins/_popovers.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/mixins/_tooltips.scss b/backendpanel/asset/scss/mixins/_tooltips.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/scss/style.scss b/backendpanel/asset/scss/style.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ace.js b/backendpanel/asset/vendors/ace-builds/src-min/ace.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-beautify.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-beautify.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-elastic_tabstops_lite.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-elastic_tabstops_lite.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-emmet.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-emmet.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-error_marker.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-error_marker.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-keybinding_menu.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-keybinding_menu.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-language_tools.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-language_tools.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-linking.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-linking.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-modelist.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-modelist.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-options.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-options.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-searchbox.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-searchbox.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-settings_menu.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-settings_menu.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-spellcheck.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-spellcheck.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-split.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-split.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-static_highlight.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-static_highlight.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-statusbar.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-statusbar.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-textarea.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-textarea.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-themelist.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-themelist.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/ext-whitespace.js b/backendpanel/asset/vendors/ace-builds/src-min/ext-whitespace.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/keybinding-emacs.js b/backendpanel/asset/vendors/ace-builds/src-min/keybinding-emacs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/keybinding-vim.js b/backendpanel/asset/vendors/ace-builds/src-min/keybinding-vim.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-abap.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-abap.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-abc.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-abc.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-actionscript.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-actionscript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-ada.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-ada.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-apache_conf.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-apache_conf.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-applescript.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-applescript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-asciidoc.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-asciidoc.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-asl.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-asl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-assembly_x86.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-assembly_x86.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-autohotkey.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-autohotkey.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-batchfile.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-batchfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-bro.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-bro.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-c9search.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-c9search.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-c_cpp.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-c_cpp.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-cirru.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-cirru.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-clojure.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-clojure.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-cobol.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-cobol.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-coffee.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-coffee.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-coldfusion.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-coldfusion.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-csharp.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-csharp.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-csound_document.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-csound_document.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-csound_orchestra.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-csound_orchestra.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-csound_score.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-csound_score.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-csp.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-csp.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-css.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-css.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-curly.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-curly.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-d.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-d.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-dart.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-dart.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-diff.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-diff.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-django.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-django.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-dockerfile.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-dockerfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-dot.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-dot.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-drools.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-drools.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-edifact.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-edifact.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-eiffel.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-eiffel.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-ejs.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-ejs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-elixir.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-elixir.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-elm.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-elm.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-erlang.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-erlang.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-forth.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-forth.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-fortran.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-fortran.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-ftl.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-ftl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-gcode.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-gcode.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-gherkin.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-gherkin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-gitignore.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-gitignore.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-glsl.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-glsl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-gobstones.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-gobstones.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-golang.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-golang.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-graphqlschema.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-graphqlschema.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-groovy.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-groovy.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-haml.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-haml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-handlebars.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-handlebars.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-haskell.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-haskell.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-haskell_cabal.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-haskell_cabal.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-haxe.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-haxe.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-hjson.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-hjson.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-html.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-html.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-html_elixir.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-html_elixir.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-html_ruby.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-html_ruby.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-ini.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-ini.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-io.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-io.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-jack.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-jack.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-jade.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-jade.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-java.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-java.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-javascript.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-javascript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-json.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-json.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-jsoniq.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-jsoniq.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-jsp.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-jsp.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-jssm.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-jssm.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-jsx.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-jsx.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-julia.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-julia.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-kotlin.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-kotlin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-latex.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-latex.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-less.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-less.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-liquid.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-liquid.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-lisp.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-lisp.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-livescript.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-livescript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-logiql.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-logiql.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-lsl.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-lsl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-lua.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-lua.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-luapage.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-luapage.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-lucene.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-lucene.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-makefile.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-makefile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-markdown.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-markdown.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-mask.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-mask.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-matlab.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-matlab.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-maze.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-maze.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-mel.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-mel.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-mixal.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-mixal.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-mushcode.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-mushcode.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-mysql.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-mysql.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-nix.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-nix.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-nsis.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-nsis.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-objectivec.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-objectivec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-ocaml.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-ocaml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-pascal.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-pascal.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-perl.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-perl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-pgsql.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-pgsql.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-php.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-php.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-pig.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-pig.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-plain_text.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-plain_text.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-powershell.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-powershell.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-praat.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-praat.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-prolog.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-prolog.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-properties.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-properties.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-protobuf.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-protobuf.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-python.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-python.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-r.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-r.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-razor.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-razor.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-rdoc.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-rdoc.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-red.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-red.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-redshift.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-redshift.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-rhtml.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-rhtml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-rst.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-rst.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-ruby.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-ruby.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-rust.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-rust.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-sass.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-sass.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-scad.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-scad.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-scala.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-scala.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-scheme.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-scheme.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-scss.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-scss.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-sh.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-sh.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-sjs.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-sjs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-smarty.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-smarty.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-snippets.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-snippets.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-soy_template.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-soy_template.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-space.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-space.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-sparql.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-sparql.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-sql.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-sql.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-sqlserver.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-sqlserver.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-stylus.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-stylus.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-svg.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-svg.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-swift.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-swift.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-tcl.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-tcl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-tex.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-tex.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-text.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-text.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-textile.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-textile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-toml.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-toml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-tsx.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-tsx.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-turtle.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-turtle.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-twig.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-twig.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-typescript.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-typescript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-vala.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-vala.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-vbscript.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-vbscript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-velocity.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-velocity.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-verilog.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-verilog.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-vhdl.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-vhdl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-wollok.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-wollok.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-xml.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-xml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-xquery.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-xquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/mode-yaml.js b/backendpanel/asset/vendors/ace-builds/src-min/mode-yaml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/abap.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/abap.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/abc.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/abc.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/actionscript.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/actionscript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/ada.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/ada.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/apache_conf.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/apache_conf.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/applescript.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/applescript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/asciidoc.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/asciidoc.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/asl.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/asl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/assembly_x86.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/assembly_x86.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/autohotkey.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/autohotkey.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/batchfile.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/batchfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/bro.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/bro.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/c9search.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/c9search.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/c_cpp.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/c_cpp.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/cirru.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/cirru.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/clojure.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/clojure.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/cobol.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/cobol.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/coffee.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/coffee.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/coldfusion.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/coldfusion.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/csharp.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/csharp.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/csound_document.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/csound_document.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/csound_orchestra.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/csound_orchestra.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/csound_score.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/csound_score.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/csp.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/csp.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/css.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/css.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/curly.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/curly.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/d.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/d.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/dart.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/dart.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/diff.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/diff.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/django.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/django.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/dockerfile.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/dockerfile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/dot.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/dot.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/drools.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/drools.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/edifact.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/edifact.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/eiffel.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/eiffel.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/ejs.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/ejs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/elixir.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/elixir.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/elm.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/elm.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/erlang.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/erlang.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/forth.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/forth.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/fortran.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/fortran.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/ftl.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/ftl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/gcode.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/gcode.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/gherkin.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/gherkin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/gitignore.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/gitignore.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/glsl.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/glsl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/gobstones.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/gobstones.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/golang.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/golang.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/graphqlschema.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/graphqlschema.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/groovy.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/groovy.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/haml.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/haml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/handlebars.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/handlebars.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/haskell.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/haskell.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/haskell_cabal.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/haskell_cabal.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/haxe.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/haxe.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/hjson.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/hjson.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/html.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/html.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/html_elixir.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/html_elixir.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/html_ruby.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/html_ruby.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/ini.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/ini.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/io.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/io.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/jack.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/jack.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/jade.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/jade.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/java.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/java.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/javascript.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/javascript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/json.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/json.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/jsoniq.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/jsoniq.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/jsp.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/jsp.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/jssm.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/jssm.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/jsx.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/jsx.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/julia.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/julia.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/kotlin.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/kotlin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/latex.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/latex.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/less.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/less.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/liquid.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/liquid.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/lisp.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/lisp.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/livescript.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/livescript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/logiql.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/logiql.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/lsl.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/lsl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/lua.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/lua.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/luapage.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/luapage.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/lucene.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/lucene.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/makefile.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/makefile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/markdown.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/markdown.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/mask.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/mask.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/matlab.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/matlab.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/maze.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/maze.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/mel.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/mel.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/mixal.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/mixal.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/mushcode.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/mushcode.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/mysql.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/mysql.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/nix.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/nix.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/nsis.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/nsis.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/objectivec.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/objectivec.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/ocaml.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/ocaml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/pascal.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/pascal.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/perl.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/perl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/pgsql.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/pgsql.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/php.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/php.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/pig.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/pig.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/plain_text.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/plain_text.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/powershell.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/powershell.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/praat.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/praat.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/prolog.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/prolog.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/properties.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/properties.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/protobuf.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/protobuf.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/python.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/python.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/r.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/r.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/razor.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/razor.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/rdoc.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/rdoc.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/red.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/red.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/redshift.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/redshift.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/rhtml.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/rhtml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/rst.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/rst.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/ruby.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/ruby.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/rust.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/rust.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/sass.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/sass.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/scad.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/scad.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/scala.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/scala.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/scheme.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/scheme.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/scss.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/scss.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/sh.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/sh.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/sjs.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/sjs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/smarty.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/smarty.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/snippets.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/snippets.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/soy_template.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/soy_template.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/space.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/space.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/sparql.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/sparql.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/sql.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/sql.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/sqlserver.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/sqlserver.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/stylus.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/stylus.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/svg.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/svg.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/swift.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/swift.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/tcl.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/tcl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/tex.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/tex.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/text.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/text.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/textile.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/textile.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/toml.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/toml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/tsx.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/tsx.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/turtle.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/turtle.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/twig.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/twig.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/typescript.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/typescript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/vala.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/vala.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/vbscript.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/vbscript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/velocity.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/velocity.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/verilog.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/verilog.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/vhdl.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/vhdl.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/wollok.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/wollok.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/xml.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/xml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/xquery.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/xquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/snippets/yaml.js b/backendpanel/asset/vendors/ace-builds/src-min/snippets/yaml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-ambiance.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-ambiance.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-chaos.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-chaos.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-chrome.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-chrome.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-clouds.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-clouds.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-clouds_midnight.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-clouds_midnight.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-cobalt.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-cobalt.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-crimson_editor.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-crimson_editor.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-dawn.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-dawn.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-dracula.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-dracula.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-dreamweaver.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-dreamweaver.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-eclipse.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-eclipse.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-github.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-github.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-gob.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-gob.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-gruvbox.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-gruvbox.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-idle_fingers.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-idle_fingers.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-iplastic.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-iplastic.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-katzenmilch.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-katzenmilch.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-kr_theme.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-kr_theme.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-kuroir.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-kuroir.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-merbivore.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-merbivore.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-merbivore_soft.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-merbivore_soft.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-mono_industrial.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-mono_industrial.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-monokai.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-monokai.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-pastel_on_dark.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-pastel_on_dark.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-solarized_dark.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-solarized_dark.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-solarized_light.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-solarized_light.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-sqlserver.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-sqlserver.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-terminal.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-terminal.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-textmate.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-textmate.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-tomorrow.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-tomorrow.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-tomorrow_night.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-tomorrow_night.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-tomorrow_night_blue.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-tomorrow_night_blue.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-tomorrow_night_bright.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-tomorrow_night_bright.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-tomorrow_night_eighties.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-tomorrow_night_eighties.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-twilight.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-twilight.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-vibrant_ink.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-vibrant_ink.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/theme-xcode.js b/backendpanel/asset/vendors/ace-builds/src-min/theme-xcode.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/worker-coffee.js b/backendpanel/asset/vendors/ace-builds/src-min/worker-coffee.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/worker-css.js b/backendpanel/asset/vendors/ace-builds/src-min/worker-css.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/worker-html.js b/backendpanel/asset/vendors/ace-builds/src-min/worker-html.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/worker-javascript.js b/backendpanel/asset/vendors/ace-builds/src-min/worker-javascript.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/worker-json.js b/backendpanel/asset/vendors/ace-builds/src-min/worker-json.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/worker-lua.js b/backendpanel/asset/vendors/ace-builds/src-min/worker-lua.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/worker-php.js b/backendpanel/asset/vendors/ace-builds/src-min/worker-php.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/worker-xml.js b/backendpanel/asset/vendors/ace-builds/src-min/worker-xml.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/ace-builds/src-min/worker-xquery.js b/backendpanel/asset/vendors/ace-builds/src-min/worker-xquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/css/vendor.bundle.addons.css b/backendpanel/asset/vendors/css/vendor.bundle.addons.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/css/vendor.bundle.base.css b/backendpanel/asset/vendors/css/vendor.bundle.base.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/all.css b/backendpanel/asset/vendors/icheck/skins/all.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/_all.css b/backendpanel/asset/vendors/icheck/skins/flat/_all.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/aero.css b/backendpanel/asset/vendors/icheck/skins/flat/aero.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/aero.png b/backendpanel/asset/vendors/icheck/skins/flat/aero.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/aero@2x.png b/backendpanel/asset/vendors/icheck/skins/flat/aero@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/blue.css b/backendpanel/asset/vendors/icheck/skins/flat/blue.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/blue.png b/backendpanel/asset/vendors/icheck/skins/flat/blue.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/blue@2x.png b/backendpanel/asset/vendors/icheck/skins/flat/blue@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/flat.css b/backendpanel/asset/vendors/icheck/skins/flat/flat.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/flat.png b/backendpanel/asset/vendors/icheck/skins/flat/flat.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/flat@2x.png b/backendpanel/asset/vendors/icheck/skins/flat/flat@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/green.css b/backendpanel/asset/vendors/icheck/skins/flat/green.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/green.png b/backendpanel/asset/vendors/icheck/skins/flat/green.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/green@2x.png b/backendpanel/asset/vendors/icheck/skins/flat/green@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/grey.css b/backendpanel/asset/vendors/icheck/skins/flat/grey.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/grey.png b/backendpanel/asset/vendors/icheck/skins/flat/grey.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/grey@2x.png b/backendpanel/asset/vendors/icheck/skins/flat/grey@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/orange.css b/backendpanel/asset/vendors/icheck/skins/flat/orange.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/orange.png b/backendpanel/asset/vendors/icheck/skins/flat/orange.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/orange@2x.png b/backendpanel/asset/vendors/icheck/skins/flat/orange@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/pink.css b/backendpanel/asset/vendors/icheck/skins/flat/pink.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/pink.png b/backendpanel/asset/vendors/icheck/skins/flat/pink.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/pink@2x.png b/backendpanel/asset/vendors/icheck/skins/flat/pink@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/purple.css b/backendpanel/asset/vendors/icheck/skins/flat/purple.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/purple.png b/backendpanel/asset/vendors/icheck/skins/flat/purple.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/purple@2x.png b/backendpanel/asset/vendors/icheck/skins/flat/purple@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/red.css b/backendpanel/asset/vendors/icheck/skins/flat/red.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/red.png b/backendpanel/asset/vendors/icheck/skins/flat/red.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/red@2x.png b/backendpanel/asset/vendors/icheck/skins/flat/red@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/yellow.css b/backendpanel/asset/vendors/icheck/skins/flat/yellow.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/yellow.png b/backendpanel/asset/vendors/icheck/skins/flat/yellow.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/flat/yellow@2x.png b/backendpanel/asset/vendors/icheck/skins/flat/yellow@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/futurico/futurico.css b/backendpanel/asset/vendors/icheck/skins/futurico/futurico.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/futurico/futurico.png b/backendpanel/asset/vendors/icheck/skins/futurico/futurico.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/futurico/futurico@2x.png b/backendpanel/asset/vendors/icheck/skins/futurico/futurico@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/_all.css b/backendpanel/asset/vendors/icheck/skins/line/_all.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/aero.css b/backendpanel/asset/vendors/icheck/skins/line/aero.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/blue.css b/backendpanel/asset/vendors/icheck/skins/line/blue.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/green.css b/backendpanel/asset/vendors/icheck/skins/line/green.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/grey.css b/backendpanel/asset/vendors/icheck/skins/line/grey.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/line.css b/backendpanel/asset/vendors/icheck/skins/line/line.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/line.png b/backendpanel/asset/vendors/icheck/skins/line/line.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/line@2x.png b/backendpanel/asset/vendors/icheck/skins/line/line@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/orange.css b/backendpanel/asset/vendors/icheck/skins/line/orange.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/pink.css b/backendpanel/asset/vendors/icheck/skins/line/pink.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/purple.css b/backendpanel/asset/vendors/icheck/skins/line/purple.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/red.css b/backendpanel/asset/vendors/icheck/skins/line/red.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/line/yellow.css b/backendpanel/asset/vendors/icheck/skins/line/yellow.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/_all.css b/backendpanel/asset/vendors/icheck/skins/minimal/_all.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/aero.css b/backendpanel/asset/vendors/icheck/skins/minimal/aero.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/aero.png b/backendpanel/asset/vendors/icheck/skins/minimal/aero.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/aero@2x.png b/backendpanel/asset/vendors/icheck/skins/minimal/aero@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/blue.css b/backendpanel/asset/vendors/icheck/skins/minimal/blue.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/blue.png b/backendpanel/asset/vendors/icheck/skins/minimal/blue.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/blue@2x.png b/backendpanel/asset/vendors/icheck/skins/minimal/blue@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/green.css b/backendpanel/asset/vendors/icheck/skins/minimal/green.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/green.png b/backendpanel/asset/vendors/icheck/skins/minimal/green.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/green@2x.png b/backendpanel/asset/vendors/icheck/skins/minimal/green@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/grey.css b/backendpanel/asset/vendors/icheck/skins/minimal/grey.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/grey.png b/backendpanel/asset/vendors/icheck/skins/minimal/grey.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/grey@2x.png b/backendpanel/asset/vendors/icheck/skins/minimal/grey@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/minimal.css b/backendpanel/asset/vendors/icheck/skins/minimal/minimal.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/minimal.png b/backendpanel/asset/vendors/icheck/skins/minimal/minimal.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/minimal@2x.png b/backendpanel/asset/vendors/icheck/skins/minimal/minimal@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/orange.css b/backendpanel/asset/vendors/icheck/skins/minimal/orange.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/orange.png b/backendpanel/asset/vendors/icheck/skins/minimal/orange.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/orange@2x.png b/backendpanel/asset/vendors/icheck/skins/minimal/orange@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/pink.css b/backendpanel/asset/vendors/icheck/skins/minimal/pink.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/pink.png b/backendpanel/asset/vendors/icheck/skins/minimal/pink.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/pink@2x.png b/backendpanel/asset/vendors/icheck/skins/minimal/pink@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/purple.css b/backendpanel/asset/vendors/icheck/skins/minimal/purple.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/purple.png b/backendpanel/asset/vendors/icheck/skins/minimal/purple.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/purple@2x.png b/backendpanel/asset/vendors/icheck/skins/minimal/purple@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/red.css b/backendpanel/asset/vendors/icheck/skins/minimal/red.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/red.png b/backendpanel/asset/vendors/icheck/skins/minimal/red.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/red@2x.png b/backendpanel/asset/vendors/icheck/skins/minimal/red@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/yellow.css b/backendpanel/asset/vendors/icheck/skins/minimal/yellow.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/yellow.png b/backendpanel/asset/vendors/icheck/skins/minimal/yellow.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/minimal/yellow@2x.png b/backendpanel/asset/vendors/icheck/skins/minimal/yellow@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/polaris/polaris.css b/backendpanel/asset/vendors/icheck/skins/polaris/polaris.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/polaris/polaris.png b/backendpanel/asset/vendors/icheck/skins/polaris/polaris.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/polaris/polaris@2x.png b/backendpanel/asset/vendors/icheck/skins/polaris/polaris@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/_all.css b/backendpanel/asset/vendors/icheck/skins/square/_all.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/aero.css b/backendpanel/asset/vendors/icheck/skins/square/aero.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/aero.png b/backendpanel/asset/vendors/icheck/skins/square/aero.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/aero@2x.png b/backendpanel/asset/vendors/icheck/skins/square/aero@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/blue.css b/backendpanel/asset/vendors/icheck/skins/square/blue.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/blue.png b/backendpanel/asset/vendors/icheck/skins/square/blue.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/blue@2x.png b/backendpanel/asset/vendors/icheck/skins/square/blue@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/green.css b/backendpanel/asset/vendors/icheck/skins/square/green.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/green.png b/backendpanel/asset/vendors/icheck/skins/square/green.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/green@2x.png b/backendpanel/asset/vendors/icheck/skins/square/green@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/grey.css b/backendpanel/asset/vendors/icheck/skins/square/grey.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/grey.png b/backendpanel/asset/vendors/icheck/skins/square/grey.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/grey@2x.png b/backendpanel/asset/vendors/icheck/skins/square/grey@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/orange.css b/backendpanel/asset/vendors/icheck/skins/square/orange.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/orange.png b/backendpanel/asset/vendors/icheck/skins/square/orange.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/orange@2x.png b/backendpanel/asset/vendors/icheck/skins/square/orange@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/pink.css b/backendpanel/asset/vendors/icheck/skins/square/pink.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/pink.png b/backendpanel/asset/vendors/icheck/skins/square/pink.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/pink@2x.png b/backendpanel/asset/vendors/icheck/skins/square/pink@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/purple.css b/backendpanel/asset/vendors/icheck/skins/square/purple.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/purple.png b/backendpanel/asset/vendors/icheck/skins/square/purple.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/purple@2x.png b/backendpanel/asset/vendors/icheck/skins/square/purple@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/red.css b/backendpanel/asset/vendors/icheck/skins/square/red.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/red.png b/backendpanel/asset/vendors/icheck/skins/square/red.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/red@2x.png b/backendpanel/asset/vendors/icheck/skins/square/red@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/square.css b/backendpanel/asset/vendors/icheck/skins/square/square.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/square.png b/backendpanel/asset/vendors/icheck/skins/square/square.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/square@2x.png b/backendpanel/asset/vendors/icheck/skins/square/square@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/yellow.css b/backendpanel/asset/vendors/icheck/skins/square/yellow.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/yellow.png b/backendpanel/asset/vendors/icheck/skins/square/yellow.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/icheck/skins/square/yellow@2x.png b/backendpanel/asset/vendors/icheck/skins/square/yellow@2x.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/Gruntfile.coffee b/backendpanel/asset/vendors/iconfonts/flag-icon-css/Gruntfile.coffee
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/LICENSE b/backendpanel/asset/vendors/iconfonts/flag-icon-css/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/README.md b/backendpanel/asset/vendors/iconfonts/flag-icon-css/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/assets/docs.css b/backendpanel/asset/vendors/iconfonts/flag-icon-css/assets/docs.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/assets/docs.js b/backendpanel/asset/vendors/iconfonts/flag-icon-css/assets/docs.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/assets/docs.less b/backendpanel/asset/vendors/iconfonts/flag-icon-css/assets/docs.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/bower.json b/backendpanel/asset/vendors/iconfonts/flag-icon-css/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/composer.json b/backendpanel/asset/vendors/iconfonts/flag-icon-css/composer.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/css/flag-icon.css b/backendpanel/asset/vendors/iconfonts/flag-icon-css/css/flag-icon.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/css/flag-icon.min.css b/backendpanel/asset/vendors/iconfonts/flag-icon-css/css/flag-icon.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ad.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ad.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ae.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ae.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/af.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/af.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ag.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ag.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ai.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ai.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/al.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/al.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/am.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/am.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ao.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ao.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/aq.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/aq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ar.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ar.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/as.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/as.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/at.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/at.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/au.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/au.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/aw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/aw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ax.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ax.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/az.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/az.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ba.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ba.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bb.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bd.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/be.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/be.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bi.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bj.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bo.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bq.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/br.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/br.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bs.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/by.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/by.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/bz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ca.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ca.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cd.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ch.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ch.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ci.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ci.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ck.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ck.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/co.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/co.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cx.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cy.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/cz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/de.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/de.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/dj.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/dj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/dk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/dk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/dm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/dm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/do.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/do.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/dz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/dz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ec.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ec.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ee.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ee.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/eg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/eg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/eh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/eh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/er.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/er.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/es-ct.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/es-ct.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/es.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/es.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/et.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/et.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/eu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/eu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fi.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fj.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fo.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/fr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ga.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ga.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gb-eng.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gb-eng.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gb-nir.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gb-nir.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gb-sct.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gb-sct.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gb-wls.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gb-wls.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gb.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gd.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ge.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ge.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gi.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gp.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gq.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gs.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gy.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/gy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/hk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/hk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/hm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/hm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/hn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/hn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/hr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/hr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ht.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ht.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/hu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/hu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/id.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/id.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ie.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ie.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/il.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/il.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/im.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/im.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/in.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/in.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/io.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/io.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/iq.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/iq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ir.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ir.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/is.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/is.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/it.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/it.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/je.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/je.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/jm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/jm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/jo.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/jo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/jp.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/jp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ke.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ke.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ki.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ki.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/km.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/km.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kp.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ky.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ky.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/kz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/la.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/la.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lb.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/li.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/li.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ls.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ls.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/lv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ly.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ly.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ma.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ma.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/md.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/md.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/me.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/me.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ml.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ml.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mo.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mp.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mq.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ms.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ms.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mx.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/my.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/my.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/mz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/na.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/na.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ne.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ne.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ng.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ng.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ni.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ni.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/no.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/no.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/np.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/np.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/nz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/om.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/om.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pa.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pe.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pe.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ph.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ph.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ps.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ps.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/pw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/py.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/py.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/qa.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/qa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/re.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/re.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ro.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ro.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/rs.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/rs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ru.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ru.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/rw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/rw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sa.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sb.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sd.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/se.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/se.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/si.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/si.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sj.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/so.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/so.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ss.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ss.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/st.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/st.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sx.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sy.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/sz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/td.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/td.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/th.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/th.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tj.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/to.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/to.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/tz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ua.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ua.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ug.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ug.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/um.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/um.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/un.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/un.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/us.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/us.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/uy.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/uy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/uz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/uz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/va.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/va.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/vc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/vc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ve.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ve.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/vg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/vg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/vi.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/vi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/vn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/vn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/vu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/vu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/wf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/wf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ws.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ws.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ye.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/ye.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/yt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/yt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/za.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/za.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/zm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/zm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/zw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/1x1/zw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ad.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ad.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ae.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ae.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/af.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/af.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ag.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ag.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ai.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ai.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/al.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/al.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/am.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/am.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ao.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ao.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/aq.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/aq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ar.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ar.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/as.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/as.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/at.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/at.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/au.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/au.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/aw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/aw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ax.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ax.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/az.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/az.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ba.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ba.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bb.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bd.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/be.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/be.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bi.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bj.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bo.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bq.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/br.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/br.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bs.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/by.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/by.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/bz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ca.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ca.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cd.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ch.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ch.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ci.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ci.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ck.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ck.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/co.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/co.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cx.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cy.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/cz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/de.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/de.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/dj.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/dj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/dk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/dk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/dm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/dm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/do.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/do.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/dz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/dz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ec.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ec.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ee.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ee.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/eg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/eg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/eh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/eh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/er.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/er.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/es-ct.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/es-ct.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/es.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/es.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/et.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/et.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/eu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/eu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fi.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fj.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fo.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/fr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ga.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ga.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gb-eng.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gb-eng.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gb-nir.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gb-nir.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gb-sct.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gb-sct.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gb-wls.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gb-wls.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gb.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gd.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ge.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ge.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gi.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gp.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gq.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gs.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gy.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/gy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/hk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/hk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/hm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/hm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/hn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/hn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/hr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/hr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ht.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ht.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/hu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/hu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/id.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/id.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ie.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ie.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/il.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/il.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/im.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/im.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/in.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/in.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/io.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/io.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/iq.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/iq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ir.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ir.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/is.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/is.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/it.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/it.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/je.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/je.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/jm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/jm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/jo.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/jo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/jp.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/jp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ke.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ke.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ki.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ki.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/km.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/km.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kp.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ky.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ky.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/kz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/la.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/la.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lb.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/li.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/li.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ls.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ls.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/lv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ly.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ly.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ma.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ma.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/md.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/md.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/me.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/me.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ml.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ml.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mo.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mp.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mq.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mq.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ms.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ms.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mx.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/my.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/my.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/mz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/na.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/na.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ne.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ne.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ng.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ng.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ni.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ni.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/no.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/no.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/np.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/np.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/nz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/om.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/om.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pa.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pe.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pe.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ph.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ph.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ps.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ps.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/pw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/py.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/py.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/qa.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/qa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/re.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/re.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ro.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ro.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/rs.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/rs.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ru.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ru.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/rw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/rw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sa.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sa.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sb.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sd.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sd.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/se.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/se.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sh.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sh.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/si.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/si.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sj.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/so.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/so.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ss.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ss.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/st.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/st.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sx.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sx.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sy.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/sz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/td.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/td.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/th.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/th.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tj.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tj.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tk.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tk.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tl.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tl.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/to.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/to.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tr.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tv.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tv.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/tz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ua.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ua.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ug.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ug.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/um.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/um.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/un.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/un.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/us.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/us.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/uy.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/uy.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/uz.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/uz.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/va.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/va.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/vc.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/vc.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ve.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ve.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/vg.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/vg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/vi.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/vi.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/vn.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/vn.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/vu.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/vu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/wf.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/wf.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ws.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ws.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ye.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/ye.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/yt.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/yt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/za.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/za.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/zm.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/zm.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/zw.svg b/backendpanel/asset/vendors/iconfonts/flag-icon-css/flags/4x3/zw.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/index.html b/backendpanel/asset/vendors/iconfonts/flag-icon-css/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/less/flag-icon-base.less b/backendpanel/asset/vendors/iconfonts/flag-icon-css/less/flag-icon-base.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/less/flag-icon-list.less b/backendpanel/asset/vendors/iconfonts/flag-icon-css/less/flag-icon-list.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/less/flag-icon-more.less b/backendpanel/asset/vendors/iconfonts/flag-icon-css/less/flag-icon-more.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/less/flag-icon.less b/backendpanel/asset/vendors/iconfonts/flag-icon-css/less/flag-icon.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/less/variables.less b/backendpanel/asset/vendors/iconfonts/flag-icon-css/less/variables.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/package.json b/backendpanel/asset/vendors/iconfonts/flag-icon-css/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/sass/_flag-icon-base.scss b/backendpanel/asset/vendors/iconfonts/flag-icon-css/sass/_flag-icon-base.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/sass/_flag-icon-list.scss b/backendpanel/asset/vendors/iconfonts/flag-icon-css/sass/_flag-icon-list.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/sass/_flag-icon-more.scss b/backendpanel/asset/vendors/iconfonts/flag-icon-css/sass/_flag-icon-more.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/sass/_variables.scss b/backendpanel/asset/vendors/iconfonts/flag-icon-css/sass/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/flag-icon-css/sass/flag-icon.scss b/backendpanel/asset/vendors/iconfonts/flag-icon-css/sass/flag-icon.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/HELP-US-OUT.txt b/backendpanel/asset/vendors/iconfonts/font-awesome/HELP-US-OUT.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/README.md b/backendpanel/asset/vendors/iconfonts/font-awesome/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/css/font-awesome.css b/backendpanel/asset/vendors/iconfonts/font-awesome/css/font-awesome.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/css/font-awesome.css.map b/backendpanel/asset/vendors/iconfonts/font-awesome/css/font-awesome.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/css/font-awesome.min.css b/backendpanel/asset/vendors/iconfonts/font-awesome/css/font-awesome.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/FontAwesome.otf b/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/FontAwesome.otf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/fontawesome-webfont.eot b/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/fontawesome-webfont.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/fontawesome-webfont.svg b/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/fontawesome-webfont.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/fontawesome-webfont.ttf b/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/fontawesome-webfont.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/fontawesome-webfont.woff b/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/fontawesome-webfont.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/fontawesome-webfont.woff2 b/backendpanel/asset/vendors/iconfonts/font-awesome/fonts/fontawesome-webfont.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/animated.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/animated.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/bordered-pulled.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/bordered-pulled.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/core.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/core.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/fixed-width.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/fixed-width.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/font-awesome.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/font-awesome.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/icons.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/icons.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/larger.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/larger.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/list.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/list.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/mixins.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/mixins.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/path.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/path.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/rotated-flipped.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/rotated-flipped.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/screen-reader.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/screen-reader.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/stacked.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/stacked.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/less/variables.less b/backendpanel/asset/vendors/iconfonts/font-awesome/less/variables.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/package.json b/backendpanel/asset/vendors/iconfonts/font-awesome/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_animated.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_animated.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_bordered-pulled.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_bordered-pulled.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_core.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_core.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_fixed-width.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_fixed-width.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_icons.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_icons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_larger.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_larger.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_list.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_list.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_mixins.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_mixins.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_path.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_path.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_rotated-flipped.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_rotated-flipped.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_screen-reader.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_screen-reader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_stacked.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_stacked.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_variables.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/font-awesome/scss/font-awesome.scss b/backendpanel/asset/vendors/iconfonts/font-awesome/scss/font-awesome.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/README.md b/backendpanel/asset/vendors/iconfonts/mdi/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/bower.json b/backendpanel/asset/vendors/iconfonts/mdi/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/css/materialdesignicons.css b/backendpanel/asset/vendors/iconfonts/mdi/css/materialdesignicons.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/css/materialdesignicons.css.map b/backendpanel/asset/vendors/iconfonts/mdi/css/materialdesignicons.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/css/materialdesignicons.min.css b/backendpanel/asset/vendors/iconfonts/mdi/css/materialdesignicons.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/css/materialdesignicons.min.css.map b/backendpanel/asset/vendors/iconfonts/mdi/css/materialdesignicons.min.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.eot b/backendpanel/asset/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.svg b/backendpanel/asset/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.ttf b/backendpanel/asset/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.woff b/backendpanel/asset/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.woff2 b/backendpanel/asset/vendors/iconfonts/mdi/fonts/materialdesignicons-webfont.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/license.md b/backendpanel/asset/vendors/iconfonts/mdi/license.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/package.json b/backendpanel/asset/vendors/iconfonts/mdi/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/preview.html b/backendpanel/asset/vendors/iconfonts/mdi/preview.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/scss/_animated.scss b/backendpanel/asset/vendors/iconfonts/mdi/scss/_animated.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/scss/_core.scss b/backendpanel/asset/vendors/iconfonts/mdi/scss/_core.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/scss/_extras.scss b/backendpanel/asset/vendors/iconfonts/mdi/scss/_extras.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/scss/_functions.scss b/backendpanel/asset/vendors/iconfonts/mdi/scss/_functions.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/scss/_icons.scss b/backendpanel/asset/vendors/iconfonts/mdi/scss/_icons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/scss/_path.scss b/backendpanel/asset/vendors/iconfonts/mdi/scss/_path.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/scss/_variables.scss b/backendpanel/asset/vendors/iconfonts/mdi/scss/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/mdi/scss/materialdesignicons.scss b/backendpanel/asset/vendors/iconfonts/mdi/scss/materialdesignicons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/puse-icons-feather/README.md b/backendpanel/asset/vendors/iconfonts/puse-icons-feather/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/puse-icons-feather/feather.css b/backendpanel/asset/vendors/iconfonts/puse-icons-feather/feather.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/puse-icons-feather/fonts/feather-webfont.eot b/backendpanel/asset/vendors/iconfonts/puse-icons-feather/fonts/feather-webfont.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/puse-icons-feather/fonts/feather-webfont.svg b/backendpanel/asset/vendors/iconfonts/puse-icons-feather/fonts/feather-webfont.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/puse-icons-feather/fonts/feather-webfont.ttf b/backendpanel/asset/vendors/iconfonts/puse-icons-feather/fonts/feather-webfont.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/puse-icons-feather/fonts/feather-webfont.woff b/backendpanel/asset/vendors/iconfonts/puse-icons-feather/fonts/feather-webfont.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/puse-icons-feather/package.json b/backendpanel/asset/vendors/iconfonts/puse-icons-feather/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/CODE_OF_CONDUCT.md b/backendpanel/asset/vendors/iconfonts/simple-line-icon/CODE_OF_CONDUCT.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/CONTRIBUTING.md b/backendpanel/asset/vendors/iconfonts/simple-line-icon/CONTRIBUTING.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/History.md b/backendpanel/asset/vendors/iconfonts/simple-line-icon/History.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/LICENSE.md b/backendpanel/asset/vendors/iconfonts/simple-line-icon/LICENSE.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/README.md b/backendpanel/asset/vendors/iconfonts/simple-line-icon/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/bower.json b/backendpanel/asset/vendors/iconfonts/simple-line-icon/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/css/simple-line-icons.css b/backendpanel/asset/vendors/iconfonts/simple-line-icon/css/simple-line-icons.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/fonts/Simple-Line-Icons.eot b/backendpanel/asset/vendors/iconfonts/simple-line-icon/fonts/Simple-Line-Icons.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/fonts/Simple-Line-Icons.svg b/backendpanel/asset/vendors/iconfonts/simple-line-icon/fonts/Simple-Line-Icons.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/fonts/Simple-Line-Icons.ttf b/backendpanel/asset/vendors/iconfonts/simple-line-icon/fonts/Simple-Line-Icons.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/fonts/Simple-Line-Icons.woff b/backendpanel/asset/vendors/iconfonts/simple-line-icon/fonts/Simple-Line-Icons.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/fonts/Simple-Line-Icons.woff2 b/backendpanel/asset/vendors/iconfonts/simple-line-icon/fonts/Simple-Line-Icons.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/less/simple-line-icons.less b/backendpanel/asset/vendors/iconfonts/simple-line-icon/less/simple-line-icons.less
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/package.json b/backendpanel/asset/vendors/iconfonts/simple-line-icon/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/simple-line-icon/scss/simple-line-icons.scss b/backendpanel/asset/vendors/iconfonts/simple-line-icon/scss/simple-line-icons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/LICENSE b/backendpanel/asset/vendors/iconfonts/ti-icons/LICENSE
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/README.md b/backendpanel/asset/vendors/iconfonts/ti-icons/README.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/Italic.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/Italic.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/agenda.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/agenda.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/alarm-clock.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/alarm-clock.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/alert.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/alert.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/align-center.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/align-center.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/align-justify.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/align-justify.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/align-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/align-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/align-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/align-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/anchor.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/anchor.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/android.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/android.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-double-down.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-double-down.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-double-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-double-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-double-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-double-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-double-up.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-double-up.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-down.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-down.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-up.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/angle-up.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/announcement.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/announcement.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/apple.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/apple.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/archive.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/archive.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-circle-down.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-circle-down.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-circle-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-circle-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-circle-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-circle-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-circle-up.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-circle-up.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-down.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-down.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-top-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-top-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-top-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-top-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-up.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow-up.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrow.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrows-corner.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrows-corner.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrows-horizontal.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrows-horizontal.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrows-vertical.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/arrows-vertical.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/back-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/back-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/back-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/back-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bag.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bag.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bar-chart-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bar-chart-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bar-chart.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bar-chart.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/basketball.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/basketball.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bell.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bell.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/blackboard.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/blackboard.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bolt-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bolt-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bolt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bolt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/book.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/book.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bookmark-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bookmark-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bookmark.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/bookmark.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/briefcase.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/briefcase.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/brush-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/brush-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/brush.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/brush.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/calendar.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/calendar.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/camera.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/camera.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/car.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/car.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/check-box.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/check-box.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/check.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/check.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/clip.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/clip.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/clipboard.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/clipboard.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/close.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/close.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/cloud-down.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/cloud-down.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/cloud-up.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/cloud-up.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/cloud.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/cloud.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/comment-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/comment-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/comment.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/comment.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/comments-smiley.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/comments-smiley.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/comments.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/comments.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-backward.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-backward.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-eject.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-eject.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-forward.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-forward.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-pause.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-pause.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-play.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-play.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-record.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-record.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-shuffle.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-shuffle.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-skip-backward.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-skip-backward.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-skip-forward.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-skip-forward.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-stop.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/control-stop.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/credit-card.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/credit-card.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/crown.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/crown.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/css3.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/css3.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/cup.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/cup.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/cut.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/cut.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/dashboard.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/dashboard.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/desktop.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/desktop.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/direction-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/direction-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/direction.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/direction.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/download.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/download.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/dribbble.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/dribbble.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/dropbox-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/dropbox-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/dropbox.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/dropbox.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/drupal.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/drupal.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/email.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/email.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/envelope.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/envelope.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/eraser.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/eraser.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/exchange-vertical.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/exchange-vertical.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/export.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/export.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/eye.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/eye.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/face-sad.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/face-sad.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/face-smile.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/face-smile.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/facebook.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/facebook.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/file.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/file.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/files.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/files.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/filter.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/filter.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/flag-alt-2.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/flag-alt-2.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/flag-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/flag-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/flag.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/flag.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/flickr-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/flickr-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/flickr.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/flickr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/folder.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/folder.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/fullscreen.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/fullscreen.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/gallery.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/gallery.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/game.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/game.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/gift.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/gift.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/github.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/github.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/google.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/google.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-drag.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-drag.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-open.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-open.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-point-down.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-point-down.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-point-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-point-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-point-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-point-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-point-up.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-point-up.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-stop.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hand-stop.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/harddrive.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/harddrive.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/harddrives.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/harddrives.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/headphone-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/headphone-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/headphone.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/headphone.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/heart-broken.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/heart-broken.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/heart.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/heart.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/help-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/help-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/help.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/help.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/home.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/home.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/html5.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/html5.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hummer.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/hummer.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/id-badge.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/id-badge.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/image.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/image.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/import.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/import.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/infinite.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/infinite.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/info-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/info-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/info.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/info.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ink-pen.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ink-pen.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/instagram.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/instagram.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/joomla.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/joomla.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/jsfiddle.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/jsfiddle.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/key.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/key.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layers-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layers-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layers.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layers.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-accordion-list.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-accordion-list.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-accordion-merged.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-accordion-merged.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-accordion-separated.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-accordion-separated.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column2-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column2-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column2.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column2.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column3-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column3-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column3.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column3.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column4-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column4-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column4.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-column4.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-cta-btn-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-cta-btn-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-cta-btn-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-cta-btn-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-cta-center.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-cta-center.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-cta-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-cta-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-cta-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-cta-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid2-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid2-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid2-thumb.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid2-thumb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid2.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid2.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid3-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid3-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid3.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid3.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid4-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid4-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid4.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-grid4.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-line-solid.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-line-solid.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-list-large-image.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-list-large-image.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-list-post.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-list-post.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-list-thumb-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-list-thumb-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-list-thumb.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-list-thumb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-center-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-center-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-center.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-center.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-left-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-left-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-overlay-alt-2.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-overlay-alt-2.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-overlay-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-overlay-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-overlay.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-overlay.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-right-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-right-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-media-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-menu-full.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-menu-full.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-menu-separated.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-menu-separated.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-menu-v.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-menu-v.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-menu.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-menu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-placeholder.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-placeholder.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-sidebar-2.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-sidebar-2.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-sidebar-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-sidebar-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-sidebar-none.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-sidebar-none.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-sidebar-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-sidebar-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-slider-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-slider-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-slider.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-slider.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-tab-min.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-tab-min.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-tab-v.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-tab-v.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-tab-window.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-tab-window.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-tab.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-tab.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-width-default-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-width-default-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-width-default.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-width-default.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-width-full.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout-width-full.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/layout.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/light-bulb.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/light-bulb.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/line-dashed.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/line-dashed.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/line-dotted.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/line-dotted.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/line-double.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/line-double.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/link.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/link.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/linkedin.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/linkedin.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/linux.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/linux.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/list-ol.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/list-ol.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/list.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/list.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/location-arrow.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/location-arrow.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/location-pin.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/location-pin.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/lock.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/lock.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/loop.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/loop.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/magnet.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/magnet.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/map-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/map-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/map.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/map.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/marker-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/marker-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/marker.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/marker.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/medall-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/medall-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/medall.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/medall.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/menu-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/menu-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/menu.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/menu.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/microphone-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/microphone-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/microphone.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/microphone.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/microsoft-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/microsoft-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/microsoft.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/microsoft.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/minus.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/minus.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/mobile.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/mobile.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/money.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/money.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/more-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/more-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/more.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/more.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/mouse-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/mouse-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/mouse.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/mouse.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/music-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/music-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/music.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/music.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/na.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/na.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/new-window.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/new-window.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/notepad.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/notepad.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/package.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/package.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/paint-bucket.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/paint-bucket.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/paint-roller.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/paint-roller.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/palette.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/palette.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/panel.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/panel.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/paragraph.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/paragraph.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pencil-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pencil-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pencil-alt2.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pencil-alt2.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pencil.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pencil.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pie-chart.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pie-chart.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pin-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pin-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pin.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pin.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pin2.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pin2.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pinterest-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pinterest-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pinterest.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pinterest.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/plug.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/plug.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/plus.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/plus.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/power-off.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/power-off.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/printer.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/printer.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pulse.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/pulse.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/quote-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/quote-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/quote-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/quote-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/receipt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/receipt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/reddit.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/reddit.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/reload.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/reload.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/rocket.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/rocket.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/rss-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/rss-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/rss.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/rss.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ruler-alt-2.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ruler-alt-2.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ruler-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ruler-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ruler-pencil.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ruler-pencil.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ruler.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ruler.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/save-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/save-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/save.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/save.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/search.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/search.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/server.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/server.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/settings.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/settings.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/share-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/share-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/share.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/share.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/sharethis-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/sharethis-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/sharethis.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/sharethis.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shield.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shield.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shift-left-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shift-left-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shift-left.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shift-left.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shift-right-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shift-right-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shift-right.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shift-right.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shine.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shine.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shopping-cart-full.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shopping-cart-full.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shopping-cart.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shopping-cart.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shortcode.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/shortcode.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/signal.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/signal.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/skype.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/skype.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/slice.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/slice.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/smallcap.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/smallcap.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/soundcloud.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/soundcloud.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/split-h.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/split-h.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/split-v-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/split-v-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/split-v.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/split-v.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/spray.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/spray.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/stack-overflow.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/stack-overflow.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/stamp.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/stamp.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/star.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/star.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/stats-down.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/stats-down.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/stats-up.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/stats-up.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/support.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/support.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/tablet.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/tablet.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/tag.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/tag.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/target.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/target.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/text.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/text.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/themify-favicon-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/themify-favicon-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/themify-favicon.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/themify-favicon.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/themify-logo.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/themify-logo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/thought.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/thought.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/thumb-down.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/thumb-down.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/thumb-up.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/thumb-up.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ticket.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/ticket.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/time.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/time.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/timer.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/timer.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/trash.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/trash.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/trello.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/trello.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/truck.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/truck.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/tumblr-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/tumblr-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/tumblr.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/tumblr.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/twitter-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/twitter-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/twitter.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/twitter.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/underline.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/underline.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/unlink.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/unlink.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/unlock.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/unlock.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/upload.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/upload.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/uppercase.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/uppercase.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/user.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/user.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/vector.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/vector.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/video-camera.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/video-camera.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/video-clapper.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/video-clapper.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/view-grid.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/view-grid.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/view-list-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/view-list-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/view-list.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/view-list.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/vimeo-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/vimeo-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/vimeo.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/vimeo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/volume.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/volume.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/wallet.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/wallet.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/wand.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/wand.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/wheelchair.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/wheelchair.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/widget-alt.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/widget-alt.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/widget.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/widget.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/widgetized.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/widgetized.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/window.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/window.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/wordpress.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/wordpress.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/world.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/world.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/write.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/write.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/yahoo.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/yahoo.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/youtube.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/youtube.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/zip.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/zip.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/zoom-in.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/zoom-in.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/zoom-out.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/SVG/zoom-out.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/Themify IconFonts 5-23-2014.json b/backendpanel/asset/vendors/iconfonts/ti-icons/Themify IconFonts 5-23-2014.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/bower.json b/backendpanel/asset/vendors/iconfonts/ti-icons/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/css/themify-icons.css b/backendpanel/asset/vendors/iconfonts/ti-icons/css/themify-icons.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/demo-files/demo.css b/backendpanel/asset/vendors/iconfonts/ti-icons/demo-files/demo.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/fonts/themify.eot b/backendpanel/asset/vendors/iconfonts/ti-icons/fonts/themify.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/fonts/themify.svg b/backendpanel/asset/vendors/iconfonts/ti-icons/fonts/themify.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/fonts/themify.ttf b/backendpanel/asset/vendors/iconfonts/ti-icons/fonts/themify.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/fonts/themify.woff b/backendpanel/asset/vendors/iconfonts/ti-icons/fonts/themify.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/ie7/ie7.css b/backendpanel/asset/vendors/iconfonts/ti-icons/ie7/ie7.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/ie7/ie7.js b/backendpanel/asset/vendors/iconfonts/ti-icons/ie7/ie7.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/index.html b/backendpanel/asset/vendors/iconfonts/ti-icons/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/iconfonts/ti-icons/package.json b/backendpanel/asset/vendors/iconfonts/ti-icons/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/images/alpha.png b/backendpanel/asset/vendors/images/alpha.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/images/hue.png b/backendpanel/asset/vendors/images/hue.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/images/saturation.png b/backendpanel/asset/vendors/images/saturation.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/images/transparent.png b/backendpanel/asset/vendors/images/transparent.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/img/sprite-skin-flat.png b/backendpanel/asset/vendors/img/sprite-skin-flat.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/img/sprite-skin-modern.png b/backendpanel/asset/vendors/img/sprite-skin-modern.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/img/sprite-skin-nice.png b/backendpanel/asset/vendors/img/sprite-skin-nice.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/img/sprite-skin-simple.png b/backendpanel/asset/vendors/img/sprite-skin-simple.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/js/vendor.bundle.addons.js b/backendpanel/asset/vendors/js/vendor.bundle.addons.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/js/vendor.bundle.base.js b/backendpanel/asset/vendors/js/vendor.bundle.base.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/css/lg-fb-comment-box.css b/backendpanel/asset/vendors/lightgallery/css/lg-fb-comment-box.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/css/lg-fb-comment-box.min.css b/backendpanel/asset/vendors/lightgallery/css/lg-fb-comment-box.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/css/lg-transitions.css b/backendpanel/asset/vendors/lightgallery/css/lg-transitions.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/css/lg-transitions.min.css b/backendpanel/asset/vendors/lightgallery/css/lg-transitions.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/css/lightgallery.css b/backendpanel/asset/vendors/lightgallery/css/lightgallery.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/css/lightgallery.min.css b/backendpanel/asset/vendors/lightgallery/css/lightgallery.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/fonts/lg.eot b/backendpanel/asset/vendors/lightgallery/fonts/lg.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/fonts/lg.svg b/backendpanel/asset/vendors/lightgallery/fonts/lg.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/fonts/lg.ttf b/backendpanel/asset/vendors/lightgallery/fonts/lg.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/fonts/lg.woff b/backendpanel/asset/vendors/lightgallery/fonts/lg.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/img/loading.gif b/backendpanel/asset/vendors/lightgallery/img/loading.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/img/video-play.png b/backendpanel/asset/vendors/lightgallery/img/video-play.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/img/vimeo-play.png b/backendpanel/asset/vendors/lightgallery/img/vimeo-play.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/img/youtube-play.png b/backendpanel/asset/vendors/lightgallery/img/youtube-play.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/js/lightgallery-all.js b/backendpanel/asset/vendors/lightgallery/js/lightgallery-all.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/js/lightgallery-all.min.js b/backendpanel/asset/vendors/lightgallery/js/lightgallery-all.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/js/lightgallery.js b/backendpanel/asset/vendors/lightgallery/js/lightgallery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/lightgallery/js/lightgallery.min.js b/backendpanel/asset/vendors/lightgallery/js/lightgallery.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/bower.json b/backendpanel/asset/vendors/tinymce/bower.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/changelog.txt b/backendpanel/asset/vendors/tinymce/changelog.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/composer.json b/backendpanel/asset/vendors/tinymce/composer.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/jquery.tinymce.js b/backendpanel/asset/vendors/tinymce/jquery.tinymce.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/jquery.tinymce.min.js b/backendpanel/asset/vendors/tinymce/jquery.tinymce.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/license.txt b/backendpanel/asset/vendors/tinymce/license.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/package.json b/backendpanel/asset/vendors/tinymce/package.json
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/advlist/index.js b/backendpanel/asset/vendors/tinymce/plugins/advlist/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/advlist/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/advlist/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/advlist/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/advlist/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/anchor/index.js b/backendpanel/asset/vendors/tinymce/plugins/anchor/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/anchor/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/anchor/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/anchor/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/anchor/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/autolink/index.js b/backendpanel/asset/vendors/tinymce/plugins/autolink/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/autolink/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/autolink/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/autolink/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/autolink/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/autoresize/index.js b/backendpanel/asset/vendors/tinymce/plugins/autoresize/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/autoresize/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/autoresize/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/autoresize/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/autoresize/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/autosave/index.js b/backendpanel/asset/vendors/tinymce/plugins/autosave/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/autosave/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/autosave/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/autosave/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/autosave/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/bbcode/index.js b/backendpanel/asset/vendors/tinymce/plugins/bbcode/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/bbcode/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/bbcode/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/bbcode/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/bbcode/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/charmap/index.js b/backendpanel/asset/vendors/tinymce/plugins/charmap/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/charmap/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/charmap/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/charmap/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/charmap/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/code/index.js b/backendpanel/asset/vendors/tinymce/plugins/code/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/code/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/code/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/code/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/code/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/codesample/css/prism.css b/backendpanel/asset/vendors/tinymce/plugins/codesample/css/prism.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/codesample/index.js b/backendpanel/asset/vendors/tinymce/plugins/codesample/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/codesample/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/codesample/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/codesample/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/codesample/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/colorpicker/index.js b/backendpanel/asset/vendors/tinymce/plugins/colorpicker/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/colorpicker/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/colorpicker/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/colorpicker/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/colorpicker/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/contextmenu/index.js b/backendpanel/asset/vendors/tinymce/plugins/contextmenu/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/contextmenu/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/contextmenu/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/contextmenu/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/contextmenu/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/directionality/index.js b/backendpanel/asset/vendors/tinymce/plugins/directionality/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/directionality/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/directionality/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/directionality/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/directionality/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-cool.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-cool.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-cry.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-cry.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-embarassed.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-embarassed.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-frown.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-frown.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-innocent.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-innocent.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-kiss.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-kiss.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-laughing.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-laughing.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-money-mouth.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-sealed.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-sealed.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-smile.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-smile.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-surprised.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-surprised.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-tongue-out.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-undecided.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-undecided.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-wink.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-wink.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-yell.gif b/backendpanel/asset/vendors/tinymce/plugins/emoticons/img/smiley-yell.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/index.js b/backendpanel/asset/vendors/tinymce/plugins/emoticons/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/emoticons/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/emoticons/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/emoticons/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/fullpage/index.js b/backendpanel/asset/vendors/tinymce/plugins/fullpage/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/fullpage/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/fullpage/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/fullpage/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/fullpage/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/fullscreen/index.js b/backendpanel/asset/vendors/tinymce/plugins/fullscreen/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/fullscreen/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/fullscreen/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/fullscreen/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/fullscreen/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/help/img/logo.png b/backendpanel/asset/vendors/tinymce/plugins/help/img/logo.png
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/help/index.js b/backendpanel/asset/vendors/tinymce/plugins/help/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/help/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/help/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/help/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/help/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/hr/index.js b/backendpanel/asset/vendors/tinymce/plugins/hr/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/hr/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/hr/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/hr/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/hr/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/image/index.js b/backendpanel/asset/vendors/tinymce/plugins/image/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/image/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/image/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/image/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/image/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/imagetools/index.js b/backendpanel/asset/vendors/tinymce/plugins/imagetools/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/imagetools/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/imagetools/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/imagetools/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/imagetools/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/importcss/index.js b/backendpanel/asset/vendors/tinymce/plugins/importcss/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/importcss/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/importcss/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/importcss/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/importcss/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/insertdatetime/index.js b/backendpanel/asset/vendors/tinymce/plugins/insertdatetime/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/insertdatetime/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/insertdatetime/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/insertdatetime/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/insertdatetime/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/legacyoutput/index.js b/backendpanel/asset/vendors/tinymce/plugins/legacyoutput/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/legacyoutput/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/legacyoutput/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/legacyoutput/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/legacyoutput/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/link/index.js b/backendpanel/asset/vendors/tinymce/plugins/link/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/link/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/link/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/link/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/link/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/lists/index.js b/backendpanel/asset/vendors/tinymce/plugins/lists/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/lists/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/lists/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/lists/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/lists/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/media/index.js b/backendpanel/asset/vendors/tinymce/plugins/media/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/media/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/media/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/media/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/media/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/nonbreaking/index.js b/backendpanel/asset/vendors/tinymce/plugins/nonbreaking/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/nonbreaking/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/nonbreaking/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/nonbreaking/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/nonbreaking/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/noneditable/index.js b/backendpanel/asset/vendors/tinymce/plugins/noneditable/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/noneditable/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/noneditable/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/noneditable/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/noneditable/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/pagebreak/index.js b/backendpanel/asset/vendors/tinymce/plugins/pagebreak/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/pagebreak/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/pagebreak/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/pagebreak/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/pagebreak/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/paste/index.js b/backendpanel/asset/vendors/tinymce/plugins/paste/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/paste/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/paste/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/paste/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/paste/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/preview/index.js b/backendpanel/asset/vendors/tinymce/plugins/preview/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/preview/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/preview/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/preview/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/preview/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/print/index.js b/backendpanel/asset/vendors/tinymce/plugins/print/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/print/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/print/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/print/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/print/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/save/index.js b/backendpanel/asset/vendors/tinymce/plugins/save/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/save/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/save/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/save/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/save/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/searchreplace/index.js b/backendpanel/asset/vendors/tinymce/plugins/searchreplace/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/searchreplace/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/searchreplace/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/searchreplace/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/searchreplace/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/spellchecker/index.js b/backendpanel/asset/vendors/tinymce/plugins/spellchecker/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/spellchecker/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/spellchecker/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/spellchecker/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/spellchecker/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/tabfocus/index.js b/backendpanel/asset/vendors/tinymce/plugins/tabfocus/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/tabfocus/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/tabfocus/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/tabfocus/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/tabfocus/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/table/index.js b/backendpanel/asset/vendors/tinymce/plugins/table/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/table/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/table/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/table/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/table/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/template/index.js b/backendpanel/asset/vendors/tinymce/plugins/template/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/template/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/template/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/template/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/template/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/textcolor/index.js b/backendpanel/asset/vendors/tinymce/plugins/textcolor/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/textcolor/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/textcolor/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/textcolor/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/textcolor/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/textpattern/index.js b/backendpanel/asset/vendors/tinymce/plugins/textpattern/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/textpattern/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/textpattern/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/textpattern/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/textpattern/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/toc/index.js b/backendpanel/asset/vendors/tinymce/plugins/toc/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/toc/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/toc/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/toc/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/toc/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/visualblocks/css/visualblocks.css b/backendpanel/asset/vendors/tinymce/plugins/visualblocks/css/visualblocks.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/visualblocks/index.js b/backendpanel/asset/vendors/tinymce/plugins/visualblocks/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/visualblocks/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/visualblocks/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/visualblocks/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/visualblocks/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/visualchars/index.js b/backendpanel/asset/vendors/tinymce/plugins/visualchars/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/visualchars/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/visualchars/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/visualchars/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/visualchars/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/wordcount/index.js b/backendpanel/asset/vendors/tinymce/plugins/wordcount/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/wordcount/plugin.js b/backendpanel/asset/vendors/tinymce/plugins/wordcount/plugin.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/plugins/wordcount/plugin.min.js b/backendpanel/asset/vendors/tinymce/plugins/wordcount/plugin.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/readme.md b/backendpanel/asset/vendors/tinymce/readme.md
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/content.inline.min.css b/backendpanel/asset/vendors/tinymce/skins/lightgray/content.inline.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/content.min.css b/backendpanel/asset/vendors/tinymce/skins/lightgray/content.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce-small.eot b/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce-small.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce-small.svg b/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce-small.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce-small.ttf b/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce-small.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce-small.woff b/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce-small.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce.eot b/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce.svg b/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce.ttf b/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce.woff b/backendpanel/asset/vendors/tinymce/skins/lightgray/fonts/tinymce.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/img/anchor.gif b/backendpanel/asset/vendors/tinymce/skins/lightgray/img/anchor.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/img/loader.gif b/backendpanel/asset/vendors/tinymce/skins/lightgray/img/loader.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/img/object.gif b/backendpanel/asset/vendors/tinymce/skins/lightgray/img/object.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/img/trans.gif b/backendpanel/asset/vendors/tinymce/skins/lightgray/img/trans.gif
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/skins/lightgray/skin.min.css b/backendpanel/asset/vendors/tinymce/skins/lightgray/skin.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/themes/inlite/index.js b/backendpanel/asset/vendors/tinymce/themes/inlite/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/themes/inlite/theme.js b/backendpanel/asset/vendors/tinymce/themes/inlite/theme.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/themes/inlite/theme.min.js b/backendpanel/asset/vendors/tinymce/themes/inlite/theme.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/themes/modern/index.js b/backendpanel/asset/vendors/tinymce/themes/modern/index.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/themes/modern/theme.js b/backendpanel/asset/vendors/tinymce/themes/modern/theme.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/themes/modern/theme.min.js b/backendpanel/asset/vendors/tinymce/themes/modern/theme.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/tinymce.jquery.js b/backendpanel/asset/vendors/tinymce/tinymce.jquery.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/tinymce.jquery.min.js b/backendpanel/asset/vendors/tinymce/tinymce.jquery.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/tinymce.js b/backendpanel/asset/vendors/tinymce/tinymce.js
old mode 100644
new mode 100755
diff --git a/backendpanel/asset/vendors/tinymce/tinymce.min.js b/backendpanel/asset/vendors/tinymce/tinymce.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/css/main.css b/backendpanel/assetreset/css/main.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/css/util.css b/backendpanel/assetreset/css/util.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/WebFont/Linearicons-Free.eot b/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/WebFont/Linearicons-Free.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/WebFont/Linearicons-Free.svg b/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/WebFont/Linearicons-Free.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/WebFont/Linearicons-Free.ttf b/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/WebFont/Linearicons-Free.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/WebFont/Linearicons-Free.woff b/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/WebFont/Linearicons-Free.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/WebFont/Linearicons-Free.woff2 b/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/WebFont/Linearicons-Free.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/icon-font.min.css b/backendpanel/assetreset/fonts/Linearicons-Free-v1.0.0/icon-font.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/HELP-US-OUT.txt b/backendpanel/assetreset/fonts/font-awesome-4.7.0/HELP-US-OUT.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/css/font-awesome.css b/backendpanel/assetreset/fonts/font-awesome-4.7.0/css/font-awesome.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/css/font-awesome.min.css b/backendpanel/assetreset/fonts/font-awesome-4.7.0/css/font-awesome.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/FontAwesome.otf b/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/FontAwesome.otf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/fontawesome-webfont.eot b/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/fontawesome-webfont.eot
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/fontawesome-webfont.svg b/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/fontawesome-webfont.svg
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf b/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/fontawesome-webfont.woff b/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/fontawesome-webfont.woff
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 b/backendpanel/assetreset/fonts/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/animated.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/animated.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/bordered-pulled.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/bordered-pulled.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/core.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/core.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/fixed-width.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/fixed-width.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/font-awesome.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/font-awesome.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/icons.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/icons.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/larger.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/larger.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/list.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/list.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/mixins.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/mixins.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/path.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/path.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/rotated-flipped.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/rotated-flipped.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/screen-reader.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/screen-reader.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/stacked.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/stacked.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/variables.less b/backendpanel/assetreset/fonts/font-awesome-4.7.0/less/variables.less
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_animated.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_animated.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_bordered-pulled.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_bordered-pulled.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_core.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_core.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_fixed-width.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_fixed-width.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_icons.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_icons.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_larger.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_larger.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_list.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_list.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_mixins.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_mixins.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_path.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_path.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_rotated-flipped.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_rotated-flipped.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_screen-reader.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_screen-reader.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_stacked.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_stacked.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_variables.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/_variables.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/font-awesome.scss b/backendpanel/assetreset/fonts/font-awesome-4.7.0/scss/font-awesome.scss
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-Black.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-Black.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-BlackItalic.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-BlackItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-Bold.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-Bold.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-BoldItalic.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-BoldItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-ExtraBold.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-ExtraBold.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-ExtraBoldItalic.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-ExtraBoldItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-ExtraLight.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-ExtraLight.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-ExtraLightItalic.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-ExtraLightItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-Italic.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-Italic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-Light.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-Light.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-LightItalic.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-LightItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-Medium.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-Medium.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-MediumItalic.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-MediumItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-Regular.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-Regular.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-SemiBold.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-SemiBold.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-SemiBoldItalic.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-SemiBoldItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-Thin.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-Thin.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/Montserrat-ThinItalic.ttf b/backendpanel/assetreset/fonts/montserrat/Montserrat-ThinItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/montserrat/OFL.txt b/backendpanel/assetreset/fonts/montserrat/OFL.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-Black.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-Black.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-BlackItalic.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-BlackItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-Bold.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-Bold.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-BoldItalic.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-BoldItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-ExtraBold.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-ExtraBold.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-ExtraBoldItalic.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-ExtraBoldItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-ExtraLight.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-ExtraLight.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-ExtraLightItalic.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-ExtraLightItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-Italic.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-Italic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-Light.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-Light.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-LightItalic.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-LightItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-Medium.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-Medium.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-MediumItalic.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-MediumItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-Regular.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-Regular.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-SemiBold.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-SemiBold.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-SemiBoldItalic.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-SemiBoldItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-Thin.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-Thin.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/poppins/Poppins-ThinItalic.ttf b/backendpanel/assetreset/fonts/poppins/Poppins-ThinItalic.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/ubuntu/NeoSansPro_Medium.ttf b/backendpanel/assetreset/fonts/ubuntu/NeoSansPro_Medium.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/ubuntu/NeoSans_Pro_Regular.ttf b/backendpanel/assetreset/fonts/ubuntu/NeoSans_Pro_Regular.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/fonts/ubuntu/UFL.txt b/backendpanel/assetreset/fonts/ubuntu/UFL.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/images/icons/favicon.ico b/backendpanel/assetreset/images/icons/favicon.ico
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/images/icons/icon-google.png b/backendpanel/assetreset/images/icons/icon-google.png
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/images/icons/map-marker.png b/backendpanel/assetreset/images/icons/map-marker.png
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/images/icons/symbol-01.png b/backendpanel/assetreset/images/icons/symbol-01.png
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/images/lupapass.png b/backendpanel/assetreset/images/lupapass.png
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/js/main.js b/backendpanel/assetreset/js/main.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/animate/animate.css b/backendpanel/assetreset/vendor/animate/animate.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/animsition/css/animsition.css b/backendpanel/assetreset/vendor/animsition/css/animsition.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/animsition/css/animsition.min.css b/backendpanel/assetreset/vendor/animsition/css/animsition.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/animsition/js/animsition.js b/backendpanel/assetreset/vendor/animsition/js/animsition.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/animsition/js/animsition.min.js b/backendpanel/assetreset/vendor/animsition/js/animsition.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-grid.css b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-grid.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-grid.css.map b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-grid.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-grid.min.css b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-grid.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-grid.min.css.map b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-grid.min.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-reboot.css b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-reboot.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-reboot.css.map b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-reboot.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-reboot.min.css b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-reboot.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-reboot.min.css.map b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap-reboot.min.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap.css b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap.css.map b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap.min.css b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/css/bootstrap.min.css.map b/backendpanel/assetreset/vendor/bootstrap/css/bootstrap.min.css.map
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/js/bootstrap.js b/backendpanel/assetreset/vendor/bootstrap/js/bootstrap.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/js/bootstrap.min.js b/backendpanel/assetreset/vendor/bootstrap/js/bootstrap.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/js/popper.js b/backendpanel/assetreset/vendor/bootstrap/js/popper.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/js/popper.min.js b/backendpanel/assetreset/vendor/bootstrap/js/popper.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/bootstrap/js/tooltip.js b/backendpanel/assetreset/vendor/bootstrap/js/tooltip.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/countdowntime/countdowntime.js b/backendpanel/assetreset/vendor/countdowntime/countdowntime.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/css-hamburgers/hamburgers.css b/backendpanel/assetreset/vendor/css-hamburgers/hamburgers.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/css-hamburgers/hamburgers.min.css b/backendpanel/assetreset/vendor/css-hamburgers/hamburgers.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/daterangepicker/daterangepicker.css b/backendpanel/assetreset/vendor/daterangepicker/daterangepicker.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/daterangepicker/daterangepicker.js b/backendpanel/assetreset/vendor/daterangepicker/daterangepicker.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/daterangepicker/moment.js b/backendpanel/assetreset/vendor/daterangepicker/moment.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/daterangepicker/moment.min.js b/backendpanel/assetreset/vendor/daterangepicker/moment.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/jquery/jquery-3.2.1.min.js b/backendpanel/assetreset/vendor/jquery/jquery-3.2.1.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/perfect-scrollbar/perfect-scrollbar.css b/backendpanel/assetreset/vendor/perfect-scrollbar/perfect-scrollbar.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/perfect-scrollbar/perfect-scrollbar.min.js b/backendpanel/assetreset/vendor/perfect-scrollbar/perfect-scrollbar.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/select2/select2.css b/backendpanel/assetreset/vendor/select2/select2.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/select2/select2.js b/backendpanel/assetreset/vendor/select2/select2.js
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/select2/select2.min.css b/backendpanel/assetreset/vendor/select2/select2.min.css
old mode 100644
new mode 100755
diff --git a/backendpanel/assetreset/vendor/select2/select2.min.js b/backendpanel/assetreset/vendor/select2/select2.min.js
old mode 100644
new mode 100755
diff --git a/backendpanel/composer.json b/backendpanel/composer.json
old mode 100644
new mode 100755
diff --git a/backendpanel/contributing.md b/backendpanel/contributing.md
old mode 100644
new mode 100755
diff --git a/backendpanel/env.example b/backendpanel/env.example
old mode 100644
new mode 100755
diff --git a/backendpanel/firebase.script b/backendpanel/firebase.script
old mode 100644
new mode 100755
diff --git a/backendpanel/images/admin/2670b76a14fe68f8b0c304b0e14bad2e.png b/backendpanel/images/admin/2670b76a14fe68f8b0c304b0e14bad2e.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/bank/050b41552c6251da855a60c75efcc411.png b/backendpanel/images/bank/050b41552c6251da855a60c75efcc411.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/bank/28481b866ae1669c9be14ca082a88ac7.png b/backendpanel/images/bank/28481b866ae1669c9be14ca082a88ac7.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/bank/ed6ffe9541050b4b1981f1aa0d876911.png b/backendpanel/images/bank/ed6ffe9541050b4b1981f1aa0d876911.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/berita/4b44fa4b846d34c033f82e4f2241df55.png b/backendpanel/images/berita/4b44fa4b846d34c033f82e4f2241df55.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/berita/f4ad5cf4363a513166c36d4a6d5421f0.png b/backendpanel/images/berita/f4ad5cf4363a513166c36d4a6d5421f0.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/berita/f9c2e5f57a6924498381f43023c1d115.png b/backendpanel/images/berita/f9c2e5f57a6924498381f43023c1d115.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/cabang/2ba0fe221d60882a1c31bc9061820dd4.png b/backendpanel/images/cabang/2ba0fe221d60882a1c31bc9061820dd4.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fitur/05e9c54e07609baad7821baa3841cbfe.png b/backendpanel/images/fitur/05e9c54e07609baad7821baa3841cbfe.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fitur/1356d50595b249821e83819243a64cbd.png b/backendpanel/images/fitur/1356d50595b249821e83819243a64cbd.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fitur/1b19f2d0f12457799b931222a101025d.png b/backendpanel/images/fitur/1b19f2d0f12457799b931222a101025d.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fitur/2b90345561cb20f41b2790a96ae9cadd.png b/backendpanel/images/fitur/2b90345561cb20f41b2790a96ae9cadd.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fitur/739e83fc25857bd1d03fc321d00b4704.png b/backendpanel/images/fitur/739e83fc25857bd1d03fc321d00b4704.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fitur/88cc90f2853e86b96f1433bcb3a2ea54.png b/backendpanel/images/fitur/88cc90f2853e86b96f1433bcb3a2ea54.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fitur/9bfc1d16c7470f18c71711cf42d22784.png b/backendpanel/images/fitur/9bfc1d16c7470f18c71711cf42d22784.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fitur/c7b5ccf5528f39356e868f2d5b7d4940.png b/backendpanel/images/fitur/c7b5ccf5528f39356e868f2d5b7d4940.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fitur/dfa5bf925cd8b05cd36f698c1f78360b.png b/backendpanel/images/fitur/dfa5bf925cd8b05cd36f698c1f78360b.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fitur/e3f95f07680dbb88b340a577744b50b0.png b/backendpanel/images/fitur/e3f95f07680dbb88b340a577744b50b0.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fitur/ef39d3d4a6bba7bd6c5965e40817c42b.png b/backendpanel/images/fitur/ef39d3d4a6bba7bd6c5965e40817c42b.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fotoberkas/ktp/1667890733-25224.jpg b/backendpanel/images/fotoberkas/ktp/1667890733-25224.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fotoberkas/ktp/1667962540-54541.jpg b/backendpanel/images/fotoberkas/ktp/1667962540-54541.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fotoberkas/ktp/1667963685-12505.jpg b/backendpanel/images/fotoberkas/ktp/1667963685-12505.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fotoberkas/ktp/1668132997-6598.jpg b/backendpanel/images/fotoberkas/ktp/1668132997-6598.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fotoberkas/sim/1667962540-23113.jpg b/backendpanel/images/fotoberkas/sim/1667962540-23113.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fotoberkas/sim/1667963685-79172.jpg b/backendpanel/images/fotoberkas/sim/1667963685-79172.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fotoberkas/stnk/1667962540-11935.jpg b/backendpanel/images/fotoberkas/stnk/1667962540-11935.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fotoberkas/stnk/1667963685-294.jpg b/backendpanel/images/fotoberkas/stnk/1667963685-294.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fotodriver/1667962540-31210.jpg b/backendpanel/images/fotodriver/1667962540-31210.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/fotodriver/1667963685-37809.jpg b/backendpanel/images/fotodriver/1667963685-37809.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/active.png b/backendpanel/images/icon/active.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/bekerja.png b/backendpanel/images/icon/bekerja.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/bicycle.png b/backendpanel/images/icon/bicycle.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/bike.png b/backendpanel/images/icon/bike.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/deliverybike.png b/backendpanel/images/icon/deliverybike.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/hatchback.png b/backendpanel/images/icon/hatchback.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/nonactive.png b/backendpanel/images/icon/nonactive.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/sedan.png b/backendpanel/images/icon/sedan.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/suv.png b/backendpanel/images/icon/suv.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/truck.png b/backendpanel/images/icon/truck.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/tuktuk.png b/backendpanel/images/icon/tuktuk.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/icon/van.png b/backendpanel/images/icon/van.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/itemmerchant/1667968387-41943.jpg b/backendpanel/images/itemmerchant/1667968387-41943.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/itemmerchant/1668153470-59806.jpg b/backendpanel/images/itemmerchant/1668153470-59806.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/itemmerchant/1668153527-22826.jpg b/backendpanel/images/itemmerchant/1668153527-22826.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/itemmerchant/1668153587-91249.jpg b/backendpanel/images/itemmerchant/1668153587-91249.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/itemmerchant/1668479239-82904.jpg b/backendpanel/images/itemmerchant/1668479239-82904.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/itemmerchant/1668479346-9696.jpg b/backendpanel/images/itemmerchant/1668479346-9696.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/merchant/1668132997-54956.jpg b/backendpanel/images/merchant/1668132997-54956.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/merchant/1668157611-92170.jpg b/backendpanel/images/merchant/1668157611-92170.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/pelanggan/1667206247-29454.jpg b/backendpanel/images/pelanggan/1667206247-29454.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/pelanggan/1667962156-56150.jpg b/backendpanel/images/pelanggan/1667962156-56150.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/pelanggan/1667973044-7166.jpg b/backendpanel/images/pelanggan/1667973044-7166.jpg
old mode 100644
new mode 100755
diff --git a/backendpanel/images/promo/831e5a9fc55d3aea403d167e0386af44.png b/backendpanel/images/promo/831e5a9fc55d3aea403d167e0386af44.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/promo/d32a9741ad9f8a52a2d45f0d52d88cac.png b/backendpanel/images/promo/d32a9741ad9f8a52a2d45f0d52d88cac.png
old mode 100644
new mode 100755
diff --git a/backendpanel/images/promo/ee17550cca653d4b48176847dd758f4f.png b/backendpanel/images/promo/ee17550cca653d4b48176847dd758f4f.png
old mode 100644
new mode 100755
diff --git a/backendpanel/index.php b/backendpanel/index.php
old mode 100644
new mode 100755
diff --git a/backendpanel/karung masuk b/backendpanel/karung masuk
old mode 100644
new mode 100755
diff --git a/backendpanel/license.txt b/backendpanel/license.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/ngojol-trial-firebase-adminsdk-lc81n-00c9e935db.json b/backendpanel/ngojol-trial-firebase-adminsdk-lc81n-00c9e935db.json
old mode 100644
new mode 100755
diff --git a/backendpanel/php.ini b/backendpanel/php.ini
old mode 100644
new mode 100755
diff --git a/backendpanel/quota_usage.sql b/backendpanel/quota_usage.sql
old mode 100644
new mode 100755
diff --git a/backendpanel/readme.rst b/backendpanel/readme.rst
old mode 100644
new mode 100755
diff --git a/backendpanel/requirements-test.txt b/backendpanel/requirements-test.txt
old mode 100644
new mode 100755
diff --git a/backendpanel/system/.htaccess b/backendpanel/system/.htaccess
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Benchmark.php b/backendpanel/system/core/Benchmark.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/CodeIgniter.php b/backendpanel/system/core/CodeIgniter.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Common.php b/backendpanel/system/core/Common.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Config.php b/backendpanel/system/core/Config.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Controller.php b/backendpanel/system/core/Controller.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Exceptions.php b/backendpanel/system/core/Exceptions.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Hooks.php b/backendpanel/system/core/Hooks.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Input.php b/backendpanel/system/core/Input.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Lang.php b/backendpanel/system/core/Lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Loader.php b/backendpanel/system/core/Loader.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Log.php b/backendpanel/system/core/Log.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Model.php b/backendpanel/system/core/Model.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Output.php b/backendpanel/system/core/Output.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Router.php b/backendpanel/system/core/Router.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Security.php b/backendpanel/system/core/Security.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/URI.php b/backendpanel/system/core/URI.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/Utf8.php b/backendpanel/system/core/Utf8.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/compat/hash.php b/backendpanel/system/core/compat/hash.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/compat/index.html b/backendpanel/system/core/compat/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/compat/mbstring.php b/backendpanel/system/core/compat/mbstring.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/compat/password.php b/backendpanel/system/core/compat/password.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/compat/standard.php b/backendpanel/system/core/compat/standard.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/core/index.html b/backendpanel/system/core/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/DB.php b/backendpanel/system/database/DB.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/DB_cache.php b/backendpanel/system/database/DB_cache.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/DB_driver.php b/backendpanel/system/database/DB_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/DB_forge.php b/backendpanel/system/database/DB_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/DB_query_builder.php b/backendpanel/system/database/DB_query_builder.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/DB_result.php b/backendpanel/system/database/DB_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/DB_utility.php b/backendpanel/system/database/DB_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/cubrid/cubrid_driver.php b/backendpanel/system/database/drivers/cubrid/cubrid_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/cubrid/cubrid_forge.php b/backendpanel/system/database/drivers/cubrid/cubrid_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/cubrid/cubrid_result.php b/backendpanel/system/database/drivers/cubrid/cubrid_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/cubrid/cubrid_utility.php b/backendpanel/system/database/drivers/cubrid/cubrid_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/cubrid/index.html b/backendpanel/system/database/drivers/cubrid/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/ibase/ibase_driver.php b/backendpanel/system/database/drivers/ibase/ibase_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/ibase/ibase_forge.php b/backendpanel/system/database/drivers/ibase/ibase_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/ibase/ibase_result.php b/backendpanel/system/database/drivers/ibase/ibase_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/ibase/ibase_utility.php b/backendpanel/system/database/drivers/ibase/ibase_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/ibase/index.html b/backendpanel/system/database/drivers/ibase/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/index.html b/backendpanel/system/database/drivers/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mssql/index.html b/backendpanel/system/database/drivers/mssql/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mssql/mssql_driver.php b/backendpanel/system/database/drivers/mssql/mssql_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mssql/mssql_forge.php b/backendpanel/system/database/drivers/mssql/mssql_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mssql/mssql_result.php b/backendpanel/system/database/drivers/mssql/mssql_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mssql/mssql_utility.php b/backendpanel/system/database/drivers/mssql/mssql_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mysql/index.html b/backendpanel/system/database/drivers/mysql/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mysql/mysql_driver.php b/backendpanel/system/database/drivers/mysql/mysql_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mysql/mysql_forge.php b/backendpanel/system/database/drivers/mysql/mysql_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mysql/mysql_result.php b/backendpanel/system/database/drivers/mysql/mysql_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mysql/mysql_utility.php b/backendpanel/system/database/drivers/mysql/mysql_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mysqli/index.html b/backendpanel/system/database/drivers/mysqli/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mysqli/mysqli_driver.php b/backendpanel/system/database/drivers/mysqli/mysqli_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mysqli/mysqli_forge.php b/backendpanel/system/database/drivers/mysqli/mysqli_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mysqli/mysqli_result.php b/backendpanel/system/database/drivers/mysqli/mysqli_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/mysqli/mysqli_utility.php b/backendpanel/system/database/drivers/mysqli/mysqli_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/oci8/index.html b/backendpanel/system/database/drivers/oci8/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/oci8/oci8_driver.php b/backendpanel/system/database/drivers/oci8/oci8_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/oci8/oci8_forge.php b/backendpanel/system/database/drivers/oci8/oci8_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/oci8/oci8_result.php b/backendpanel/system/database/drivers/oci8/oci8_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/oci8/oci8_utility.php b/backendpanel/system/database/drivers/oci8/oci8_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/odbc/index.html b/backendpanel/system/database/drivers/odbc/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/odbc/odbc_driver.php b/backendpanel/system/database/drivers/odbc/odbc_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/odbc/odbc_forge.php b/backendpanel/system/database/drivers/odbc/odbc_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/odbc/odbc_result.php b/backendpanel/system/database/drivers/odbc/odbc_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/odbc/odbc_utility.php b/backendpanel/system/database/drivers/odbc/odbc_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/index.html b/backendpanel/system/database/drivers/pdo/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/pdo_driver.php b/backendpanel/system/database/drivers/pdo/pdo_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/pdo_forge.php b/backendpanel/system/database/drivers/pdo/pdo_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/pdo_result.php b/backendpanel/system/database/drivers/pdo/pdo_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/pdo_utility.php b/backendpanel/system/database/drivers/pdo/pdo_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/index.html b/backendpanel/system/database/drivers/pdo/subdrivers/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_4d_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_4d_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_cubrid_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_cubrid_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_dblib_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_dblib_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_firebird_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_firebird_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_ibm_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_ibm_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_informix_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_informix_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_informix_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_mysql_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_mysql_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_oci_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_oci_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_odbc_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_odbc_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_pgsql_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_pgsql_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_sqlite_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php b/backendpanel/system/database/drivers/pdo/subdrivers/pdo_sqlsrv_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/postgre/index.html b/backendpanel/system/database/drivers/postgre/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/postgre/postgre_driver.php b/backendpanel/system/database/drivers/postgre/postgre_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/postgre/postgre_forge.php b/backendpanel/system/database/drivers/postgre/postgre_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/postgre/postgre_result.php b/backendpanel/system/database/drivers/postgre/postgre_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/postgre/postgre_utility.php b/backendpanel/system/database/drivers/postgre/postgre_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlite/index.html b/backendpanel/system/database/drivers/sqlite/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlite/sqlite_driver.php b/backendpanel/system/database/drivers/sqlite/sqlite_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlite/sqlite_forge.php b/backendpanel/system/database/drivers/sqlite/sqlite_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlite/sqlite_result.php b/backendpanel/system/database/drivers/sqlite/sqlite_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlite/sqlite_utility.php b/backendpanel/system/database/drivers/sqlite/sqlite_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlite3/index.html b/backendpanel/system/database/drivers/sqlite3/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlite3/sqlite3_driver.php b/backendpanel/system/database/drivers/sqlite3/sqlite3_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlite3/sqlite3_forge.php b/backendpanel/system/database/drivers/sqlite3/sqlite3_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlite3/sqlite3_result.php b/backendpanel/system/database/drivers/sqlite3/sqlite3_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlite3/sqlite3_utility.php b/backendpanel/system/database/drivers/sqlite3/sqlite3_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlsrv/index.html b/backendpanel/system/database/drivers/sqlsrv/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlsrv/sqlsrv_driver.php b/backendpanel/system/database/drivers/sqlsrv/sqlsrv_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlsrv/sqlsrv_forge.php b/backendpanel/system/database/drivers/sqlsrv/sqlsrv_forge.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlsrv/sqlsrv_result.php b/backendpanel/system/database/drivers/sqlsrv/sqlsrv_result.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/drivers/sqlsrv/sqlsrv_utility.php b/backendpanel/system/database/drivers/sqlsrv/sqlsrv_utility.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/database/index.html b/backendpanel/system/database/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/fonts/index.html b/backendpanel/system/fonts/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/fonts/texb.ttf b/backendpanel/system/fonts/texb.ttf
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/array_helper.php b/backendpanel/system/helpers/array_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/captcha_helper.php b/backendpanel/system/helpers/captcha_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/cookie_helper.php b/backendpanel/system/helpers/cookie_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/date_helper.php b/backendpanel/system/helpers/date_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/directory_helper.php b/backendpanel/system/helpers/directory_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/download_helper.php b/backendpanel/system/helpers/download_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/email_helper.php b/backendpanel/system/helpers/email_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/file_helper.php b/backendpanel/system/helpers/file_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/form_helper.php b/backendpanel/system/helpers/form_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/gunawan_helper.php b/backendpanel/system/helpers/gunawan_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/html_helper.php b/backendpanel/system/helpers/html_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/index.html b/backendpanel/system/helpers/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/inflector_helper.php b/backendpanel/system/helpers/inflector_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/language_helper.php b/backendpanel/system/helpers/language_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/mdtrans_helper.php b/backendpanel/system/helpers/mdtrans_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/number_helper.php b/backendpanel/system/helpers/number_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/path_helper.php b/backendpanel/system/helpers/path_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/security_helper.php b/backendpanel/system/helpers/security_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/smiley_helper.php b/backendpanel/system/helpers/smiley_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/string_helper.php b/backendpanel/system/helpers/string_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/text_helper.php b/backendpanel/system/helpers/text_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/typography_helper.php b/backendpanel/system/helpers/typography_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/url_helper.php b/backendpanel/system/helpers/url_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/helpers/xml_helper.php b/backendpanel/system/helpers/xml_helper.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/index.html b/backendpanel/system/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/calendar_lang.php b/backendpanel/system/language/english/calendar_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/date_lang.php b/backendpanel/system/language/english/date_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/db_lang.php b/backendpanel/system/language/english/db_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/email_lang.php b/backendpanel/system/language/english/email_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/form_validation_lang.php b/backendpanel/system/language/english/form_validation_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/ftp_lang.php b/backendpanel/system/language/english/ftp_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/imglib_lang.php b/backendpanel/system/language/english/imglib_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/index.html b/backendpanel/system/language/english/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/migration_lang.php b/backendpanel/system/language/english/migration_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/number_lang.php b/backendpanel/system/language/english/number_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/pagination_lang.php b/backendpanel/system/language/english/pagination_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/profiler_lang.php b/backendpanel/system/language/english/profiler_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/unit_test_lang.php b/backendpanel/system/language/english/unit_test_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/english/upload_lang.php b/backendpanel/system/language/english/upload_lang.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/language/index.html b/backendpanel/system/language/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Cache/Cache.php b/backendpanel/system/libraries/Cache/Cache.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Cache/drivers/Cache_apc.php b/backendpanel/system/libraries/Cache/drivers/Cache_apc.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Cache/drivers/Cache_dummy.php b/backendpanel/system/libraries/Cache/drivers/Cache_dummy.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Cache/drivers/Cache_file.php b/backendpanel/system/libraries/Cache/drivers/Cache_file.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Cache/drivers/Cache_memcached.php b/backendpanel/system/libraries/Cache/drivers/Cache_memcached.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Cache/drivers/Cache_redis.php b/backendpanel/system/libraries/Cache/drivers/Cache_redis.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Cache/drivers/Cache_wincache.php b/backendpanel/system/libraries/Cache/drivers/Cache_wincache.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Cache/drivers/index.html b/backendpanel/system/libraries/Cache/drivers/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Cache/index.html b/backendpanel/system/libraries/Cache/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Calendar.php b/backendpanel/system/libraries/Calendar.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Cart.php b/backendpanel/system/libraries/Cart.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Driver.php b/backendpanel/system/libraries/Driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Email.php b/backendpanel/system/libraries/Email.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Encrypt.php b/backendpanel/system/libraries/Encrypt.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Encryption.php b/backendpanel/system/libraries/Encryption.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Form_validation.php b/backendpanel/system/libraries/Form_validation.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Ftp.php b/backendpanel/system/libraries/Ftp.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Image_lib.php b/backendpanel/system/libraries/Image_lib.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Javascript.php b/backendpanel/system/libraries/Javascript.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Javascript/Jquery.php b/backendpanel/system/libraries/Javascript/Jquery.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Javascript/index.html b/backendpanel/system/libraries/Javascript/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Migration.php b/backendpanel/system/libraries/Migration.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Pagination.php b/backendpanel/system/libraries/Pagination.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Parser.php b/backendpanel/system/libraries/Parser.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Profiler.php b/backendpanel/system/libraries/Profiler.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Session/Session.php b/backendpanel/system/libraries/Session/Session.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Session/SessionHandlerInterface.php b/backendpanel/system/libraries/Session/SessionHandlerInterface.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Session/Session_driver.php b/backendpanel/system/libraries/Session/Session_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Session/drivers/Session_database_driver.php b/backendpanel/system/libraries/Session/drivers/Session_database_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Session/drivers/Session_files_driver.php b/backendpanel/system/libraries/Session/drivers/Session_files_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Session/drivers/Session_memcached_driver.php b/backendpanel/system/libraries/Session/drivers/Session_memcached_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Session/drivers/Session_redis_driver.php b/backendpanel/system/libraries/Session/drivers/Session_redis_driver.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Session/drivers/index.html b/backendpanel/system/libraries/Session/drivers/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Session/index.html b/backendpanel/system/libraries/Session/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Table.php b/backendpanel/system/libraries/Table.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Trackback.php b/backendpanel/system/libraries/Trackback.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Typography.php b/backendpanel/system/libraries/Typography.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Unit_test.php b/backendpanel/system/libraries/Unit_test.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Upload.php b/backendpanel/system/libraries/Upload.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/User_agent.php b/backendpanel/system/libraries/User_agent.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Xmlrpc.php b/backendpanel/system/libraries/Xmlrpc.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Xmlrpcs.php b/backendpanel/system/libraries/Xmlrpcs.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/Zip.php b/backendpanel/system/libraries/Zip.php
old mode 100644
new mode 100755
diff --git a/backendpanel/system/libraries/index.html b/backendpanel/system/libraries/index.html
old mode 100644
new mode 100755
diff --git a/backendpanel/test_api.py b/backendpanel/test_api.py
old mode 100644
new mode 100755
diff --git a/backendpanel/x.env b/backendpanel/x.env
old mode 100644
new mode 100755
diff --git a/build-debug-apks.sh b/build-debug-apks.sh
new file mode 100755
index 0000000..62ea359
--- /dev/null
+++ b/build-debug-apks.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# Build debug APKs for OnTime User, Driver, and Merchant apps.
+# Requires: JDK 17+, Android SDK (API 33), Gradle (or use wrapper).
+# Run from repo root: ./build-debug-apks.sh
+
+set -e
+REPO_ROOT="$(cd "$(dirname "$0")" && pwd)"
+cd "$REPO_ROOT"
+
+# Merchant uses same keystore as User; copy if missing
+KEYSTORE_SRC="$REPO_ROOT/OnTime_User_live/app/ontimekeystore.jks"
+KEYSTORE_MERCHANT="$REPO_ROOT/OnTime_Merchant_live/app/ontimekeystore.jks"
+if [ -f "$KEYSTORE_SRC" ] && [ ! -f "$KEYSTORE_MERCHANT" ]; then
+  echo "Copying keystore to Merchant app..."
+  cp "$KEYSTORE_SRC" "$KEYSTORE_MERCHANT"
+fi
+
+echo "=== Building OnTime User (debug) ==="
+cd OnTime_User_live
+./gradlew assembleDebug --no-daemon
+cd "$REPO_ROOT"
+
+echo "=== Building OnTime Driver (debug) ==="
+cd OnTime_Driver_live
+./gradlew assembleDebug --no-daemon
+cd "$REPO_ROOT"
+
+echo "=== Building OnTime Merchant (debug) ==="
+cd OnTime_Merchant_live
+./gradlew assembleDebug --no-daemon
+cd "$REPO_ROOT"
+
+echo ""
+echo "=== Debug APKs built ==="
+echo "User:    $REPO_ROOT/OnTime_User_live/app/build/outputs/apk/debug/app-debug.apk"
+echo "Driver:  $REPO_ROOT/OnTime_Driver_live/app/build/outputs/apk/debug/app-debug.apk"
+echo "Merchant: $REPO_ROOT/OnTime_Merchant_live/app/build/outputs/apk/debug/app-debug.apk"
diff --git a/lib/PRDownloader/.gitignore b/lib/PRDownloader/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/CONTRIBUTING.md b/lib/PRDownloader/CONTRIBUTING.md
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/LICENSE b/lib/PRDownloader/LICENSE
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/README.md b/lib/PRDownloader/README.md
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/.gitignore b/lib/PRDownloader/app/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/build.gradle b/lib/PRDownloader/app/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/proguard-rules.pro b/lib/PRDownloader/app/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/androidTest/java/com/sample/ExampleInstrumentedTest.java b/lib/PRDownloader/app/src/androidTest/java/com/sample/ExampleInstrumentedTest.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/AndroidManifest.xml b/lib/PRDownloader/app/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/java/com/sample/MainActivity.java b/lib/PRDownloader/app/src/main/java/com/sample/MainActivity.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/java/com/sample/SampleApp.java b/lib/PRDownloader/app/src/main/java/com/sample/SampleApp.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/java/com/sample/utils/Utils.java b/lib/PRDownloader/app/src/main/java/com/sample/utils/Utils.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/lib/PRDownloader/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/drawable/border_black.xml b/lib/PRDownloader/app/src/main/res/drawable/border_black.xml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/drawable/ic_launcher_background.xml b/lib/PRDownloader/app/src/main/res/drawable/ic_launcher_background.xml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/layout/activity_main.xml b/lib/PRDownloader/app/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/lib/PRDownloader/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher.png b/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/lib/PRDownloader/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher.png b/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/lib/PRDownloader/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/lib/PRDownloader/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/lib/PRDownloader/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/lib/PRDownloader/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/values/colors.xml b/lib/PRDownloader/app/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/values/strings.xml b/lib/PRDownloader/app/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/main/res/values/styles.xml b/lib/PRDownloader/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/app/src/test/java/com/sample/ExampleUnitTest.java b/lib/PRDownloader/app/src/test/java/com/sample/ExampleUnitTest.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/assets/prdownloader.png b/lib/PRDownloader/assets/prdownloader.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/assets/sample_download.png b/lib/PRDownloader/assets/sample_download.png
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/build.gradle b/lib/PRDownloader/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/gradle.properties b/lib/PRDownloader/gradle.properties
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/gradle/wrapper/gradle-wrapper.properties b/lib/PRDownloader/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/gradlew.bat b/lib/PRDownloader/gradlew.bat
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/jitpack.yml b/lib/PRDownloader/jitpack.yml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/.gitignore b/lib/PRDownloader/prdownloader/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/build.gradle b/lib/PRDownloader/prdownloader/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/proguard-rules.pro b/lib/PRDownloader/prdownloader/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/androidTest/java/com/downloader/ExampleInstrumentedTest.java b/lib/PRDownloader/prdownloader/src/androidTest/java/com/downloader/ExampleInstrumentedTest.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Constants.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Constants.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Error.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Error.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnCancelListener.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnCancelListener.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnDownloadListener.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnDownloadListener.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnPauseListener.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnPauseListener.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnProgressListener.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnProgressListener.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnStartOrResumeListener.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/OnStartOrResumeListener.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloader.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloader.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloaderConfig.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/PRDownloaderConfig.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Priority.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Priority.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Progress.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Progress.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Response.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Response.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Status.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/Status.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/Core.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/Core.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DefaultExecutorSupplier.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DefaultExecutorSupplier.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadExecutor.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadExecutor.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadFutureTask.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/DownloadFutureTask.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/ExecutorSupplier.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/ExecutorSupplier.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/MainThreadExecutor.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/MainThreadExecutor.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/PriorityThreadFactory.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/core/PriorityThreadFactory.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/AppDbHelper.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/AppDbHelper.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DatabaseOpenHelper.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DatabaseOpenHelper.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DbHelper.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DbHelper.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DownloadModel.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/DownloadModel.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/NoOpsDbHelper.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/database/NoOpsDbHelper.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/handler/ProgressHandler.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/handler/ProgressHandler.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/DefaultHttpClient.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/DefaultHttpClient.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/HttpClient.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/httpclient/HttpClient.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/ComponentHolder.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/ComponentHolder.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRequestQueue.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRequestQueue.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRunnable.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadRunnable.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadTask.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/DownloadTask.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/SynchronousCall.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/SynchronousCall.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadOutputStream.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadOutputStream.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadRandomAccessFile.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/internal/stream/FileDownloadRandomAccessFile.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequest.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequest.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequestBuilder.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/DownloadRequestBuilder.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/RequestBuilder.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/request/RequestBuilder.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/java/com/downloader/utils/Utils.java b/lib/PRDownloader/prdownloader/src/main/java/com/downloader/utils/Utils.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/main/res/values/strings.xml b/lib/PRDownloader/prdownloader/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/prdownloader/src/test/java/com/downloader/ExampleUnitTest.java b/lib/PRDownloader/prdownloader/src/test/java/com/downloader/ExampleUnitTest.java
old mode 100644
new mode 100755
diff --git a/lib/PRDownloader/settings.gradle b/lib/PRDownloader/settings.gradle
old mode 100644
new mode 100755
diff --git a/lib/README.md b/lib/README.md
old mode 100644
new mode 100755
diff --git a/lib/RatingView/.gitignore b/lib/RatingView/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/RatingView/LICENSE b/lib/RatingView/LICENSE
old mode 100644
new mode 100755
diff --git a/lib/RatingView/README.md b/lib/RatingView/README.md
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/.gitignore b/lib/RatingView/app/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/build.gradle b/lib/RatingView/app/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/proguard-rules.pro b/lib/RatingView/app/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/AndroidManifest.xml b/lib/RatingView/app/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/java/com/github/ornolfr/ratingview_sample/MainActivity.java b/lib/RatingView/app/src/main/java/com/github/ornolfr/ratingview_sample/MainActivity.java
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/res/layout/activity_main.xml b/lib/RatingView/app/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/res/mipmap-hdpi/ic_launcher.png b/lib/RatingView/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/res/mipmap-mdpi/ic_launcher.png b/lib/RatingView/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/lib/RatingView/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/lib/RatingView/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/lib/RatingView/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/res/values-w820dp/dimens.xml b/lib/RatingView/app/src/main/res/values-w820dp/dimens.xml
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/res/values/colors.xml b/lib/RatingView/app/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/res/values/dimens.xml b/lib/RatingView/app/src/main/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/res/values/strings.xml b/lib/RatingView/app/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/lib/RatingView/app/src/main/res/values/styles.xml b/lib/RatingView/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/lib/RatingView/build.gradle b/lib/RatingView/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/RatingView/gradle.properties b/lib/RatingView/gradle.properties
old mode 100644
new mode 100755
diff --git a/lib/RatingView/gradle/wrapper/gradle-wrapper.properties b/lib/RatingView/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
diff --git a/lib/RatingView/gradlew b/lib/RatingView/gradlew
old mode 100644
new mode 100755
diff --git a/lib/RatingView/gradlew.bat b/lib/RatingView/gradlew.bat
old mode 100644
new mode 100755
diff --git a/lib/RatingView/rating-view/.gitignore b/lib/RatingView/rating-view/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/RatingView/rating-view/build.gradle b/lib/RatingView/rating-view/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/RatingView/rating-view/proguard-rules.pro b/lib/RatingView/rating-view/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/lib/RatingView/rating-view/src/main/AndroidManifest.xml b/lib/RatingView/rating-view/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/lib/RatingView/rating-view/src/main/java/com/github/ornolfr/ratingview/RatingView.java b/lib/RatingView/rating-view/src/main/java/com/github/ornolfr/ratingview/RatingView.java
old mode 100644
new mode 100755
diff --git a/lib/RatingView/rating-view/src/main/res/drawable/ic_star_empty.png b/lib/RatingView/rating-view/src/main/res/drawable/ic_star_empty.png
old mode 100644
new mode 100755
diff --git a/lib/RatingView/rating-view/src/main/res/drawable/ic_star_filled.png b/lib/RatingView/rating-view/src/main/res/drawable/ic_star_filled.png
old mode 100644
new mode 100755
diff --git a/lib/RatingView/rating-view/src/main/res/drawable/ic_star_half.png b/lib/RatingView/rating-view/src/main/res/drawable/ic_star_half.png
old mode 100644
new mode 100755
diff --git a/lib/RatingView/rating-view/src/main/res/values/attrs_rating_view.xml b/lib/RatingView/rating-view/src/main/res/values/attrs_rating_view.xml
old mode 100644
new mode 100755
diff --git a/lib/RatingView/rating-view/src/main/res/values/strings.xml b/lib/RatingView/rating-view/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/lib/RatingView/settings.gradle b/lib/RatingView/settings.gradle
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/.gitignore b/lib/TextDrawable/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/LICENSE b/lib/TextDrawable/LICENSE
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/README.md b/lib/TextDrawable/README.md
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/build.gradle b/lib/TextDrawable/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/gradle.properties b/lib/TextDrawable/gradle.properties
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/gradle/wrapper/gradle-wrapper.properties b/lib/TextDrawable/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/gradlew.bat b/lib/TextDrawable/gradlew.bat
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/library/.gitignore b/lib/TextDrawable/library/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/library/build.gradle b/lib/TextDrawable/library/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/library/proguard-rules.pro b/lib/TextDrawable/library/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/library/src/main/AndroidManifest.xml b/lib/TextDrawable/library/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java b/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/TextDrawable.java
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java b/lib/TextDrawable/library/src/main/java/com/amulyakhare/textdrawable/util/ColorGenerator.java
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/.gitignore b/lib/TextDrawable/sample/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/build.gradle b/lib/TextDrawable/sample/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/proguard-rules.pro b/lib/TextDrawable/sample/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/AndroidManifest.xml b/lib/TextDrawable/sample/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/ListActivity.java b/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/ListActivity.java
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/MainActivity.java b/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/MainActivity.java
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataItem.java b/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataItem.java
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataSource.java b/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DataSource.java
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DrawableProvider.java b/lib/TextDrawable/sample/src/main/java/com/amulyakhare/td/sample/sample/DrawableProvider.java
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_alpha.png b/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_alpha.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm.9.png b/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm.9.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm1.9.png b/lib/TextDrawable/sample/src/main/res/drawable-hdpi/check_sm1.9.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_action_next_item.png b/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_action_next_item.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_launcher.png b/lib/TextDrawable/sample/src/main/res/drawable-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-ldpi/check_sm.9.png b/lib/TextDrawable/sample/src/main/res/drawable-ldpi/check_sm.9.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-mdpi/check_sm.9.png b/lib/TextDrawable/sample/src/main/res/drawable-mdpi/check_sm.9.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_action_next_item.png b/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_action_next_item.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_launcher.png b/lib/TextDrawable/sample/src/main/res/drawable-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/check_sm.9.png b/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/check_sm.9.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_action_next_item.png b/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_action_next_item.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_launcher.png b/lib/TextDrawable/sample/src/main/res/drawable-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/check_sm.9.png b/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/check_sm.9.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_action_next_item.png b/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_action_next_item.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_launcher.png b/lib/TextDrawable/sample/src/main/res/drawable-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/layout/activity_check_box.xml b/lib/TextDrawable/sample/src/main/res/layout/activity_check_box.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/layout/activity_list.xml b/lib/TextDrawable/sample/src/main/res/layout/activity_list.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/layout/activity_main.xml b/lib/TextDrawable/sample/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/layout/list_item_layout.xml b/lib/TextDrawable/sample/src/main/res/layout/list_item_layout.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/menu/check_box.xml b/lib/TextDrawable/sample/src/main/res/menu/check_box.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/menu/list.xml b/lib/TextDrawable/sample/src/main/res/menu/list.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/menu/main.xml b/lib/TextDrawable/sample/src/main/res/menu/main.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/values-w820dp/dimens.xml b/lib/TextDrawable/sample/src/main/res/values-w820dp/dimens.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/values/dimens.xml b/lib/TextDrawable/sample/src/main/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/values/strings.xml b/lib/TextDrawable/sample/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/sample/src/main/res/values/styles.xml b/lib/TextDrawable/sample/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/screens/screen1-material.png b/lib/TextDrawable/screens/screen1-material.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/screens/screen1.png b/lib/TextDrawable/screens/screen1.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/screens/screen2-material.png b/lib/TextDrawable/screens/screen2-material.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/screens/screen2.png b/lib/TextDrawable/screens/screen2.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/screens/screen3.png b/lib/TextDrawable/screens/screen3.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/screens/screen4.png b/lib/TextDrawable/screens/screen4.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/screens/screen5.png b/lib/TextDrawable/screens/screen5.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/screens/screen6.png b/lib/TextDrawable/screens/screen6.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/screens/screen7.png b/lib/TextDrawable/screens/screen7.png
old mode 100644
new mode 100755
diff --git a/lib/TextDrawable/settings.gradle b/lib/TextDrawable/settings.gradle
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/.circleci/config.yml b/lib/flexbox-layout/.circleci/config.yml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/.github/issue_template.md b/lib/flexbox-layout/.github/issue_template.md
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/.github/workflows/gradle-wrapper-validation.yml b/lib/flexbox-layout/.github/workflows/gradle-wrapper-validation.yml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/.gitignore b/lib/flexbox-layout/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/CONTRIBUTING.md b/lib/flexbox-layout/CONTRIBUTING.md
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/LICENSE b/lib/flexbox-layout/LICENSE
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/README.md b/lib/flexbox-layout/README.md
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/align-content.gif b/lib/flexbox-layout/assets/align-content.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/align-items.gif b/lib/flexbox-layout/assets/align-items.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/divider-beginning-middle.png b/lib/flexbox-layout/assets/divider-beginning-middle.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/flex-direction.gif b/lib/flexbox-layout/assets/flex-direction.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/flex-wrap.gif b/lib/flexbox-layout/assets/flex-wrap.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/flexbox-layoutmanager.gif b/lib/flexbox-layout/assets/flexbox-layoutmanager.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/flexbox-visual.png b/lib/flexbox-layout/assets/flexbox-visual.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/fluid-grid/nexus9-full-width.png b/lib/flexbox-layout/assets/fluid-grid/nexus9-full-width.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/fluid-grid/nexus9-half.png b/lib/flexbox-layout/assets/fluid-grid/nexus9-half.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/fluid-grid/nexus9-one-fourth.png b/lib/flexbox-layout/assets/fluid-grid/nexus9-one-fourth.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/fluid-grid/nexus9-three-fourth.png b/lib/flexbox-layout/assets/fluid-grid/nexus9-three-fourth.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/justify-content.gif b/lib/flexbox-layout/assets/justify-content.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/layout_alignSelf.gif b/lib/flexbox-layout/assets/layout_alignSelf.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/layout_flexBasisPercent.gif b/lib/flexbox-layout/assets/layout_flexBasisPercent.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/layout_flexGrow.gif b/lib/flexbox-layout/assets/layout_flexGrow.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/layout_flexShrink.gif b/lib/flexbox-layout/assets/layout_flexShrink.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/layout_maxWidth.gif b/lib/flexbox-layout/assets/layout_maxWidth.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/layout_minWidth.gif b/lib/flexbox-layout/assets/layout_minWidth.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/layout_order.gif b/lib/flexbox-layout/assets/layout_order.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/layout_wrapBefore.gif b/lib/flexbox-layout/assets/layout_wrapBefore.gif
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/assets/pngs/check_green_small.png b/lib/flexbox-layout/assets/pngs/check_green_small.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/build.gradle b/lib/flexbox-layout/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/build.gradle b/lib/flexbox-layout/demo-cat-gallery/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/proguard-rules.pro b/lib/flexbox-layout/demo-cat-gallery/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/AndroidManifest.xml b/lib/flexbox-layout/demo-cat-gallery/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatAdapter.kt b/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatAdapter.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt b/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/CatViewHolder.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt b/lib/flexbox-layout/demo-cat-gallery/src/main/java/com/google/android/flexbox/apps/catgallery/MainActivity.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_1.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_1.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_10.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_10.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_11.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_11.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_12.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_12.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_13.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_13.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_14.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_14.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_15.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_15.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_16.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_16.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_17.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_17.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_18.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_18.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_19.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_19.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_2.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_2.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_3.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_3.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_4.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_4.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_5.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_5.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_6.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_6.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_7.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_7.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_8.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_8.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_9.jpg b/lib/flexbox-layout/demo-cat-gallery/src/main/res/drawable/cat_9.jpg
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/activity_main.xml b/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/content_main.xml b/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/content_main.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/viewholder_cat.xml b/lib/flexbox-layout/demo-cat-gallery/src/main/res/layout/viewholder_cat.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-hdpi/ic_launcher.png b/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-mdpi/ic_launcher.png b/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xhdpi/ic_launcher.png b/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png b/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/lib/flexbox-layout/demo-cat-gallery/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/values-v21/styles.xml b/lib/flexbox-layout/demo-cat-gallery/src/main/res/values-v21/styles.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/colors.xml b/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/dimens.xml b/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/strings.xml b/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/styles.xml b/lib/flexbox-layout/demo-cat-gallery/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/build.gradle b/lib/flexbox-layout/demo-playground/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/proguard-rules.pro b/lib/flexbox-layout/demo-playground/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt b/lib/flexbox-layout/demo-playground/src/androidTest/java/com/google/android/apps/flexbox/test/MainActivityTest.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/AndroidManifest.xml b/lib/flexbox-layout/demo-playground/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/Extensions.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/Extensions.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemAdapter.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListener.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListener.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImpl.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImpl.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemChangedListenerImplRecyclerView.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemClickListener.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemEditFragment.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexItemViewHolder.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FlexboxLayoutFragment.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/FragmentHelper.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/MainActivity.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/RecyclerViewFragment.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/SettingsActivity.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/DimensionInputValidator.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/DimensionInputValidator.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FixedDimensionInputValidator.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FixedDimensionInputValidator.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FlexBasisPercentInputValidator.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/FlexBasisPercentInputValidator.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/InputValidator.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/InputValidator.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/IntegerInputValidator.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/IntegerInputValidator.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/NonNegativeDecimalInputValidator.kt b/lib/flexbox-layout/demo-playground/src/main/java/com/google/android/flexbox/validators/NonNegativeDecimalInputValidator.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_add_white_24dp.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_remove_white_24dp.png b/lib/flexbox-layout/demo-playground/src/main/res/drawable-hdpi/ic_remove_white_24dp.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_add_white_24dp.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_remove_white_24dp.png b/lib/flexbox-layout/demo-playground/src/main/res/drawable-mdpi/ic_remove_white_24dp.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png b/lib/flexbox-layout/demo-playground/src/main/res/drawable-xhdpi/ic_remove_white_24dp.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png b/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxhdpi/ic_remove_white_24dp.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png b/lib/flexbox-layout/demo-playground/src/main/res/drawable-xxxhdpi/ic_remove_white_24dp.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable/flex_item_background.xml b/lib/flexbox-layout/demo-playground/src/main/res/drawable/flex_item_background.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/drawable/side_nav_bar.xml b/lib/flexbox-layout/demo-playground/src/main/res/drawable/side_nav_bar.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/activity_main.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/app_bar_main.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/app_bar_main.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/content_main.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/content_main.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flex_item_edit.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flex_item_edit.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flexboxlayout.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_flexboxlayout.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_recyclerview.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/fragment_recyclerview.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/nav_header_main.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/nav_header_main.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_content.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_content.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_items.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_align_items.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_direction.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_direction.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_wrap.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_flex_wrap.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_item.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_item.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_justify_content.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/spinner_justify_content.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/layout/viewholder_flex_item.xml b/lib/flexbox-layout/demo-playground/src/main/res/layout/viewholder_flex_item.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/menu/activity_main_drawer.xml b/lib/flexbox-layout/demo-playground/src/main/res/menu/activity_main_drawer.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/menu/menu_main.xml b/lib/flexbox-layout/demo-playground/src/main/res/menu/menu_main.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/mipmap-hdpi/ic_launcher.png b/lib/flexbox-layout/demo-playground/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/mipmap-mdpi/ic_launcher.png b/lib/flexbox-layout/demo-playground/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xhdpi/ic_launcher.png b/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxhdpi/ic_launcher.png b/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/lib/flexbox-layout/demo-playground/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/values-v14/styles.xml b/lib/flexbox-layout/demo-playground/src/main/res/values-v14/styles.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/values-v21/styles.xml b/lib/flexbox-layout/demo-playground/src/main/res/values-v21/styles.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/values-w720dp/dimens.xml b/lib/flexbox-layout/demo-playground/src/main/res/values-w720dp/dimens.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/values/colors.xml b/lib/flexbox-layout/demo-playground/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/values/dimens.xml b/lib/flexbox-layout/demo-playground/src/main/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/values/strings.xml b/lib/flexbox-layout/demo-playground/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/values/styles.xml b/lib/flexbox-layout/demo-playground/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/demo-playground/src/main/res/xml/new_flex_item_preferences.xml b/lib/flexbox-layout/demo-playground/src/main/res/xml/new_flex_item_preferences.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/.gitignore b/lib/flexbox-layout/flexbox/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/build.gradle b/lib/flexbox-layout/flexbox/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/constants.gradle b/lib/flexbox-layout/flexbox/constants.gradle
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/maven-puglisher-plugin.gradle b/lib/flexbox-layout/flexbox/maven-puglisher-plugin.gradle
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/proguard-rules.txt b/lib/flexbox-layout/flexbox/proguard-rules.txt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/AndroidManifest.xml b/lib/flexbox-layout/flexbox/src/androidTest/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FakeFlexContainer.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FakeFlexContainer.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/FlexboxHelperTest.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/ConfigChangeActivity.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxAndroidTest.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerConfigChangeTest.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerConfigChangeTest.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxLayoutManagerTest.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxTestActivity.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/FlexboxTestActivity.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/IsEqualAllowingError.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/IsEqualAllowingError.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedInnerAdapter.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedInnerAdapter.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedOuterAdapter.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/NestedOuterAdapter.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapter.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapterMultiViewTypes.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestAdapterMultiViewTypes.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestUtil.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestUtil.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestViewHolder.kt b/lib/flexbox-layout/flexbox/src/androidTest/java/com/google/android/flexbox/test/TestViewHolder.kt
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider_thick.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/divider_thick.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/flex_item_background.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/drawable/flex_item_background.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test_overflowed.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_content_test_overflowed.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_wrap_content.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_baseline_wrap_content.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_parent_padding_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_parent_padding_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_items_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_self_stretch_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_align_self_stretch_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_column.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_column.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_row.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_child_needs_remeasure_row.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_column_align_items_center_margin_oneside.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_column_align_items_center_margin_oneside.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_row_align_items_center_margin_oneside.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_direction_row_align_items_center_margin_oneside.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_column.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_column.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_row.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_divider_test_direction_row.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_empty_children.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_empty_children.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_horizontal_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_horizontal_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_vertical_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_item_large_vertical_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_first_line_single_item.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_first_line_single_item.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_grow_set_for_rest.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_grow_set_for_rest.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_shrink_set_for_rest.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_first_view_gone_layout_shrink_set_for_rest.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_basis_percent_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_basis_percent_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_grow_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_grow_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent_direction_column.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_item_match_parent_direction_column.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_wrap_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flex_wrap_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrap_content.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrap_content.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_horizontalscrollview.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_horizontalscrollview.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_scrollview.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_flexbox_wrapped_with_scrollview.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_gone.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_gone.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_parent_padding.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_justify_content_with_parent_padding.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_upper_bound_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxheight_upper_bound_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_upper_bound_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_maxwidth_upper_bound_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_lower_bound_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_lower_bound_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minheight_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_lower_bound_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_lower_bound_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_minwidth_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_order_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_order_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_simple.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_simple.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_stretch_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_stretch_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_gone.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_gone.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_invisible.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_views_visibility_invisible.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_column.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_column.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_row.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_visibility_gone_first_item_in_flex_line_row.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_before_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_before_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_horizontal_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_horizontal_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_vertical_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_child_margin_vertical_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_grow.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_grow.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_shrink.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_column_shrink.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_grow.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_grow.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_shrink.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_content_child_bottom_margin_row_shrink.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_horizontal_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_horizontal_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_vertical_test.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_wrap_parent_padding_vertical_test.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_height_positive_flexgrow.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_height_positive_flexgrow.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_width_positive_flexgrow.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/activity_zero_width_positive_flexgrow.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_reverse.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_reverse.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_viewholder.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/recyclerview_viewholder.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview_wrap_horizontally.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_inner_recyclerview_wrap_horizontally.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_textview.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/viewholder_textview.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview_scroll_vertical.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/layout/wrapped_recyclerview_scroll_vertical.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/androidTest/res/values/strings.xml b/lib/flexbox-layout/flexbox/src/androidTest/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/AndroidManifest.xml b/lib/flexbox-layout/flexbox/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignContent.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignContent.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignItems.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignItems.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignSelf.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/AlignSelf.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexContainer.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexContainer.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexDirection.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexDirection.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexItem.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexItem.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexLine.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexLine.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexWrap.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexWrap.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxHelper.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxItemDecoration.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxItemDecoration.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayout.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/FlexboxLayoutManager.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/JustifyContent.java b/lib/flexbox-layout/flexbox/src/main/java/com/google/android/flexbox/JustifyContent.java
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/flexbox/src/main/res/values/attrs.xml b/lib/flexbox-layout/flexbox/src/main/res/values/attrs.xml
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/gradle.properties b/lib/flexbox-layout/gradle.properties
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/gradle/wrapper/gradle-wrapper.properties b/lib/flexbox-layout/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/gradlew.bat b/lib/flexbox-layout/gradlew.bat
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/settings.gradle b/lib/flexbox-layout/settings.gradle
old mode 100644
new mode 100755
diff --git a/lib/flexbox-layout/tool/codeStyleSettings.xml b/lib/flexbox-layout/tool/codeStyleSettings.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/.gitignore b/lib/overscroll-decor/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/LICENSE b/lib/overscroll-decor/LICENSE
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/README.md b/lib/overscroll-decor/README.md
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/.gitignore b/lib/overscroll-decor/app/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/build.gradle b/lib/overscroll-decor/app/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/proguard-rules.pro b/lib/overscroll-decor/app/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/AndroidManifest.xml b/lib/overscroll-decor/app/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/OverScrollDemoActivity.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/OverScrollDemoActivity.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoContentHelper.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoContentHelper.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoItem.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/control/DemoItem.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoGridAdapter.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoGridAdapter.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapter.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapter.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapterBase.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoListAdapterBase.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterBase.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterBase.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterHorizontal.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterHorizontal.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterVertical.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/DemoRecyclerAdapterVertical.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/GridViewDemoFragment.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/GridViewDemoFragment.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ListViewDemoFragment.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ListViewDemoFragment.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/MiscViewsDemoFragment.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/MiscViewsDemoFragment.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/NestedScrollViewDemoFragment.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/NestedScrollViewDemoFragment.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewDemoFragment.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewDemoFragment.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewStaggeredGridDemoFragment.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/RecyclerViewStaggeredGridDemoFragment.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ScrollViewDemoFragment.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ScrollViewDemoFragment.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ViewPagerDemoFragment.java b/lib/overscroll-decor/app/src/main/java/me/everything/overscrolldemo/view/ViewPagerDemoFragment.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/animator/fade_in_slow.xml b/lib/overscroll-decor/app/src/main/res/animator/fade_in_slow.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/animator/fade_out_quick.xml b/lib/overscroll-decor/app/src/main/res/animator/fade_out_quick.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/color/drawer_items_text.xml b/lib/overscroll-decor/app/src/main/res/color/drawer_items_text.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable-hdpi/app_icon.png b/lib/overscroll-decor/app/src/main/res/drawable-hdpi/app_icon.png
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_view_pager.png b/lib/overscroll-decor/app/src/main/res/drawable-hdpi/ic_view_pager.png
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable-ldpi/app_icon.png b/lib/overscroll-decor/app/src/main/res/drawable-ldpi/app_icon.png
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_view_pager.png b/lib/overscroll-decor/app/src/main/res/drawable-ldpi/ic_view_pager.png
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable-mdpi/app_icon.png b/lib/overscroll-decor/app/src/main/res/drawable-mdpi/app_icon.png
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_view_pager.png b/lib/overscroll-decor/app/src/main/res/drawable-mdpi/ic_view_pager.png
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/app_icon.png b/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/app_icon.png
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_view_pager.png b/lib/overscroll-decor/app/src/main/res/drawable-xhdpi/ic_view_pager.png
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/app_icon.png b/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/app_icon.png
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_view_pager.png b/lib/overscroll-decor/app/src/main/res/drawable-xxhdpi/ic_view_pager.png
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable/drawer_header_bkg.xml b/lib/overscroll-decor/app/src/main/res/drawable/drawer_header_bkg.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/drawable/drawer_items_bkg.xml b/lib/overscroll-decor/app/src/main/res/drawable/drawer_items_bkg.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo.xml b/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo_content.xml b/lib/overscroll-decor/app/src/main/res/layout/activity_overscroll_demo_content.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/drawer_header_overscroll_demo.xml b/lib/overscroll-decor/app/src/main/res/layout/drawer_header_overscroll_demo.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/grid_item.xml b/lib/overscroll-decor/app/src/main/res/layout/grid_item.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/gridview_overscroll_demo.xml b/lib/overscroll-decor/app/src/main/res/layout/gridview_overscroll_demo.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/horizontal_list_item.xml b/lib/overscroll-decor/app/src/main/res/layout/horizontal_list_item.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/list_item.xml b/lib/overscroll-decor/app/src/main/res/layout/list_item.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/listview_overscroll_demo.xml b/lib/overscroll-decor/app/src/main/res/layout/listview_overscroll_demo.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/misc_overscroll_demo.xml b/lib/overscroll-decor/app/src/main/res/layout/misc_overscroll_demo.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/nested_scrollview_demo.xml b/lib/overscroll-decor/app/src/main/res/layout/nested_scrollview_demo.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/recyclerview_overscroll_demo.xml b/lib/overscroll-decor/app/src/main/res/layout/recyclerview_overscroll_demo.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/recyclerview_stgrid_overscroll_demo.xml b/lib/overscroll-decor/app/src/main/res/layout/recyclerview_stgrid_overscroll_demo.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/scrollview_horizontal_item.xml b/lib/overscroll-decor/app/src/main/res/layout/scrollview_horizontal_item.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/scrollview_overscroll_demo.xml b/lib/overscroll-decor/app/src/main/res/layout/scrollview_overscroll_demo.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/scrollview_vertical_item.xml b/lib/overscroll-decor/app/src/main/res/layout/scrollview_vertical_item.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/vert_recycler.xml b/lib/overscroll-decor/app/src/main/res/layout/vert_recycler.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/vertical_list_item.xml b/lib/overscroll-decor/app/src/main/res/layout/vertical_list_item.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/layout/viewpager_overscroll_demo.xml b/lib/overscroll-decor/app/src/main/res/layout/viewpager_overscroll_demo.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/menu/activity_overscroll_demo_drawer_items.xml b/lib/overscroll-decor/app/src/main/res/menu/activity_overscroll_demo_drawer_items.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/values-v21/styles.xml b/lib/overscroll-decor/app/src/main/res/values-v21/styles.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/values-w820dp/dimens.xml b/lib/overscroll-decor/app/src/main/res/values-w820dp/dimens.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/values/colors.xml b/lib/overscroll-decor/app/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/values/dimens.xml b/lib/overscroll-decor/app/src/main/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/values/strings.xml b/lib/overscroll-decor/app/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/app/src/main/res/values/styles.xml b/lib/overscroll-decor/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/build.gradle b/lib/overscroll-decor/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/gradle.properties b/lib/overscroll-decor/gradle.properties
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/gradle/wrapper/gradle-wrapper.properties b/lib/overscroll-decor/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/.gitignore b/lib/overscroll-decor/liboverscroll/.gitignore
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/build.gradle b/lib/overscroll-decor/liboverscroll/build.gradle
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/publish-pom.gradle b/lib/overscroll-decor/liboverscroll/publish-pom.gradle
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/publishing.gradle b/lib/overscroll-decor/liboverscroll/publishing.gradle
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/AndroidManifest.xml b/lib/overscroll-decor/liboverscroll/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecorator.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecorator.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollDecor.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollDecor.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollState.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollState.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollStateListener.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollStateListener.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollUpdateListener.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/IOverScrollUpdateListener.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/ListenerStubs.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/ListenerStubs.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollBounceEffectDecoratorBase.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollBounceEffectDecoratorBase.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollDecoratorHelper.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/OverScrollDecoratorHelper.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecorator.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecorator.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/AbsListViewOverScrollDecorAdapter.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/AbsListViewOverScrollDecorAdapter.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/HorizontalScrollViewOverScrollDecorAdapter.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/HorizontalScrollViewOverScrollDecorAdapter.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/IOverScrollDecoratorAdapter.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/IOverScrollDecoratorAdapter.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/RecyclerViewOverScrollDecorAdapter.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/RecyclerViewOverScrollDecorAdapter.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ScrollViewOverScrollDecorAdapter.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ScrollViewOverScrollDecorAdapter.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/StaticOverScrollDecorAdapter.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/StaticOverScrollDecorAdapter.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ViewPagerOverScrollDecorAdapter.java b/lib/overscroll-decor/liboverscroll/src/main/java/me/everything/android/ui/overscroll/adapters/ViewPagerOverScrollDecorAdapter.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecoratorTest.java b/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/HorizontalOverScrollBounceEffectDecoratorTest.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecoratorTest.java b/lib/overscroll-decor/liboverscroll/src/test/java/me/everything/android/ui/overscroll/VerticalOverScrollBounceEffectDecoratorTest.java
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/recyclerview_demo.gif b/lib/overscroll-decor/recyclerview_demo.gif
old mode 100644
new mode 100755
diff --git a/lib/overscroll-decor/settings.gradle b/lib/overscroll-decor/settings.gradle
old mode 100644
new mode 100755
diff --git a/ontime_driver_flutter/.gitignore b/ontime_driver_flutter/.gitignore
new file mode 100644
index 0000000..3820a95
--- /dev/null
+++ b/ontime_driver_flutter/.gitignore
@@ -0,0 +1,45 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.build/
+.buildlog/
+.history
+.svn/
+.swiftpm/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
+/build/
+/coverage/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/ontime_driver_flutter/.metadata b/ontime_driver_flutter/.metadata
new file mode 100644
index 0000000..df13aa7
--- /dev/null
+++ b/ontime_driver_flutter/.metadata
@@ -0,0 +1,30 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "ff37bef603469fb030f2b72995ab929ccfc227f0"
+  channel: "stable"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+      base_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+    - platform: android
+      create_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+      base_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/ontime_driver_flutter/README.md b/ontime_driver_flutter/README.md
new file mode 100644
index 0000000..f40610a
--- /dev/null
+++ b/ontime_driver_flutter/README.md
@@ -0,0 +1,29 @@
+# Ontime Driver (Flutter)
+
+Flutter app for Ontime **driver**, using backend API at `https://apitest.semestaterpadu.my.id/api/`.
+
+## Setup
+
+- Flutter SDK (e.g. 3.19+)
+- Android: run `flutter create . --platforms=android` if needed.
+
+## Run / Build
+
+```bash
+flutter pub get
+flutter run
+# or
+flutter build apk --release
+```
+
+## Firebase (FCM)
+
+Add `google-services.json` to `android/app/` for push. FCM token is sent as `reg_id` on login when available.
+
+## Validation
+
+- **Login**: `Driver/login` (no_telepon or email + password, optional reg_id).
+- **Home / sync**: `Driver/home`, `Driver/syncronizing_account`.
+- **Job flow**: `Driver/accept`, `Driver/start`, `Driver/finish`.
+- **Location**: `Driver/update_location`.
+- Compare with `OnTime_Driver_live` and backendpanel API responses.
diff --git a/ontime_driver_flutter/analysis_options.yaml b/ontime_driver_flutter/analysis_options.yaml
new file mode 100644
index 0000000..0d29021
--- /dev/null
+++ b/ontime_driver_flutter/analysis_options.yaml
@@ -0,0 +1,28 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at https://dart.dev/lints.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/ontime_driver_flutter/android/.gitignore b/ontime_driver_flutter/android/.gitignore
new file mode 100644
index 0000000..be3943c
--- /dev/null
+++ b/ontime_driver_flutter/android/.gitignore
@@ -0,0 +1,14 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+.cxx/
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/to/reference-keystore
+key.properties
+**/*.keystore
+**/*.jks
diff --git a/ontime_driver_flutter/android/app/build.gradle.kts b/ontime_driver_flutter/android/app/build.gradle.kts
new file mode 100644
index 0000000..b5017be
--- /dev/null
+++ b/ontime_driver_flutter/android/app/build.gradle.kts
@@ -0,0 +1,44 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "com.example.ontime_driver_flutter"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "com.example.ontime_driver_flutter"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}
diff --git a/ontime_driver_flutter/android/app/src/debug/AndroidManifest.xml b/ontime_driver_flutter/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000..399f698
--- /dev/null
+++ b/ontime_driver_flutter/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/ontime_driver_flutter/android/app/src/main/AndroidManifest.xml b/ontime_driver_flutter/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..8b9503d
--- /dev/null
+++ b/ontime_driver_flutter/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,45 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:label="ontime_driver_flutter"
+        android:name="${applicationName}"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:taskAffinity=""
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
+            <meta-data
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+    </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
+</manifest>
diff --git a/ontime_driver_flutter/android/app/src/main/kotlin/com/example/ontime_driver_flutter/MainActivity.kt b/ontime_driver_flutter/android/app/src/main/kotlin/com/example/ontime_driver_flutter/MainActivity.kt
new file mode 100644
index 0000000..d3fb716
--- /dev/null
+++ b/ontime_driver_flutter/android/app/src/main/kotlin/com/example/ontime_driver_flutter/MainActivity.kt
@@ -0,0 +1,5 @@
+package com.example.ontime_driver_flutter
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity : FlutterActivity()
diff --git a/ontime_driver_flutter/android/app/src/main/res/drawable-v21/launch_background.xml b/ontime_driver_flutter/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 0000000..f74085f
--- /dev/null
+++ b/ontime_driver_flutter/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/ontime_driver_flutter/android/app/src/main/res/drawable/launch_background.xml b/ontime_driver_flutter/android/app/src/main/res/drawable/launch_background.xml
new file mode 100644
index 0000000..304732f
--- /dev/null
+++ b/ontime_driver_flutter/android/app/src/main/res/drawable/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/ontime_driver_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/ontime_driver_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..db77bb4
Binary files /dev/null and b/ontime_driver_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/ontime_driver_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/ontime_driver_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..17987b7
Binary files /dev/null and b/ontime_driver_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/ontime_driver_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/ontime_driver_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..09d4391
Binary files /dev/null and b/ontime_driver_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/ontime_driver_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ontime_driver_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..d5f1c8d
Binary files /dev/null and b/ontime_driver_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/ontime_driver_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/ontime_driver_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..4d6372e
Binary files /dev/null and b/ontime_driver_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/ontime_driver_flutter/android/app/src/main/res/values-night/styles.xml b/ontime_driver_flutter/android/app/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..06952be
--- /dev/null
+++ b/ontime_driver_flutter/android/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/ontime_driver_flutter/android/app/src/main/res/values/styles.xml b/ontime_driver_flutter/android/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..cb1ef88
--- /dev/null
+++ b/ontime_driver_flutter/android/app/src/main/res/values/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/ontime_driver_flutter/android/app/src/profile/AndroidManifest.xml b/ontime_driver_flutter/android/app/src/profile/AndroidManifest.xml
new file mode 100644
index 0000000..399f698
--- /dev/null
+++ b/ontime_driver_flutter/android/app/src/profile/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/ontime_driver_flutter/android/build.gradle.kts b/ontime_driver_flutter/android/build.gradle.kts
new file mode 100644
index 0000000..dbee657
--- /dev/null
+++ b/ontime_driver_flutter/android/build.gradle.kts
@@ -0,0 +1,24 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory =
+    rootProject.layout.buildDirectory
+        .dir("../../build")
+        .get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}
diff --git a/ontime_driver_flutter/android/gradle.properties b/ontime_driver_flutter/android/gradle.properties
new file mode 100644
index 0000000..fbee1d8
--- /dev/null
+++ b/ontime_driver_flutter/android/gradle.properties
@@ -0,0 +1,2 @@
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
+android.useAndroidX=true
diff --git a/ontime_driver_flutter/android/gradle/wrapper/gradle-wrapper.properties b/ontime_driver_flutter/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..e4ef43f
--- /dev/null
+++ b/ontime_driver_flutter/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
diff --git a/ontime_driver_flutter/android/settings.gradle.kts b/ontime_driver_flutter/android/settings.gradle.kts
new file mode 100644
index 0000000..ca7fe06
--- /dev/null
+++ b/ontime_driver_flutter/android/settings.gradle.kts
@@ -0,0 +1,26 @@
+pluginManagement {
+    val flutterSdkPath =
+        run {
+            val properties = java.util.Properties()
+            file("local.properties").inputStream().use { properties.load(it) }
+            val flutterSdkPath = properties.getProperty("flutter.sdk")
+            require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+            flutterSdkPath
+        }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+}
+
+include(":app")
diff --git a/ontime_driver_flutter/assets/images/.gitkeep b/ontime_driver_flutter/assets/images/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/ontime_driver_flutter/lib/core/app_config.dart b/ontime_driver_flutter/lib/core/app_config.dart
new file mode 100644
index 0000000..7f2ae5e
--- /dev/null
+++ b/ontime_driver_flutter/lib/core/app_config.dart
@@ -0,0 +1,10 @@
+class AppConfig {
+  static const String baseUrl = 'https://apitest.semestaterpadu.my.id/';
+  static const String apiBase = '${baseUrl}api/';
+
+  static const String imagesFitur = '${baseUrl}images/fitur/';
+  static const String imagesBank = '${baseUrl}images/bank/';
+  static const String imagesDriver = '${baseUrl}images/fotodriver/';
+  static const String imagesUser = '${baseUrl}images/pelanggan/';
+  static const String imagesMerchant = '${baseUrl}images/merchant/';
+}
diff --git a/ontime_driver_flutter/lib/core/app_router.dart b/ontime_driver_flutter/lib/core/app_router.dart
new file mode 100644
index 0000000..db94ce1
--- /dev/null
+++ b/ontime_driver_flutter/lib/core/app_router.dart
@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ontime_driver_flutter/features/auth/presentation/login_screen.dart';
+import 'package:ontime_driver_flutter/features/home/presentation/home_shell.dart';
+
+final _rootNavKey = GlobalKey<NavigatorState>(debugLabel: 'root');
+
+GoRouter createAppRouter() {
+  return GoRouter(
+    navigatorKey: _rootNavKey,
+    initialLocation: '/auth/login',
+    routes: [
+      GoRoute(
+        path: '/auth/login',
+        name: 'login',
+        pageBuilder: (_, __) => const MaterialPage(child: LoginScreen()),
+      ),
+      GoRoute(
+        path: '/home',
+        name: 'home',
+        pageBuilder: (_, __) => const MaterialPage(child: HomeShell()),
+      ),
+    ],
+  );
+}
diff --git a/ontime_driver_flutter/lib/core/app_theme.dart b/ontime_driver_flutter/lib/core/app_theme.dart
new file mode 100644
index 0000000..5c79913
--- /dev/null
+++ b/ontime_driver_flutter/lib/core/app_theme.dart
@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+
+class AppTheme {
+  static ThemeData light() {
+    final base = ThemeData.light(useMaterial3: true);
+    return base.copyWith(
+      colorScheme: ColorScheme.fromSeed(seedColor: const Color(0xFF00AEEF)),
+      scaffoldBackgroundColor: Colors.grey[50],
+      appBarTheme: const AppBarTheme(elevation: 0, centerTitle: true),
+      inputDecorationTheme: const InputDecorationTheme(border: OutlineInputBorder()),
+    );
+  }
+}
diff --git a/ontime_driver_flutter/lib/core/fcm_service.dart b/ontime_driver_flutter/lib/core/fcm_service.dart
new file mode 100644
index 0000000..9a6af85
--- /dev/null
+++ b/ontime_driver_flutter/lib/core/fcm_service.dart
@@ -0,0 +1,24 @@
+import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+
+/// FCM token for backend (Driver uses `reg_id` or `token`).
+class FcmService {
+  static bool _initialized = false;
+
+  static Future<void> init() async {
+    if (_initialized) return;
+    try {
+      await Firebase.initializeApp();
+      _initialized = true;
+    } catch (_) {}
+  }
+
+  static Future<String?> getToken() async {
+    if (!_initialized) return null;
+    try {
+      return await FirebaseMessaging.instance.getToken();
+    } catch (_) {
+      return null;
+    }
+  }
+}
diff --git a/ontime_driver_flutter/lib/data/api/api_client.dart b/ontime_driver_flutter/lib/data/api/api_client.dart
new file mode 100644
index 0000000..33ae34b
--- /dev/null
+++ b/ontime_driver_flutter/lib/data/api/api_client.dart
@@ -0,0 +1,24 @@
+import 'package:dio/dio.dart';
+import 'package:ontime_driver_flutter/core/app_config.dart';
+
+class ApiClient {
+  ApiClient({
+    required String? basicAuthUser,
+    required String? basicAuthPassword,
+  }) : _dio = Dio(
+          BaseOptions(
+            baseUrl: AppConfig.apiBase,
+            connectTimeout: const Duration(seconds: 15),
+            receiveTimeout: const Duration(seconds: 20),
+          ),
+        ) {
+    if (basicAuthUser != null && basicAuthPassword != null) {
+      final auth = '$basicAuthUser:$basicAuthPassword';
+      final encoded = String.fromCharCodes(auth.codeUnits);
+      _dio.options.headers['Authorization'] = 'Basic $encoded';
+    }
+  }
+
+  final Dio _dio;
+  Dio get raw => _dio;
+}
diff --git a/ontime_driver_flutter/lib/features/auth/application/auth_controller.dart b/ontime_driver_flutter/lib/features/auth/application/auth_controller.dart
new file mode 100644
index 0000000..497e09c
--- /dev/null
+++ b/ontime_driver_flutter/lib/features/auth/application/auth_controller.dart
@@ -0,0 +1,98 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:ontime_driver_flutter/data/api/api_client.dart';
+import 'package:ontime_driver_flutter/features/auth/data/driver_auth_api.dart';
+import 'package:ontime_driver_flutter/features/auth/data/models/driver_model.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class AuthState {
+  const AuthState({
+    this.driver,
+    this.isLoading = false,
+    this.errorMessage,
+  });
+
+  final DriverModel? driver;
+  final bool isLoading;
+  final String? errorMessage;
+
+  AuthState copyWith({
+    DriverModel? driver,
+    bool? isLoading,
+    String? errorMessage,
+  }) {
+    return AuthState(
+      driver: driver ?? this.driver,
+      isLoading: isLoading ?? this.isLoading,
+      errorMessage: errorMessage,
+    );
+  }
+}
+
+final authControllerProvider =
+    StateNotifierProvider<AuthController, AuthState>((ref) => AuthController());
+
+class AuthController extends StateNotifier<AuthState> {
+  AuthController() : super(const AuthState());
+
+  late final DriverAuthApi _api =
+      DriverAuthApi(ApiClient(basicAuthUser: null, basicAuthPassword: null));
+
+  Future<void> login({
+    String? phone,
+    String? email,
+    required String password,
+    String? fcmToken,
+  }) async {
+    state = state.copyWith(isLoading: true, errorMessage: null);
+    try {
+      final driver = await _api.login(
+        phone: phone,
+        email: email,
+        password: password,
+        fcmToken: fcmToken,
+      );
+      state = state.copyWith(driver: driver, isLoading: false);
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString('driver_id', driver.id);
+      await prefs.setString('driver_reg_id', driver.regId);
+      await prefs.setString('driver_phone', driver.noTelepon);
+      await prefs.setString('driver_email', driver.email);
+    } catch (e) {
+      state = state.copyWith(
+        isLoading: false,
+        errorMessage: e.toString().replaceFirst('Exception: ', ''),
+      );
+    }
+  }
+
+  Future<void> logout() async {
+    final driver = state.driver;
+    if (driver != null) {
+      try {
+        await _api.logout(driver.id);
+      } catch (_) {}
+    }
+    state = const AuthState();
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.remove('driver_id');
+    await prefs.remove('driver_reg_id');
+    await prefs.remove('driver_phone');
+    await prefs.remove('driver_email');
+  }
+
+  static Future<DriverModel?> getStoredDriver() async {
+    final prefs = await SharedPreferences.getInstance();
+    final id = prefs.getString('driver_id');
+    final phone = prefs.getString('driver_phone');
+    final email = prefs.getString('driver_email');
+    final regId = prefs.getString('driver_reg_id') ?? '';
+    if (id == null || (phone == null && email == null)) return null;
+    return DriverModel(
+      id: id,
+      namaDriver: '',
+      noTelepon: phone ?? '',
+      email: email ?? '',
+      regId: regId,
+    );
+  }
+}
diff --git a/ontime_driver_flutter/lib/features/auth/data/driver_auth_api.dart b/ontime_driver_flutter/lib/features/auth/data/driver_auth_api.dart
new file mode 100644
index 0000000..059c648
--- /dev/null
+++ b/ontime_driver_flutter/lib/features/auth/data/driver_auth_api.dart
@@ -0,0 +1,39 @@
+import 'package:dio/dio.dart';
+import 'package:ontime_driver_flutter/data/api/api_client.dart';
+import 'package:ontime_driver_flutter/features/auth/data/models/driver_model.dart';
+
+class DriverAuthApi {
+  DriverAuthApi(this._client);
+  final ApiClient _client;
+
+  Future<DriverModel> login({
+    String? phone,
+    String? email,
+    required String password,
+    String? fcmToken,
+  }) async {
+    final payload = <String, dynamic>{'password': password};
+    if (phone != null && phone.isNotEmpty) payload['no_telepon'] = phone;
+    if (email != null && email.isNotEmpty) payload['email'] = email;
+    if (fcmToken != null && fcmToken.isNotEmpty) payload['reg_id'] = fcmToken;
+
+    final Response<dynamic> response =
+        await _client.raw.post('Driver/login', data: payload);
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+
+    if (data['message'] == 'banned') throw Exception('banned');
+    if (data['code']?.toString() != '200') {
+      throw Exception(data['message'] ?? 'Login failed');
+    }
+
+    final list = data['data'] as List<dynamic>? ?? [];
+    if (list.isEmpty) throw Exception('Driver data not found');
+    return DriverModel.fromJson(list.first as Map<String, dynamic>);
+  }
+
+  Future<void> logout(String driverId) async {
+    await _client.raw.post('Driver/logout', data: {'id': driverId});
+  }
+}
diff --git a/ontime_driver_flutter/lib/features/auth/data/models/driver_model.dart b/ontime_driver_flutter/lib/features/auth/data/models/driver_model.dart
new file mode 100644
index 0000000..e2850f1
--- /dev/null
+++ b/ontime_driver_flutter/lib/features/auth/data/models/driver_model.dart
@@ -0,0 +1,41 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'driver_model.g.dart';
+
+@JsonSerializable()
+class DriverModel {
+  DriverModel({
+    required this.id,
+    required this.namaDriver,
+    required this.noTelepon,
+    required this.email,
+    required this.regId,
+    this.foto,
+    this.status,
+  });
+
+  @JsonKey(name: 'id')
+  final String id;
+
+  @JsonKey(name: 'nama_driver')
+  final String namaDriver;
+
+  @JsonKey(name: 'no_telepon')
+  final String noTelepon;
+
+  @JsonKey(name: 'email')
+  final String email;
+
+  @JsonKey(name: 'reg_id')
+  final String regId;
+
+  @JsonKey(name: 'foto')
+  final String? foto;
+
+  @JsonKey(name: 'status')
+  final int? status;
+
+  factory DriverModel.fromJson(Map<String, dynamic> json) =>
+      _$DriverModelFromJson(json);
+  Map<String, dynamic> toJson() => _$DriverModelToJson(this);
+}
diff --git a/ontime_driver_flutter/lib/features/auth/data/models/driver_model.g.dart b/ontime_driver_flutter/lib/features/auth/data/models/driver_model.g.dart
new file mode 100644
index 0000000..9ce867b
--- /dev/null
+++ b/ontime_driver_flutter/lib/features/auth/data/models/driver_model.g.dart
@@ -0,0 +1,24 @@
+part of 'driver_model.dart';
+
+DriverModel _$DriverModelFromJson(Map<String, dynamic> json) {
+  return DriverModel(
+    id: json['id'] as String? ?? '',
+    namaDriver: json['nama_driver'] as String? ?? '',
+    noTelepon: json['no_telepon'] as String? ?? '',
+    email: json['email'] as String? ?? '',
+    regId: json['reg_id'] as String? ?? '',
+    foto: json['foto'] as String?,
+    status: json['status'] as int?,
+  );
+}
+
+Map<String, dynamic> _$DriverModelToJson(DriverModel instance) =>
+    <String, dynamic>{
+      'id': instance.id,
+      'nama_driver': instance.namaDriver,
+      'no_telepon': instance.noTelepon,
+      'email': instance.email,
+      'reg_id': instance.regId,
+      'foto': instance.foto,
+      'status': instance.status,
+    };
diff --git a/ontime_driver_flutter/lib/features/auth/presentation/login_screen.dart b/ontime_driver_flutter/lib/features/auth/presentation/login_screen.dart
new file mode 100644
index 0000000..778cdc2
--- /dev/null
+++ b/ontime_driver_flutter/lib/features/auth/presentation/login_screen.dart
@@ -0,0 +1,97 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ontime_driver_flutter/core/fcm_service.dart';
+import 'package:ontime_driver_flutter/features/auth/application/auth_controller.dart';
+
+class LoginScreen extends ConsumerStatefulWidget {
+  const LoginScreen({super.key});
+
+  @override
+  ConsumerState<LoginScreen> createState() => _LoginScreenState();
+}
+
+class _LoginScreenState extends ConsumerState<LoginScreen> {
+  final _formKey = GlobalKey<FormState>();
+  final _emailController = TextEditingController();
+  final _phoneController = TextEditingController();
+  final _passwordController = TextEditingController();
+
+  @override
+  void dispose() {
+    _emailController.dispose();
+    _phoneController.dispose();
+    _passwordController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _submit() async {
+    if (!_formKey.currentState!.validate()) return;
+    final fcmToken = await FcmService.getToken();
+    final auth = ref.read(authControllerProvider.notifier);
+    await auth.login(
+      email: _emailController.text.trim().isEmpty ? null : _emailController.text.trim(),
+      phone: _phoneController.text.trim().isEmpty ? null : _phoneController.text.trim(),
+      password: _passwordController.text,
+      fcmToken: fcmToken,
+    );
+    final state = ref.read(authControllerProvider);
+    if (state.driver != null && mounted) context.go('/home');
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final state = ref.watch(authControllerProvider);
+    return Scaffold(
+      appBar: AppBar(title: const Text('Masuk Driver')),
+      body: SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Form(
+            key: _formKey,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                TextFormField(
+                  controller: _emailController,
+                  decoration: const InputDecoration(labelText: 'Email'),
+                ),
+                const SizedBox(height: 12),
+                TextFormField(
+                  controller: _phoneController,
+                  decoration: const InputDecoration(labelText: 'No. Telepon'),
+                  keyboardType: TextInputType.phone,
+                ),
+                const SizedBox(height: 12),
+                TextFormField(
+                  controller: _passwordController,
+                  decoration: const InputDecoration(labelText: 'Kata sandi'),
+                  obscureText: true,
+                  validator: (v) => (v == null || v.isEmpty) ? 'Password wajib diisi' : null,
+                ),
+                if (state.errorMessage != null) ...[
+                  const SizedBox(height: 8),
+                  Text(
+                    state.errorMessage!,
+                    style: TextStyle(color: Theme.of(context).colorScheme.error),
+                  ),
+                ],
+                const Spacer(),
+                ElevatedButton(
+                  onPressed: state.isLoading ? null : _submit,
+                  child: state.isLoading
+                      ? const SizedBox(
+                          height: 20,
+                          width: 20,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      : const Text('Masuk'),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/ontime_driver_flutter/lib/features/home/data/driver_home_api.dart b/ontime_driver_flutter/lib/features/home/data/driver_home_api.dart
new file mode 100644
index 0000000..c458980
--- /dev/null
+++ b/ontime_driver_flutter/lib/features/home/data/driver_home_api.dart
@@ -0,0 +1,109 @@
+import 'package:dio/dio.dart';
+import 'package:ontime_driver_flutter/data/api/api_client.dart';
+
+class DriverHomeApi {
+  DriverHomeApi(this._client);
+  final ApiClient _client;
+
+  Future<Map<String, dynamic>> home({
+    required String id,
+    required String noTelepon,
+  }) async {
+    final Response<dynamic> response = await _client.raw.post(
+      'Driver/home',
+      data: {'id': id, 'no_telepon': noTelepon},
+    );
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+    if (data['code']?.toString() != '200') {
+      throw Exception(data['message'] ?? 'Failed');
+    }
+    return data;
+  }
+
+  Future<Map<String, dynamic>> syncronizingAccount({
+    required String id,
+    required String noTelepon,
+  }) async {
+    final Response<dynamic> response = await _client.raw.post(
+      'Driver/syncronizing_account',
+      data: {'id': id, 'no_telepon': noTelepon},
+    );
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+    if (data['message'] != 'success') throw Exception(data['message'] ?? 'Failed');
+    return data;
+  }
+
+  Future<void> updateLocation({
+    required String idDriver,
+    required double latitude,
+    required double longitude,
+    double bearing = 0,
+    String? regId,
+  }) async {
+    final payload = <String, dynamic>{
+      'id_driver': idDriver,
+      'latitude': latitude,
+      'longitude': longitude,
+      'bearing': bearing,
+    };
+    if (regId != null && regId.isNotEmpty) payload['reg_id'] = regId;
+    await _client.raw.post('Driver/update_location', data: payload);
+  }
+
+  Future<void> turningOn({required String id, required bool isTurn}) async {
+    await _client.raw.post(
+      'Driver/turning_on',
+      data: {'id': id, 'is_turn': isTurn},
+    );
+  }
+
+  Future<String> accept({required String id, required String idTransaksi}) async {
+    final Response<dynamic> response = await _client.raw.post(
+      'Driver/accept',
+      data: {'id': id, 'id_transaksi': idTransaksi},
+    );
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+    return data['message']?.toString() ?? 'unknown';
+  }
+
+  Future<String> start({required String id, required String idTransaksi}) async {
+    final Response<dynamic> response = await _client.raw.post(
+      'Driver/start',
+      data: {'id': id, 'id_transaksi': idTransaksi},
+    );
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+    return data['message']?.toString() ?? 'unknown';
+  }
+
+  Future<String> finish({required String id, required String idTransaksi}) async {
+    final Response<dynamic> response = await _client.raw.post(
+      'Driver/finish',
+      data: {'id': id, 'id_transaksi': idTransaksi},
+    );
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+    return data['message']?.toString() ?? 'unknown';
+  }
+
+  Future<List<dynamic>> historyProgress(String driverId) async {
+    final Response<dynamic> response = await _client.raw.post(
+      'Driver/history_progress',
+      data: {'id': driverId},
+    );
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+    if (data['status'] != true) throw Exception('Failed');
+    final list = data['data'] as List<dynamic>? ?? [];
+    return list;
+  }
+}
diff --git a/ontime_driver_flutter/lib/features/home/presentation/home_shell.dart b/ontime_driver_flutter/lib/features/home/presentation/home_shell.dart
new file mode 100644
index 0000000..b8fda64
--- /dev/null
+++ b/ontime_driver_flutter/lib/features/home/presentation/home_shell.dart
@@ -0,0 +1,86 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ontime_driver_flutter/features/auth/application/auth_controller.dart';
+
+class HomeShell extends ConsumerStatefulWidget {
+  const HomeShell({super.key});
+
+  @override
+  ConsumerState<HomeShell> createState() => _HomeShellState();
+}
+
+class _HomeShellState extends ConsumerState<HomeShell> {
+  int _index = 0;
+
+  @override
+  Widget build(BuildContext context) {
+    final driver = ref.watch(authControllerProvider).driver;
+    final pages = <Widget>[
+      _HomeTab(driverId: driver?.id ?? '', noTelepon: driver?.noTelepon ?? ''),
+      const Center(child: Text('Pesanan / Riwayat')),
+      const Center(child: Text('Dompet')),
+      _ProfileTab(),
+    ];
+    return Scaffold(
+      body: SafeArea(child: pages[_index]),
+      bottomNavigationBar: NavigationBar(
+        selectedIndex: _index,
+        onDestinationSelected: (i) => setState(() => _index = i),
+        destinations: const [
+          NavigationDestination(icon: Icon(Icons.home_outlined), selectedIcon: Icon(Icons.home), label: 'Beranda'),
+          NavigationDestination(icon: Icon(Icons.receipt_long_outlined), selectedIcon: Icon(Icons.receipt_long), label: 'Pesanan'),
+          NavigationDestination(icon: Icon(Icons.account_balance_wallet_outlined), selectedIcon: Icon(Icons.account_balance_wallet), label: 'Dompet'),
+          NavigationDestination(icon: Icon(Icons.person_outline), selectedIcon: Icon(Icons.person), label: 'Profil'),
+        ],
+      ),
+    );
+  }
+}
+
+class _HomeTab extends StatelessWidget {
+  const _HomeTab({required this.driverId, required this.noTelepon});
+
+  final String driverId;
+  final String noTelepon;
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      padding: const EdgeInsets.all(16),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          const Text('Beranda Driver', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+          const SizedBox(height: 8),
+          const Text('Saldo & status online/offline (toggle) – sync job dari server.'),
+        ],
+      ),
+    );
+  }
+}
+
+class _ProfileTab extends ConsumerWidget {
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final driver = ref.watch(authControllerProvider).driver;
+    return Padding(
+      padding: const EdgeInsets.all(16),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          if (driver != null)
+            Text('${driver.namaDriver}\n${driver.noTelepon}', style: const TextStyle(fontSize: 16)),
+          const SizedBox(height: 24),
+          ElevatedButton(
+            onPressed: () async {
+              await ref.read(authControllerProvider.notifier).logout();
+              if (context.mounted) context.go('/auth/login');
+            },
+            child: const Text('Keluar'),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/ontime_driver_flutter/lib/main.dart b/ontime_driver_flutter/lib/main.dart
new file mode 100644
index 0000000..6f8504a
--- /dev/null
+++ b/ontime_driver_flutter/lib/main.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import 'core/app_router.dart';
+import 'core/app_theme.dart';
+import 'core/fcm_service.dart';
+
+void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+  await FcmService.init();
+  runApp(
+    ProviderScope(
+      child: MaterialApp.router(
+        debugShowCheckedModeBanner: false,
+        title: 'Ontime Driver',
+        theme: AppTheme.light(),
+        routerConfig: createAppRouter(),
+      ),
+    ),
+  );
+}
diff --git a/ontime_driver_flutter/pubspec.lock b/ontime_driver_flutter/pubspec.lock
new file mode 100644
index 0000000..40dd2bb
--- /dev/null
+++ b/ontime_driver_flutter/pubspec.lock
@@ -0,0 +1,1106 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      sha256: "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "93.0.0"
+  _flutterfire_internals:
+    dependency: transitive
+    description:
+      name: _flutterfire_internals
+      sha256: ff0a84a2734d9e1089f8aedd5c0af0061b82fb94e95260d943404e0ef2134b11
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.59"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      sha256: de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.1"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.13.0"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      sha256: "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.4"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      sha256: "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.1"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      sha256: "7981eb922842c77033026eb4341d5af651562008cdb116bdfa31fc46516b6462"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.12.2"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.1"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      sha256: "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.12.4"
+  cached_network_image:
+    dependency: "direct main"
+    description:
+      name: cached_network_image
+      sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.1"
+  cached_network_image_platform_interface:
+    dependency: transitive
+    description:
+      name: cached_network_image_platform_interface
+      sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.1"
+  cached_network_image_web:
+    dependency: transitive
+    description:
+      name: cached_network_image_web
+      sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  code_assets:
+    dependency: transitive
+    description:
+      name: code_assets
+      sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.11.1"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.19.1"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.7"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.8"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      sha256: "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.7"
+  dio:
+    dependency: "direct main"
+    description:
+      name: dio
+      sha256: aff32c08f92787a557dd5c0145ac91536481831a01b4648136373cddb0e64f8c
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.9.2"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: "2f9e64323a7c3c7ef69567d5c800424a11f8337b8b228bad02524c9fb3c1f340"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.3"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.1"
+  firebase_core:
+    dependency: "direct main"
+    description:
+      name: firebase_core
+      sha256: "7be63a3f841fc9663342f7f3a011a42aef6a61066943c90b1c434d79d5c995c5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.15.2"
+  firebase_core_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_core_platform_interface
+      sha256: cccb4f572325dc14904c02fcc7db6323ad62ba02536833dddb5c02cac7341c64
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.2"
+  firebase_core_web:
+    dependency: transitive
+    description:
+      name: firebase_core_web
+      sha256: "0ed0dc292e8f9ac50992e2394e9d336a0275b6ae400d64163fdf0a8a8b556c37"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.24.1"
+  firebase_messaging:
+    dependency: "direct main"
+    description:
+      name: firebase_messaging
+      sha256: "60be38574f8b5658e2f22b7e311ff2064bea835c248424a383783464e8e02fcc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "15.2.10"
+  firebase_messaging_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_messaging_platform_interface
+      sha256: "685e1771b3d1f9c8502771ccc9f91485b376ffe16d553533f335b9183ea99754"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.6.10"
+  firebase_messaging_web:
+    dependency: transitive
+    description:
+      name: firebase_messaging_web
+      sha256: "0d1be17bc89ed3ff5001789c92df678b2e963a51b6fa2bdb467532cc9dbed390"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.10.10"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_cache_manager:
+    dependency: transitive
+    description:
+      name: flutter_cache_manager
+      sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.1"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  flutter_plugin_android_lifecycle:
+    dependency: transitive
+    description:
+      name: flutter_plugin_android_lifecycle
+      sha256: ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.33"
+  flutter_riverpod:
+    dependency: "direct main"
+    description:
+      name: flutter_riverpod
+      sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  geolocator:
+    dependency: "direct main"
+    description:
+      name: geolocator
+      sha256: f62bcd90459e63210bbf9c35deb6a51c521f992a78de19a1fe5c11704f9530e2
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.4"
+  geolocator_android:
+    dependency: transitive
+    description:
+      name: geolocator_android
+      sha256: fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.6.2"
+  geolocator_apple:
+    dependency: transitive
+    description:
+      name: geolocator_apple
+      sha256: dbdd8789d5aaf14cf69f74d4925ad1336b4433a6efdf2fce91e8955dc921bf22
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.13"
+  geolocator_platform_interface:
+    dependency: transitive
+    description:
+      name: geolocator_platform_interface
+      sha256: "30cb64f0b9adcc0fb36f628b4ebf4f731a2961a0ebd849f4b56200205056fe67"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.6"
+  geolocator_web:
+    dependency: transitive
+    description:
+      name: geolocator_web
+      sha256: b1ae9bdfd90f861fde8fd4f209c37b953d65e92823cb73c7dee1fa021b06f172
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.3"
+  geolocator_windows:
+    dependency: transitive
+    description:
+      name: geolocator_windows
+      sha256: "175435404d20278ffd220de83c2ca293b73db95eafbdc8131fe8609be1421eb6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.5"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.3"
+  go_router:
+    dependency: "direct main"
+    description:
+      name: go_router
+      sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.8.1"
+  google_maps:
+    dependency: transitive
+    description:
+      name: google_maps
+      sha256: "5d410c32112d7c6eb7858d359275b2aa04778eed3e36c745aeae905fb2fa6468"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.2.0"
+  google_maps_flutter:
+    dependency: "direct main"
+    description:
+      name: google_maps_flutter
+      sha256: "85339d0c9b5c7bac305df0bc1bc72a990f7f59b1846f048c96c022110d5d4a69"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.15.0"
+  google_maps_flutter_android:
+    dependency: transitive
+    description:
+      name: google_maps_flutter_android
+      sha256: ba0947315ddc9107ecc8d95fa26eb3b87b4f27b221606ce72518314d99c7306c
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.19.2"
+  google_maps_flutter_ios:
+    dependency: transitive
+    description:
+      name: google_maps_flutter_ios
+      sha256: c855600dce17e77e8af96edcf85cb68501675bb77a72f85009d08c17a8805ace
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.18.0"
+  google_maps_flutter_platform_interface:
+    dependency: transitive
+    description:
+      name: google_maps_flutter_platform_interface
+      sha256: "0f8c6674d70c7e9a09cd34f63b18ebaf8a5822e85b558128eae0fdf02b4a3e93"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.14.2"
+  google_maps_flutter_web:
+    dependency: transitive
+    description:
+      name: google_maps_flutter_web
+      sha256: "2321d24f8bce2d01c441b9fd7835a6032ea44b3f0bfcf93bcebd9740fb5a85cd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.1"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  hooks:
+    dependency: transitive
+    description:
+      name: hooks
+      sha256: e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.6"
+  http:
+    dependency: transitive
+    description:
+      name: http
+      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.6.0"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.2"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.2"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.19.0"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
+  json_annotation:
+    dependency: "direct main"
+    description:
+      name: json_annotation
+      sha256: cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.11.0"
+  json_serializable:
+    dependency: "direct dev"
+    description:
+      name: json_serializable
+      sha256: "44729f5c45748e6748f6b9a57ab8f7e4336edc8ae41fc295070e3814e616a6c0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.13.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.0.2"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.10"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.19"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.13.0"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.17.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  native_toolchain_c:
+    dependency: transitive
+    description:
+      name: native_toolchain_c
+      sha256: "92b2ca62c8bd2b8d2f267cdfccf9bfbdb7322f778f8f91b3ce5b5cda23a3899f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.17.5"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.3.0"
+  octo_image:
+    dependency: transitive
+    description:
+      name: octo_image
+      sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.1"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.5"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.22"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.0"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.4.0"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.1.0"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.4.7"
+  permission_handler_html:
+    dependency: transitive
+    description:
+      name: permission_handler_html
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3+5"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.6"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.8"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.2"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.0"
+  riverpod:
+    dependency: transitive
+    description:
+      name: riverpod
+      sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
+  rxdart:
+    dependency: transitive
+    description:
+      name: rxdart
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.28.0"
+  sanitize_html:
+    dependency: transitive
+    description:
+      name: sanitize_html
+      sha256: "12669c4a913688a26555323fb9cec373d8f9fbe091f2d01c40c723b33caa8989"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4"
+  shared_preferences_android:
+    dependency: transitive
+    description:
+      name: shared_preferences_android
+      sha256: "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.21"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.6"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.3"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.2"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      sha256: "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.0"
+  source_helper:
+    dependency: transitive
+    description:
+      name: source_helper
+      sha256: "4a85e90b50694e652075cbe4575665539d253e6ec10e46e76b45368ab5e3caae"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.10"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.2"
+  sqflite:
+    dependency: transitive
+    description:
+      name: sqflite
+      sha256: e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  sqflite_android:
+    dependency: transitive
+    description:
+      name: sqflite_android
+      sha256: "881e28efdcc9950fd8e9bb42713dcf1103e62a2e7168f23c9338d82db13dec40"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2+3"
+  sqflite_common:
+    dependency: transitive
+    description:
+      name: sqflite_common
+      sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.6"
+  sqflite_darwin:
+    dependency: transitive
+    description:
+      name: sqflite_darwin
+      sha256: "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  sqflite_platform_interface:
+    dependency: transitive
+    description:
+      name: sqflite_platform_interface
+      sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.12.1"
+  state_notifier:
+    dependency: transitive
+    description:
+      name: state_notifier
+      sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  synchronized:
+    dependency: transitive
+    description:
+      name: synchronized
+      sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.0"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.2"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.10"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.3"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
+      url: "https://pub.dev"
+    source: hosted
+    version: "15.0.2"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
+sdks:
+  dart: ">=3.10.3 <4.0.0"
+  flutter: ">=3.38.4"
diff --git a/ontime_driver_flutter/pubspec.yaml b/ontime_driver_flutter/pubspec.yaml
new file mode 100644
index 0000000..c8cd975
--- /dev/null
+++ b/ontime_driver_flutter/pubspec.yaml
@@ -0,0 +1,38 @@
+name: ontime_driver_flutter
+description: Ontime driver Flutter app (MVP) consuming backendpanel Driver API.
+version: 0.1.0+1
+
+environment:
+  sdk: ">=3.3.0 <4.0.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+
+  cupertino_icons: ^1.0.8
+
+  dio: ^5.7.0
+  json_annotation: ^4.9.0
+  flutter_riverpod: ^2.6.1
+  go_router: ^14.3.0
+  shared_preferences: ^2.3.3
+  geolocator: ^13.0.2
+  google_maps_flutter: ^2.10.0
+  permission_handler: ^11.3.1
+  firebase_core: ^3.6.0
+  firebase_messaging: ^15.1.0
+  intl: ^0.19.0
+  cached_network_image: ^3.4.1
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  flutter_lints: ^4.0.0
+  build_runner: ^2.4.13
+  json_serializable: ^6.9.0
+
+flutter:
+  uses-material-design: true
+  assets:
+    - assets/images/
+
diff --git a/ontime_driver_flutter/test/widget_test.dart b/ontime_driver_flutter/test/widget_test.dart
new file mode 100644
index 0000000..82cccc0
--- /dev/null
+++ b/ontime_driver_flutter/test/widget_test.dart
@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility in the flutter_test package. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:ontime_driver_flutter/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(const MyApp());
+
+    // Verify that our counter starts at 0.
+    expect(find.text('0'), findsOneWidget);
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}
diff --git a/ontime_merchant_flutter/.gitignore b/ontime_merchant_flutter/.gitignore
new file mode 100644
index 0000000..3820a95
--- /dev/null
+++ b/ontime_merchant_flutter/.gitignore
@@ -0,0 +1,45 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.build/
+.buildlog/
+.history
+.svn/
+.swiftpm/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
+/build/
+/coverage/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/ontime_merchant_flutter/.metadata b/ontime_merchant_flutter/.metadata
new file mode 100644
index 0000000..df13aa7
--- /dev/null
+++ b/ontime_merchant_flutter/.metadata
@@ -0,0 +1,30 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "ff37bef603469fb030f2b72995ab929ccfc227f0"
+  channel: "stable"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+      base_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+    - platform: android
+      create_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+      base_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/ontime_merchant_flutter/README.md b/ontime_merchant_flutter/README.md
new file mode 100644
index 0000000..1776c06
--- /dev/null
+++ b/ontime_merchant_flutter/README.md
@@ -0,0 +1,29 @@
+# Ontime Merchant (Flutter)
+
+Flutter app for Ontime **merchant**, using backend API at `https://apitest.semestaterpadu.my.id/api/`.
+
+## Setup
+
+- Flutter SDK (e.g. 3.19+)
+- Android: run `flutter create . --platforms=android` if needed.
+
+## Run / Build
+
+```bash
+flutter pub get
+flutter run
+# or
+flutter build apk --release
+```
+
+## Firebase (FCM)
+
+Add `google-services.json` to `android/app/` for push. FCM token is sent as `token` on login when available.
+
+## Validation
+
+- **Login**: `Merchant/login` (telepon_mitra + password, optional token).
+- **Home**: `Merchant/home` (saldo, transaksi, user).
+- **Availability**: `Merchant/onoff` (status_merchant).
+- **Catalog**: `Merchant/kategori`, `Merchant/item`, add/edit/delete.
+- Compare with `OnTime_Merchant_live` and backendpanel API responses.
diff --git a/ontime_merchant_flutter/analysis_options.yaml b/ontime_merchant_flutter/analysis_options.yaml
new file mode 100644
index 0000000..0d29021
--- /dev/null
+++ b/ontime_merchant_flutter/analysis_options.yaml
@@ -0,0 +1,28 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at https://dart.dev/lints.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/ontime_merchant_flutter/android/.gitignore b/ontime_merchant_flutter/android/.gitignore
new file mode 100644
index 0000000..be3943c
--- /dev/null
+++ b/ontime_merchant_flutter/android/.gitignore
@@ -0,0 +1,14 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+.cxx/
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/to/reference-keystore
+key.properties
+**/*.keystore
+**/*.jks
diff --git a/ontime_merchant_flutter/android/app/build.gradle.kts b/ontime_merchant_flutter/android/app/build.gradle.kts
new file mode 100644
index 0000000..d844d7b
--- /dev/null
+++ b/ontime_merchant_flutter/android/app/build.gradle.kts
@@ -0,0 +1,44 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "com.example.ontime_merchant_flutter"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "com.example.ontime_merchant_flutter"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}
diff --git a/ontime_merchant_flutter/android/app/src/debug/AndroidManifest.xml b/ontime_merchant_flutter/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000..399f698
--- /dev/null
+++ b/ontime_merchant_flutter/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/ontime_merchant_flutter/android/app/src/main/AndroidManifest.xml b/ontime_merchant_flutter/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..344bb38
--- /dev/null
+++ b/ontime_merchant_flutter/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,45 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:label="ontime_merchant_flutter"
+        android:name="${applicationName}"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:taskAffinity=""
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
+            <meta-data
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+    </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
+</manifest>
diff --git a/ontime_merchant_flutter/android/app/src/main/kotlin/com/example/ontime_merchant_flutter/MainActivity.kt b/ontime_merchant_flutter/android/app/src/main/kotlin/com/example/ontime_merchant_flutter/MainActivity.kt
new file mode 100644
index 0000000..10e3418
--- /dev/null
+++ b/ontime_merchant_flutter/android/app/src/main/kotlin/com/example/ontime_merchant_flutter/MainActivity.kt
@@ -0,0 +1,5 @@
+package com.example.ontime_merchant_flutter
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity : FlutterActivity()
diff --git a/ontime_merchant_flutter/android/app/src/main/res/drawable-v21/launch_background.xml b/ontime_merchant_flutter/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 0000000..f74085f
--- /dev/null
+++ b/ontime_merchant_flutter/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/ontime_merchant_flutter/android/app/src/main/res/drawable/launch_background.xml b/ontime_merchant_flutter/android/app/src/main/res/drawable/launch_background.xml
new file mode 100644
index 0000000..304732f
--- /dev/null
+++ b/ontime_merchant_flutter/android/app/src/main/res/drawable/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/ontime_merchant_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/ontime_merchant_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..db77bb4
Binary files /dev/null and b/ontime_merchant_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/ontime_merchant_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/ontime_merchant_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..17987b7
Binary files /dev/null and b/ontime_merchant_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/ontime_merchant_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/ontime_merchant_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..09d4391
Binary files /dev/null and b/ontime_merchant_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/ontime_merchant_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ontime_merchant_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..d5f1c8d
Binary files /dev/null and b/ontime_merchant_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/ontime_merchant_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/ontime_merchant_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..4d6372e
Binary files /dev/null and b/ontime_merchant_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/ontime_merchant_flutter/android/app/src/main/res/values-night/styles.xml b/ontime_merchant_flutter/android/app/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..06952be
--- /dev/null
+++ b/ontime_merchant_flutter/android/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/ontime_merchant_flutter/android/app/src/main/res/values/styles.xml b/ontime_merchant_flutter/android/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..cb1ef88
--- /dev/null
+++ b/ontime_merchant_flutter/android/app/src/main/res/values/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/ontime_merchant_flutter/android/app/src/profile/AndroidManifest.xml b/ontime_merchant_flutter/android/app/src/profile/AndroidManifest.xml
new file mode 100644
index 0000000..399f698
--- /dev/null
+++ b/ontime_merchant_flutter/android/app/src/profile/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/ontime_merchant_flutter/android/build.gradle.kts b/ontime_merchant_flutter/android/build.gradle.kts
new file mode 100644
index 0000000..dbee657
--- /dev/null
+++ b/ontime_merchant_flutter/android/build.gradle.kts
@@ -0,0 +1,24 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory =
+    rootProject.layout.buildDirectory
+        .dir("../../build")
+        .get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}
diff --git a/ontime_merchant_flutter/android/gradle.properties b/ontime_merchant_flutter/android/gradle.properties
new file mode 100644
index 0000000..fbee1d8
--- /dev/null
+++ b/ontime_merchant_flutter/android/gradle.properties
@@ -0,0 +1,2 @@
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
+android.useAndroidX=true
diff --git a/ontime_merchant_flutter/android/gradle/wrapper/gradle-wrapper.properties b/ontime_merchant_flutter/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..e4ef43f
--- /dev/null
+++ b/ontime_merchant_flutter/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
diff --git a/ontime_merchant_flutter/android/settings.gradle.kts b/ontime_merchant_flutter/android/settings.gradle.kts
new file mode 100644
index 0000000..ca7fe06
--- /dev/null
+++ b/ontime_merchant_flutter/android/settings.gradle.kts
@@ -0,0 +1,26 @@
+pluginManagement {
+    val flutterSdkPath =
+        run {
+            val properties = java.util.Properties()
+            file("local.properties").inputStream().use { properties.load(it) }
+            val flutterSdkPath = properties.getProperty("flutter.sdk")
+            require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+            flutterSdkPath
+        }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+}
+
+include(":app")
diff --git a/ontime_merchant_flutter/assets/images/.gitkeep b/ontime_merchant_flutter/assets/images/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/ontime_merchant_flutter/lib/core/app_config.dart b/ontime_merchant_flutter/lib/core/app_config.dart
new file mode 100644
index 0000000..5c443b9
--- /dev/null
+++ b/ontime_merchant_flutter/lib/core/app_config.dart
@@ -0,0 +1,7 @@
+class AppConfig {
+  static const String baseUrl = 'https://apitest.semestaterpadu.my.id/';
+  static const String apiBase = '${baseUrl}api/';
+  static const String imagesMerchant = '${baseUrl}images/merchant/';
+  static const String imagesItem = '${baseUrl}images/itemmerchant/';
+  static const String imagesBank = '${baseUrl}images/bank/';
+}
diff --git a/ontime_merchant_flutter/lib/core/app_router.dart b/ontime_merchant_flutter/lib/core/app_router.dart
new file mode 100644
index 0000000..98fa732
--- /dev/null
+++ b/ontime_merchant_flutter/lib/core/app_router.dart
@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ontime_merchant_flutter/features/auth/presentation/login_screen.dart';
+import 'package:ontime_merchant_flutter/features/home/presentation/home_shell.dart';
+
+final _rootNavKey = GlobalKey<NavigatorState>(debugLabel: 'root');
+
+GoRouter createAppRouter() {
+  return GoRouter(
+    navigatorKey: _rootNavKey,
+    initialLocation: '/auth/login',
+    routes: [
+      GoRoute(
+        path: '/auth/login',
+        name: 'login',
+        pageBuilder: (_, __) => const MaterialPage(child: LoginScreen()),
+      ),
+      GoRoute(
+        path: '/home',
+        name: 'home',
+        pageBuilder: (_, __) => const MaterialPage(child: HomeShell()),
+      ),
+    ],
+  );
+}
diff --git a/ontime_merchant_flutter/lib/core/app_theme.dart b/ontime_merchant_flutter/lib/core/app_theme.dart
new file mode 100644
index 0000000..5c79913
--- /dev/null
+++ b/ontime_merchant_flutter/lib/core/app_theme.dart
@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+
+class AppTheme {
+  static ThemeData light() {
+    final base = ThemeData.light(useMaterial3: true);
+    return base.copyWith(
+      colorScheme: ColorScheme.fromSeed(seedColor: const Color(0xFF00AEEF)),
+      scaffoldBackgroundColor: Colors.grey[50],
+      appBarTheme: const AppBarTheme(elevation: 0, centerTitle: true),
+      inputDecorationTheme: const InputDecorationTheme(border: OutlineInputBorder()),
+    );
+  }
+}
diff --git a/ontime_merchant_flutter/lib/core/fcm_service.dart b/ontime_merchant_flutter/lib/core/fcm_service.dart
new file mode 100644
index 0000000..faeb2ad
--- /dev/null
+++ b/ontime_merchant_flutter/lib/core/fcm_service.dart
@@ -0,0 +1,24 @@
+import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+
+/// FCM token for backend (Merchant uses `token` / `token_merchant`).
+class FcmService {
+  static bool _initialized = false;
+
+  static Future<void> init() async {
+    if (_initialized) return;
+    try {
+      await Firebase.initializeApp();
+      _initialized = true;
+    } catch (_) {}
+  }
+
+  static Future<String?> getToken() async {
+    if (!_initialized) return null;
+    try {
+      return await FirebaseMessaging.instance.getToken();
+    } catch (_) {
+      return null;
+    }
+  }
+}
diff --git a/ontime_merchant_flutter/lib/data/api/api_client.dart b/ontime_merchant_flutter/lib/data/api/api_client.dart
new file mode 100644
index 0000000..88eb7d6
--- /dev/null
+++ b/ontime_merchant_flutter/lib/data/api/api_client.dart
@@ -0,0 +1,24 @@
+import 'package:dio/dio.dart';
+import 'package:ontime_merchant_flutter/core/app_config.dart';
+
+class ApiClient {
+  ApiClient({
+    required String? basicAuthUser,
+    required String? basicAuthPassword,
+  }) : _dio = Dio(
+          BaseOptions(
+            baseUrl: AppConfig.apiBase,
+            connectTimeout: const Duration(seconds: 15),
+            receiveTimeout: const Duration(seconds: 20),
+          ),
+        ) {
+    if (basicAuthUser != null && basicAuthPassword != null) {
+      final auth = '$basicAuthUser:$basicAuthPassword';
+      final encoded = String.fromCharCodes(auth.codeUnits);
+      _dio.options.headers['Authorization'] = 'Basic $encoded';
+    }
+  }
+
+  final Dio _dio;
+  Dio get raw => _dio;
+}
diff --git a/ontime_merchant_flutter/lib/features/auth/application/auth_controller.dart b/ontime_merchant_flutter/lib/features/auth/application/auth_controller.dart
new file mode 100644
index 0000000..419fcac
--- /dev/null
+++ b/ontime_merchant_flutter/lib/features/auth/application/auth_controller.dart
@@ -0,0 +1,77 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:ontime_merchant_flutter/data/api/api_client.dart';
+import 'package:ontime_merchant_flutter/features/auth/data/merchant_auth_api.dart';
+import 'package:ontime_merchant_flutter/features/auth/data/models/merchant_model.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class AuthState {
+  const AuthState({
+    this.merchant,
+    this.isLoading = false,
+    this.errorMessage,
+  });
+
+  final MerchantModel? merchant;
+  final bool isLoading;
+  final String? errorMessage;
+
+  AuthState copyWith({
+    MerchantModel? merchant,
+    bool? isLoading,
+    String? errorMessage,
+  }) {
+    return AuthState(
+      merchant: merchant ?? this.merchant,
+      isLoading: isLoading ?? this.isLoading,
+      errorMessage: errorMessage,
+    );
+  }
+}
+
+final authControllerProvider =
+    StateNotifierProvider<AuthController, AuthState>((ref) => AuthController());
+
+class AuthController extends StateNotifier<AuthState> {
+  AuthController() : super(const AuthState());
+
+  late final MerchantAuthApi _api =
+      MerchantAuthApi(ApiClient(basicAuthUser: null, basicAuthPassword: null));
+
+  Future<void> login({
+    required String noTelepon,
+    required String password,
+    String? fcmToken,
+  }) async {
+    state = state.copyWith(isLoading: true, errorMessage: null);
+    try {
+      final merchant = await _api.login(
+        noTelepon: noTelepon,
+        password: password,
+        fcmToken: fcmToken,
+      );
+      state = state.copyWith(merchant: merchant, isLoading: false);
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString('merchant_id_mitra', merchant.idMitra);
+      await prefs.setString('merchant_id_merchant', merchant.idMerchant);
+      await prefs.setString('merchant_phone', merchant.teleponMitra);
+      await prefs.setString('merchant_token', merchant.tokenMerchant);
+    } catch (e) {
+      state = state.copyWith(
+        isLoading: false,
+        errorMessage: e.toString().replaceFirst('Exception: ', ''),
+      );
+    }
+  }
+
+  void logout() {
+    state = const AuthState();
+  }
+
+  static Future<void> clearStored() async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.remove('merchant_id_mitra');
+    await prefs.remove('merchant_id_merchant');
+    await prefs.remove('merchant_phone');
+    await prefs.remove('merchant_token');
+  }
+}
diff --git a/ontime_merchant_flutter/lib/features/auth/data/merchant_auth_api.dart b/ontime_merchant_flutter/lib/features/auth/data/merchant_auth_api.dart
new file mode 100644
index 0000000..a4701ba
--- /dev/null
+++ b/ontime_merchant_flutter/lib/features/auth/data/merchant_auth_api.dart
@@ -0,0 +1,35 @@
+import 'package:dio/dio.dart';
+import 'package:ontime_merchant_flutter/data/api/api_client.dart';
+import 'package:ontime_merchant_flutter/features/auth/data/models/merchant_model.dart';
+
+class MerchantAuthApi {
+  MerchantAuthApi(this._client);
+  final ApiClient _client;
+
+  Future<MerchantModel> login({
+    required String noTelepon,
+    required String password,
+    String? fcmToken,
+  }) async {
+    final payload = <String, dynamic>{
+      'no_telepon': noTelepon,
+      'password': password,
+    };
+    if (fcmToken != null && fcmToken.isNotEmpty) payload['token'] = fcmToken;
+
+    final Response<dynamic> response =
+        await _client.raw.post('Merchant/login', data: payload);
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+
+    if (data['message'] == 'banned') throw Exception('banned');
+    if (data['code']?.toString() != '200') {
+      throw Exception(data['message'] ?? 'Login failed');
+    }
+
+    final list = data['data'] as List<dynamic>? ?? [];
+    if (list.isEmpty) throw Exception('Merchant data not found');
+    return MerchantModel.fromJson(list.first as Map<String, dynamic>);
+  }
+}
diff --git a/ontime_merchant_flutter/lib/features/auth/data/models/merchant_model.dart b/ontime_merchant_flutter/lib/features/auth/data/models/merchant_model.dart
new file mode 100644
index 0000000..20e00e9
--- /dev/null
+++ b/ontime_merchant_flutter/lib/features/auth/data/models/merchant_model.dart
@@ -0,0 +1,37 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'merchant_model.g.dart';
+
+@JsonSerializable()
+class MerchantModel {
+  MerchantModel({
+    required this.idMitra,
+    required this.idMerchant,
+    required this.teleponMitra,
+    required this.tokenMerchant,
+    this.namaMerchant,
+    this.emailMitra,
+  });
+
+  @JsonKey(name: 'id_mitra')
+  final String idMitra;
+
+  @JsonKey(name: 'id_merchant')
+  final String idMerchant;
+
+  @JsonKey(name: 'telepon_mitra')
+  final String teleponMitra;
+
+  @JsonKey(name: 'token_merchant')
+  final String tokenMerchant;
+
+  @JsonKey(name: 'nama_merchant')
+  final String? namaMerchant;
+
+  @JsonKey(name: 'email_mitra')
+  final String? emailMitra;
+
+  factory MerchantModel.fromJson(Map<String, dynamic> json) =>
+      _$MerchantModelFromJson(json);
+  Map<String, dynamic> toJson() => _$MerchantModelToJson(this);
+}
diff --git a/ontime_merchant_flutter/lib/features/auth/data/models/merchant_model.g.dart b/ontime_merchant_flutter/lib/features/auth/data/models/merchant_model.g.dart
new file mode 100644
index 0000000..4a039dc
--- /dev/null
+++ b/ontime_merchant_flutter/lib/features/auth/data/models/merchant_model.g.dart
@@ -0,0 +1,22 @@
+part of 'merchant_model.dart';
+
+MerchantModel _$MerchantModelFromJson(Map<String, dynamic> json) {
+  return MerchantModel(
+    idMitra: json['id_mitra'] as String? ?? '',
+    idMerchant: json['id_merchant'] as String? ?? '',
+    teleponMitra: json['telepon_mitra'] as String? ?? '',
+    tokenMerchant: json['token_merchant'] as String? ?? '',
+    namaMerchant: json['nama_merchant'] as String?,
+    emailMitra: json['email_mitra'] as String?,
+  );
+}
+
+Map<String, dynamic> _$MerchantModelToJson(MerchantModel instance) =>
+    <String, dynamic>{
+      'id_mitra': instance.idMitra,
+      'id_merchant': instance.idMerchant,
+      'telepon_mitra': instance.teleponMitra,
+      'token_merchant': instance.tokenMerchant,
+      'nama_merchant': instance.namaMerchant,
+      'email_mitra': instance.emailMitra,
+    };
diff --git a/ontime_merchant_flutter/lib/features/auth/presentation/login_screen.dart b/ontime_merchant_flutter/lib/features/auth/presentation/login_screen.dart
new file mode 100644
index 0000000..87f3599
--- /dev/null
+++ b/ontime_merchant_flutter/lib/features/auth/presentation/login_screen.dart
@@ -0,0 +1,92 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ontime_merchant_flutter/core/fcm_service.dart';
+import 'package:ontime_merchant_flutter/features/auth/application/auth_controller.dart';
+
+class LoginScreen extends ConsumerStatefulWidget {
+  const LoginScreen({super.key});
+
+  @override
+  ConsumerState<LoginScreen> createState() => _LoginScreenState();
+}
+
+class _LoginScreenState extends ConsumerState<LoginScreen> {
+  final _formKey = GlobalKey<FormState>();
+  final _phoneController = TextEditingController();
+  final _passwordController = TextEditingController();
+
+  @override
+  void dispose() {
+    _phoneController.dispose();
+    _passwordController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _submit() async {
+    if (!_formKey.currentState!.validate()) return;
+    final fcmToken = await FcmService.getToken();
+    final auth = ref.read(authControllerProvider.notifier);
+    await auth.login(
+      noTelepon: _phoneController.text.trim(),
+      password: _passwordController.text,
+      fcmToken: fcmToken,
+    );
+    final state = ref.read(authControllerProvider);
+    if (state.merchant != null && mounted) context.go('/home');
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final state = ref.watch(authControllerProvider);
+    return Scaffold(
+      appBar: AppBar(title: const Text('Masuk Merchant')),
+      body: SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Form(
+            key: _formKey,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                TextFormField(
+                  controller: _phoneController,
+                  decoration: const InputDecoration(labelText: 'No. Telepon'),
+                  keyboardType: TextInputType.phone,
+                  validator: (v) =>
+                      (v == null || v.isEmpty) ? 'No. telepon wajib diisi' : null,
+                ),
+                const SizedBox(height: 12),
+                TextFormField(
+                  controller: _passwordController,
+                  decoration: const InputDecoration(labelText: 'Kata sandi'),
+                  obscureText: true,
+                  validator: (v) =>
+                      (v == null || v.isEmpty) ? 'Password wajib diisi' : null,
+                ),
+                if (state.errorMessage != null) ...[
+                  const SizedBox(height: 8),
+                  Text(
+                    state.errorMessage!,
+                    style: TextStyle(color: Theme.of(context).colorScheme.error),
+                  ),
+                ],
+                const Spacer(),
+                ElevatedButton(
+                  onPressed: state.isLoading ? null : _submit,
+                  child: state.isLoading
+                      ? const SizedBox(
+                          height: 20,
+                          width: 20,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      : const Text('Masuk'),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/ontime_merchant_flutter/lib/features/home/data/merchant_home_api.dart b/ontime_merchant_flutter/lib/features/home/data/merchant_home_api.dart
new file mode 100644
index 0000000..37d9d16
--- /dev/null
+++ b/ontime_merchant_flutter/lib/features/home/data/merchant_home_api.dart
@@ -0,0 +1,99 @@
+import 'package:dio/dio.dart';
+import 'package:ontime_merchant_flutter/data/api/api_client.dart';
+
+class MerchantHomeApi {
+  MerchantHomeApi(this._client);
+  final ApiClient _client;
+
+  Future<Map<String, dynamic>> home({
+    required String noTelepon,
+    required String idMitra,
+    required String idMerchant,
+  }) async {
+    final Response<dynamic> response = await _client.raw.post(
+      'Merchant/home',
+      data: {
+        'no_telepon': noTelepon,
+        'idmitra': idMitra,
+        'idmerchant': idMerchant,
+      },
+    );
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+    if (data['code']?.toString() != '200') {
+      throw Exception(data['message'] ?? 'Failed');
+    }
+    return data;
+  }
+
+  Future<void> onoff({
+    required String idMerchant,
+    required String token,
+    required int status,
+  }) async {
+    await _client.raw.post(
+      'Merchant/onoff',
+      data: {
+        'idmerchant': idMerchant,
+        'token': token,
+        'status': status,
+      },
+    );
+  }
+
+  Future<Map<String, dynamic>> history({
+    required String noTelepon,
+    required String idMerchant,
+    required String day,
+  }) async {
+    final Response<dynamic> response = await _client.raw.post(
+      'Merchant/history',
+      data: {
+        'no_telepon': noTelepon,
+        'idmerchant': idMerchant,
+        'day': day,
+      },
+    );
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+    if (data['code']?.toString() != '200') throw Exception('Failed');
+    return data;
+  }
+
+  Future<Map<String, dynamic>> kategori({
+    required String noTelepon,
+    required String idMerchant,
+  }) async {
+    final Response<dynamic> response = await _client.raw.post(
+      'Merchant/kategori',
+      data: {'no_telepon': noTelepon, 'idmerchant': idMerchant},
+    );
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+    if (data['code']?.toString() != '200') throw Exception('Failed');
+    return data;
+  }
+
+  Future<List<dynamic>> item({
+    required String noTelepon,
+    required String idMerchant,
+    required String idKategori,
+  }) async {
+    final Response<dynamic> response = await _client.raw.post(
+      'Merchant/item',
+      data: {
+        'no_telepon': noTelepon,
+        'idmerchant': idMerchant,
+        'idkategori': idKategori,
+      },
+    );
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+    if (data['code']?.toString() != '200') throw Exception('Failed');
+    return data['data'] as List<dynamic>? ?? [];
+  }
+}
diff --git a/ontime_merchant_flutter/lib/features/home/presentation/home_shell.dart b/ontime_merchant_flutter/lib/features/home/presentation/home_shell.dart
new file mode 100644
index 0000000..76d4cda
--- /dev/null
+++ b/ontime_merchant_flutter/lib/features/home/presentation/home_shell.dart
@@ -0,0 +1,86 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ontime_merchant_flutter/features/auth/application/auth_controller.dart';
+
+class HomeShell extends ConsumerStatefulWidget {
+  const HomeShell({super.key});
+
+  @override
+  ConsumerState<HomeShell> createState() => _HomeShellState();
+}
+
+class _HomeShellState extends ConsumerState<HomeShell> {
+  int _index = 0;
+
+  @override
+  Widget build(BuildContext context) {
+    final merchant = ref.watch(authControllerProvider).merchant;
+    final pages = <Widget>[
+      const Center(child: Text('Toko – pesanan & saldo')),
+      const Center(child: Text('Riwayat')),
+      const Center(child: Text('Chat')),
+      const Center(child: Text('Menu (kategori & item)')),
+      _ProfileTab(),
+    ];
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(merchant?.namaMerchant ?? 'Merchant'),
+      ),
+      body: SafeArea(child: pages[_index]),
+      bottomNavigationBar: NavigationBar(
+        selectedIndex: _index,
+        onDestinationSelected: (i) => setState(() => _index = i),
+        destinations: const [
+          NavigationDestination(
+            icon: Icon(Icons.store_outlined),
+            selectedIcon: Icon(Icons.store),
+            label: 'Toko',
+          ),
+          NavigationDestination(
+            icon: Icon(Icons.history),
+            selectedIcon: Icon(Icons.history),
+            label: 'Riwayat',
+          ),
+          NavigationDestination(
+            icon: Icon(Icons.chat_outlined),
+            selectedIcon: Icon(Icons.chat),
+            label: 'Chat',
+          ),
+          NavigationDestination(
+            icon: Icon(Icons.restaurant_menu_outlined),
+            selectedIcon: Icon(Icons.restaurant_menu),
+            label: 'Menu',
+          ),
+          NavigationDestination(
+            icon: Icon(Icons.settings_outlined),
+            selectedIcon: Icon(Icons.settings),
+            label: 'Pengaturan',
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _ProfileTab extends ConsumerWidget {
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Padding(
+      padding: const EdgeInsets.all(16),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          ElevatedButton(
+            onPressed: () async {
+              ref.read(authControllerProvider.notifier).logout();
+              await AuthController.clearStored();
+              if (context.mounted) context.go('/auth/login');
+            },
+            child: const Text('Keluar'),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/ontime_merchant_flutter/lib/main.dart b/ontime_merchant_flutter/lib/main.dart
new file mode 100644
index 0000000..418daa0
--- /dev/null
+++ b/ontime_merchant_flutter/lib/main.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import 'core/app_router.dart';
+import 'core/app_theme.dart';
+import 'core/fcm_service.dart';
+
+void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+  await FcmService.init();
+  runApp(
+    ProviderScope(
+      child: MaterialApp.router(
+        debugShowCheckedModeBanner: false,
+        title: 'Ontime Merchant',
+        theme: AppTheme.light(),
+        routerConfig: createAppRouter(),
+      ),
+    ),
+  );
+}
diff --git a/ontime_merchant_flutter/pubspec.lock b/ontime_merchant_flutter/pubspec.lock
new file mode 100644
index 0000000..e1900dc
--- /dev/null
+++ b/ontime_merchant_flutter/pubspec.lock
@@ -0,0 +1,930 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      sha256: "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "93.0.0"
+  _flutterfire_internals:
+    dependency: transitive
+    description:
+      name: _flutterfire_internals
+      sha256: ff0a84a2734d9e1089f8aedd5c0af0061b82fb94e95260d943404e0ef2134b11
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.59"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      sha256: de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.1"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.13.0"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      sha256: "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.4"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      sha256: "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.1"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      sha256: "7981eb922842c77033026eb4341d5af651562008cdb116bdfa31fc46516b6462"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.12.2"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.1"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      sha256: "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.12.4"
+  cached_network_image:
+    dependency: "direct main"
+    description:
+      name: cached_network_image
+      sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.1"
+  cached_network_image_platform_interface:
+    dependency: transitive
+    description:
+      name: cached_network_image_platform_interface
+      sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.1"
+  cached_network_image_web:
+    dependency: transitive
+    description:
+      name: cached_network_image_web
+      sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  code_assets:
+    dependency: transitive
+    description:
+      name: code_assets
+      sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.11.1"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.19.1"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.7"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.8"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      sha256: "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.7"
+  dio:
+    dependency: "direct main"
+    description:
+      name: dio
+      sha256: aff32c08f92787a557dd5c0145ac91536481831a01b4648136373cddb0e64f8c
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.9.2"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: "2f9e64323a7c3c7ef69567d5c800424a11f8337b8b228bad02524c9fb3c1f340"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.3"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.1"
+  firebase_core:
+    dependency: "direct main"
+    description:
+      name: firebase_core
+      sha256: "7be63a3f841fc9663342f7f3a011a42aef6a61066943c90b1c434d79d5c995c5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.15.2"
+  firebase_core_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_core_platform_interface
+      sha256: cccb4f572325dc14904c02fcc7db6323ad62ba02536833dddb5c02cac7341c64
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.2"
+  firebase_core_web:
+    dependency: transitive
+    description:
+      name: firebase_core_web
+      sha256: "0ed0dc292e8f9ac50992e2394e9d336a0275b6ae400d64163fdf0a8a8b556c37"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.24.1"
+  firebase_messaging:
+    dependency: "direct main"
+    description:
+      name: firebase_messaging
+      sha256: "60be38574f8b5658e2f22b7e311ff2064bea835c248424a383783464e8e02fcc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "15.2.10"
+  firebase_messaging_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_messaging_platform_interface
+      sha256: "685e1771b3d1f9c8502771ccc9f91485b376ffe16d553533f335b9183ea99754"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.6.10"
+  firebase_messaging_web:
+    dependency: transitive
+    description:
+      name: firebase_messaging_web
+      sha256: "0d1be17bc89ed3ff5001789c92df678b2e963a51b6fa2bdb467532cc9dbed390"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.10.10"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_cache_manager:
+    dependency: transitive
+    description:
+      name: flutter_cache_manager
+      sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.1"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  flutter_riverpod:
+    dependency: "direct main"
+    description:
+      name: flutter_riverpod
+      sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.3"
+  go_router:
+    dependency: "direct main"
+    description:
+      name: go_router
+      sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.8.1"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  hooks:
+    dependency: transitive
+    description:
+      name: hooks
+      sha256: e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  http:
+    dependency: transitive
+    description:
+      name: http
+      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.6.0"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.2"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.2"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.19.0"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
+  json_annotation:
+    dependency: "direct main"
+    description:
+      name: json_annotation
+      sha256: cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.11.0"
+  json_serializable:
+    dependency: "direct dev"
+    description:
+      name: json_serializable
+      sha256: "44729f5c45748e6748f6b9a57ab8f7e4336edc8ae41fc295070e3814e616a6c0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.13.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.0.2"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.10"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.19"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.13.0"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.17.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  native_toolchain_c:
+    dependency: transitive
+    description:
+      name: native_toolchain_c
+      sha256: "92b2ca62c8bd2b8d2f267cdfccf9bfbdb7322f778f8f91b3ce5b5cda23a3899f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.17.5"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.3.0"
+  octo_image:
+    dependency: transitive
+    description:
+      name: octo_image
+      sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.1"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.5"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.22"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.0"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.6"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.8"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.2"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.0"
+  riverpod:
+    dependency: transitive
+    description:
+      name: riverpod
+      sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
+  rxdart:
+    dependency: transitive
+    description:
+      name: rxdart
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.28.0"
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4"
+  shared_preferences_android:
+    dependency: transitive
+    description:
+      name: shared_preferences_android
+      sha256: "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.21"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.6"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.3"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.2"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      sha256: "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.0"
+  source_helper:
+    dependency: transitive
+    description:
+      name: source_helper
+      sha256: "4a85e90b50694e652075cbe4575665539d253e6ec10e46e76b45368ab5e3caae"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.10"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.2"
+  sqflite:
+    dependency: transitive
+    description:
+      name: sqflite
+      sha256: e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  sqflite_android:
+    dependency: transitive
+    description:
+      name: sqflite_android
+      sha256: "881e28efdcc9950fd8e9bb42713dcf1103e62a2e7168f23c9338d82db13dec40"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2+3"
+  sqflite_common:
+    dependency: transitive
+    description:
+      name: sqflite_common
+      sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.6"
+  sqflite_darwin:
+    dependency: transitive
+    description:
+      name: sqflite_darwin
+      sha256: "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  sqflite_platform_interface:
+    dependency: transitive
+    description:
+      name: sqflite_platform_interface
+      sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.12.1"
+  state_notifier:
+    dependency: transitive
+    description:
+      name: state_notifier
+      sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  synchronized:
+    dependency: transitive
+    description:
+      name: synchronized
+      sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.0"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.2"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.10"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.3"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
+      url: "https://pub.dev"
+    source: hosted
+    version: "15.0.2"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
+sdks:
+  dart: ">=3.10.3 <4.0.0"
+  flutter: ">=3.38.4"
diff --git a/ontime_merchant_flutter/pubspec.yaml b/ontime_merchant_flutter/pubspec.yaml
new file mode 100644
index 0000000..4d7ccf6
--- /dev/null
+++ b/ontime_merchant_flutter/pubspec.yaml
@@ -0,0 +1,35 @@
+name: ontime_merchant_flutter
+description: Ontime merchant Flutter app (MVP) consuming backendpanel Merchant API.
+version: 0.1.0+1
+
+environment:
+  sdk: ">=3.3.0 <4.0.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+
+  cupertino_icons: ^1.0.8
+
+  dio: ^5.7.0
+  json_annotation: ^4.9.0
+  flutter_riverpod: ^2.6.1
+  go_router: ^14.3.0
+  shared_preferences: ^2.3.3
+  firebase_core: ^3.6.0
+  firebase_messaging: ^15.1.0
+  intl: ^0.19.0
+  cached_network_image: ^3.4.1
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  flutter_lints: ^4.0.0
+  build_runner: ^2.4.13
+  json_serializable: ^6.9.0
+
+flutter:
+  uses-material-design: true
+  assets:
+    - assets/images/
+
diff --git a/ontime_merchant_flutter/test/widget_test.dart b/ontime_merchant_flutter/test/widget_test.dart
new file mode 100644
index 0000000..401a811
--- /dev/null
+++ b/ontime_merchant_flutter/test/widget_test.dart
@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility in the flutter_test package. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:ontime_merchant_flutter/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(const MyApp());
+
+    // Verify that our counter starts at 0.
+    expect(find.text('0'), findsOneWidget);
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}
diff --git a/ontime_user_flutter/.gitignore b/ontime_user_flutter/.gitignore
new file mode 100644
index 0000000..3820a95
--- /dev/null
+++ b/ontime_user_flutter/.gitignore
@@ -0,0 +1,45 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.build/
+.buildlog/
+.history
+.svn/
+.swiftpm/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
+/build/
+/coverage/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/ontime_user_flutter/.metadata b/ontime_user_flutter/.metadata
new file mode 100644
index 0000000..df13aa7
--- /dev/null
+++ b/ontime_user_flutter/.metadata
@@ -0,0 +1,30 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "ff37bef603469fb030f2b72995ab929ccfc227f0"
+  channel: "stable"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+      base_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+    - platform: android
+      create_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+      base_revision: ff37bef603469fb030f2b72995ab929ccfc227f0
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/ontime_user_flutter/README.md b/ontime_user_flutter/README.md
new file mode 100644
index 0000000..3eb3d79
--- /dev/null
+++ b/ontime_user_flutter/README.md
@@ -0,0 +1,35 @@
+# Ontime User (Flutter)
+
+Flutter app for Ontime **user** (pelanggan), using backend API at `https://apitest.semestaterpadu.my.id/api/`.
+
+## Setup
+
+- Flutter SDK (e.g. 3.19+)
+- Android: run `flutter create . --platforms=android` if the project was scaffolded without platform folders.
+- API uses HTTP Basic Auth; configure in backendpanel if required.
+
+## Run / Build
+
+```bash
+flutter pub get
+flutter run
+# or
+flutter build apk --release
+```
+
+APK output: `build/app/outputs/flutter-apk/app-release.apk`.
+
+## Firebase (FCM)
+
+To enable push notifications:
+
+1. Add `google-services.json` to `android/app/`.
+2. Ensure `android/build.gradle` and `android/app/build.gradle` apply the Google services plugin.
+
+If Firebase is not configured, the app still runs; FCM token is sent to the backend on login when available.
+
+## Validation
+
+- **Login**: `Pelanggan/login` (email or no_telepon + password, optional token).
+- **Home**: `Pelanggan/home` (slider, fitur, merchant nearby).
+- Compare with native app `OnTime_User_live` and backend responses for parity.
diff --git a/ontime_user_flutter/analysis_options.yaml b/ontime_user_flutter/analysis_options.yaml
new file mode 100644
index 0000000..0d29021
--- /dev/null
+++ b/ontime_user_flutter/analysis_options.yaml
@@ -0,0 +1,28 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at https://dart.dev/lints.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/ontime_user_flutter/android/.gitignore b/ontime_user_flutter/android/.gitignore
new file mode 100644
index 0000000..be3943c
--- /dev/null
+++ b/ontime_user_flutter/android/.gitignore
@@ -0,0 +1,14 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+.cxx/
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/to/reference-keystore
+key.properties
+**/*.keystore
+**/*.jks
diff --git a/ontime_user_flutter/android/app/build.gradle.kts b/ontime_user_flutter/android/app/build.gradle.kts
new file mode 100644
index 0000000..58e2ab8
--- /dev/null
+++ b/ontime_user_flutter/android/app/build.gradle.kts
@@ -0,0 +1,44 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "com.example.ontime_user_flutter"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    defaultConfig {
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "com.example.ontime_user_flutter"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}
diff --git a/ontime_user_flutter/android/app/src/debug/AndroidManifest.xml b/ontime_user_flutter/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000..399f698
--- /dev/null
+++ b/ontime_user_flutter/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/ontime_user_flutter/android/app/src/main/AndroidManifest.xml b/ontime_user_flutter/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..f1db6c6
--- /dev/null
+++ b/ontime_user_flutter/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,45 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:label="ontime_user_flutter"
+        android:name="${applicationName}"
+        android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:taskAffinity=""
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
+            <meta-data
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+    </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
+</manifest>
diff --git a/ontime_user_flutter/android/app/src/main/kotlin/com/example/ontime_user_flutter/MainActivity.kt b/ontime_user_flutter/android/app/src/main/kotlin/com/example/ontime_user_flutter/MainActivity.kt
new file mode 100644
index 0000000..71084a9
--- /dev/null
+++ b/ontime_user_flutter/android/app/src/main/kotlin/com/example/ontime_user_flutter/MainActivity.kt
@@ -0,0 +1,5 @@
+package com.example.ontime_user_flutter
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity : FlutterActivity()
diff --git a/ontime_user_flutter/android/app/src/main/res/drawable-v21/launch_background.xml b/ontime_user_flutter/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 0000000..f74085f
--- /dev/null
+++ b/ontime_user_flutter/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/ontime_user_flutter/android/app/src/main/res/drawable/launch_background.xml b/ontime_user_flutter/android/app/src/main/res/drawable/launch_background.xml
new file mode 100644
index 0000000..304732f
--- /dev/null
+++ b/ontime_user_flutter/android/app/src/main/res/drawable/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/ontime_user_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/ontime_user_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..db77bb4
Binary files /dev/null and b/ontime_user_flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/ontime_user_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/ontime_user_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..17987b7
Binary files /dev/null and b/ontime_user_flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/ontime_user_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/ontime_user_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..09d4391
Binary files /dev/null and b/ontime_user_flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/ontime_user_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ontime_user_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..d5f1c8d
Binary files /dev/null and b/ontime_user_flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/ontime_user_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/ontime_user_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..4d6372e
Binary files /dev/null and b/ontime_user_flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/ontime_user_flutter/android/app/src/main/res/values-night/styles.xml b/ontime_user_flutter/android/app/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..06952be
--- /dev/null
+++ b/ontime_user_flutter/android/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/ontime_user_flutter/android/app/src/main/res/values/styles.xml b/ontime_user_flutter/android/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..cb1ef88
--- /dev/null
+++ b/ontime_user_flutter/android/app/src/main/res/values/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/ontime_user_flutter/android/app/src/profile/AndroidManifest.xml b/ontime_user_flutter/android/app/src/profile/AndroidManifest.xml
new file mode 100644
index 0000000..399f698
--- /dev/null
+++ b/ontime_user_flutter/android/app/src/profile/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/ontime_user_flutter/android/build.gradle.kts b/ontime_user_flutter/android/build.gradle.kts
new file mode 100644
index 0000000..dbee657
--- /dev/null
+++ b/ontime_user_flutter/android/build.gradle.kts
@@ -0,0 +1,24 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory =
+    rootProject.layout.buildDirectory
+        .dir("../../build")
+        .get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}
diff --git a/ontime_user_flutter/android/gradle.properties b/ontime_user_flutter/android/gradle.properties
new file mode 100644
index 0000000..fbee1d8
--- /dev/null
+++ b/ontime_user_flutter/android/gradle.properties
@@ -0,0 +1,2 @@
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
+android.useAndroidX=true
diff --git a/ontime_user_flutter/android/gradle/wrapper/gradle-wrapper.properties b/ontime_user_flutter/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..e4ef43f
--- /dev/null
+++ b/ontime_user_flutter/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
diff --git a/ontime_user_flutter/android/settings.gradle.kts b/ontime_user_flutter/android/settings.gradle.kts
new file mode 100644
index 0000000..ca7fe06
--- /dev/null
+++ b/ontime_user_flutter/android/settings.gradle.kts
@@ -0,0 +1,26 @@
+pluginManagement {
+    val flutterSdkPath =
+        run {
+            val properties = java.util.Properties()
+            file("local.properties").inputStream().use { properties.load(it) }
+            val flutterSdkPath = properties.getProperty("flutter.sdk")
+            require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+            flutterSdkPath
+        }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+}
+
+include(":app")
diff --git a/ontime_user_flutter/assets/images/.gitkeep b/ontime_user_flutter/assets/images/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/ontime_user_flutter/lib/core/app_config.dart b/ontime_user_flutter/lib/core/app_config.dart
new file mode 100644
index 0000000..aa21dc2
--- /dev/null
+++ b/ontime_user_flutter/lib/core/app_config.dart
@@ -0,0 +1,18 @@
+class AppConfig {
+  /// Base URL for the Ontime test backend.
+  static const String baseUrl = 'https://apitest.semestaterpadu.my.id/';
+
+  /// API root (`/api/`).
+  static const String apiBase = '${baseUrl}api/';
+
+  /// Image base URLs (kept consistent with Java Constants).
+  static const String imagesFitur = '${baseUrl}images/fitur/';
+  static const String imagesMerchant = '${baseUrl}images/merchant/';
+  static const String imagesBank = '${baseUrl}images/bank/';
+  static const String imagesItem = '${baseUrl}images/itemmerchant/';
+  static const String imagesBerita = '${baseUrl}images/berita/';
+  static const String imagesSlider = '${baseUrl}images/promo/';
+  static const String imagesDriver = '${baseUrl}images/fotodriver/';
+  static const String imagesUser = '${baseUrl}images/pelanggan/';
+}
+
diff --git a/ontime_user_flutter/lib/core/app_router.dart b/ontime_user_flutter/lib/core/app_router.dart
new file mode 100644
index 0000000..eabac37
--- /dev/null
+++ b/ontime_user_flutter/lib/core/app_router.dart
@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ontime_user_flutter/features/auth/presentation/login_screen.dart';
+import 'package:ontime_user_flutter/features/home/presentation/home_shell.dart';
+
+final GlobalKey<NavigatorState> _rootNavigatorKey =
+    GlobalKey<NavigatorState>(debugLabel: 'rootNavigator');
+
+GoRouter createAppRouter() {
+  return GoRouter(
+    navigatorKey: _rootNavigatorKey,
+    initialLocation: '/auth/login',
+    routes: [
+      GoRoute(
+        path: '/auth/login',
+        name: 'login',
+        pageBuilder: (context, state) =>
+            const MaterialPage(child: LoginScreen()),
+      ),
+      GoRoute(
+        path: '/home',
+        name: 'home',
+        pageBuilder: (context, state) =>
+            const MaterialPage(child: HomeShell()),
+      ),
+    ],
+  );
+}
+
diff --git a/ontime_user_flutter/lib/core/app_theme.dart b/ontime_user_flutter/lib/core/app_theme.dart
new file mode 100644
index 0000000..118c26b
--- /dev/null
+++ b/ontime_user_flutter/lib/core/app_theme.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+
+class AppTheme {
+  static ThemeData light() {
+    final base = ThemeData.light(useMaterial3: true);
+    return base.copyWith(
+      colorScheme: ColorScheme.fromSeed(
+        seedColor: const Color(0xFF00AEEF),
+      ),
+      scaffoldBackgroundColor: Colors.grey[50],
+      appBarTheme: const AppBarTheme(
+        elevation: 0,
+        centerTitle: true,
+      ),
+      inputDecorationTheme: const InputDecorationTheme(
+        border: OutlineInputBorder(),
+      ),
+    );
+  }
+}
+
diff --git a/ontime_user_flutter/lib/core/fcm_service.dart b/ontime_user_flutter/lib/core/fcm_service.dart
new file mode 100644
index 0000000..6d03fcc
--- /dev/null
+++ b/ontime_user_flutter/lib/core/fcm_service.dart
@@ -0,0 +1,32 @@
+import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+
+/// FCM token for backend (Pelanggan uses `token` or `reg_id`).
+/// Initialize in main(), then pass token to login.
+class FcmService {
+  static bool _initialized = false;
+
+  static Future<void> init() async {
+    if (_initialized) return;
+    try {
+      await Firebase.initializeApp();
+      _initialized = true;
+    } catch (_) {
+      // No Firebase config (e.g. missing google-services.json)
+    }
+  }
+
+  static Future<String?> getToken() async {
+    if (!_initialized) return null;
+    try {
+      final token = await FirebaseMessaging.instance.getToken();
+      return token;
+    } catch (_) {
+      return null;
+    }
+  }
+
+  static void setBackgroundHandler(Future<void> Function(RemoteMessage) handler) {
+    FirebaseMessaging.onBackgroundMessage(handler);
+  }
+}
diff --git a/ontime_user_flutter/lib/data/api/api_client.dart b/ontime_user_flutter/lib/data/api/api_client.dart
new file mode 100644
index 0000000..c4c423a
--- /dev/null
+++ b/ontime_user_flutter/lib/data/api/api_client.dart
@@ -0,0 +1,26 @@
+import 'package:dio/dio.dart';
+import 'package:ontime_user_flutter/core/app_config.dart';
+
+class ApiClient {
+  ApiClient({
+    required String? basicAuthUser,
+    required String? basicAuthPassword,
+  }) : _dio = Dio(
+          BaseOptions(
+            baseUrl: AppConfig.apiBase,
+            connectTimeout: const Duration(seconds: 15),
+            receiveTimeout: const Duration(seconds: 20),
+          ),
+        ) {
+    if (basicAuthUser != null && basicAuthPassword != null) {
+      final auth = '$basicAuthUser:$basicAuthPassword';
+      final encoded = String.fromCharCodes(auth.codeUnits);
+      _dio.options.headers['Authorization'] = 'Basic $encoded';
+    }
+  }
+
+  final Dio _dio;
+
+  Dio get raw => _dio;
+}
+
diff --git a/ontime_user_flutter/lib/features/auth/application/auth_controller.dart b/ontime_user_flutter/lib/features/auth/application/auth_controller.dart
new file mode 100644
index 0000000..f6ab4c9
--- /dev/null
+++ b/ontime_user_flutter/lib/features/auth/application/auth_controller.dart
@@ -0,0 +1,71 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:ontime_user_flutter/data/api/api_client.dart';
+import 'package:ontime_user_flutter/features/auth/data/auth_api.dart';
+import 'package:ontime_user_flutter/features/auth/data/models/user_model.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class AuthState {
+  const AuthState({
+    this.user,
+    this.isLoading = false,
+    this.errorMessage,
+  });
+
+  final UserModel? user;
+  final bool isLoading;
+  final String? errorMessage;
+
+  AuthState copyWith({
+    UserModel? user,
+    bool? isLoading,
+    String? errorMessage,
+  }) {
+    return AuthState(
+      user: user ?? this.user,
+      isLoading: isLoading ?? this.isLoading,
+      errorMessage: errorMessage,
+    );
+  }
+}
+
+final authControllerProvider =
+    StateNotifierProvider<AuthController, AuthState>((ref) {
+  return AuthController();
+});
+
+class AuthController extends StateNotifier<AuthState> {
+  AuthController() : super(const AuthState());
+
+  late final AuthApi _api =
+      AuthApi(ApiClient(basicAuthUser: null, basicAuthPassword: null));
+
+  Future<void> login({
+    String? phone,
+    String? email,
+    required String password,
+    String? fcmToken,
+  }) async {
+    state = state.copyWith(isLoading: true, errorMessage: null);
+    try {
+      final user = await _api.login(
+        phone: phone,
+        email: email,
+        password: password,
+        fcmToken: fcmToken,
+      );
+      state = state.copyWith(user: user, isLoading: false);
+
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setString('user_id', user.id);
+      await prefs.setString('user_token', user.token);
+      await prefs.setString('user_phone', user.phone);
+      await prefs.setString('user_email', user.email);
+    } catch (e) {
+      state = state.copyWith(
+        isLoading: false,
+        errorMessage: e.toString(),
+      );
+    }
+  }
+}
+
diff --git a/ontime_user_flutter/lib/features/auth/data/auth_api.dart b/ontime_user_flutter/lib/features/auth/data/auth_api.dart
new file mode 100644
index 0000000..fd96373
--- /dev/null
+++ b/ontime_user_flutter/lib/features/auth/data/auth_api.dart
@@ -0,0 +1,47 @@
+import 'package:dio/dio.dart';
+import 'package:ontime_user_flutter/data/api/api_client.dart';
+import 'package:ontime_user_flutter/features/auth/data/models/user_model.dart';
+
+class AuthApi {
+  AuthApi(this._client);
+
+  final ApiClient _client;
+
+  Future<UserModel> login({
+    String? phone,
+    String? email,
+    required String password,
+    String? fcmToken,
+  }) async {
+    final payload = <String, dynamic>{
+      'password': password,
+    };
+    if (phone != null && phone.isNotEmpty) {
+      payload['no_telepon'] = phone;
+    }
+    if (email != null && email.isNotEmpty) {
+      payload['email'] = email;
+    }
+    if (fcmToken != null && fcmToken.isNotEmpty) {
+      payload['token'] = fcmToken;
+    }
+
+    final Response<dynamic> response =
+        await _client.raw.post('Pelanggan/login', data: payload);
+
+    final data = response.data is Map<String, dynamic>
+        ? response.data as Map<String, dynamic>
+        : <String, dynamic>{};
+
+    if (data['code']?.toString() != '200') {
+      throw Exception(data['message'] ?? 'Login failed');
+    }
+
+    final List<dynamic> list = data['data'] as List<dynamic>? ?? [];
+    if (list.isEmpty) {
+      throw Exception('User data not found in response');
+    }
+    return UserModel.fromJson(list.first as Map<String, dynamic>);
+  }
+}
+
diff --git a/ontime_user_flutter/lib/features/auth/data/models/user_model.dart b/ontime_user_flutter/lib/features/auth/data/models/user_model.dart
new file mode 100644
index 0000000..1a4d4ab
--- /dev/null
+++ b/ontime_user_flutter/lib/features/auth/data/models/user_model.dart
@@ -0,0 +1,35 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'user_model.g.dart';
+
+@JsonSerializable()
+class UserModel {
+  UserModel({
+    required this.id,
+    required this.fullName,
+    required this.email,
+    required this.phone,
+    required this.token,
+  });
+
+  @JsonKey(name: 'id')
+  final String id;
+
+  @JsonKey(name: 'fullnama')
+  final String fullName;
+
+  @JsonKey(name: 'email')
+  final String email;
+
+  @JsonKey(name: 'no_telepon')
+  final String phone;
+
+  @JsonKey(name: 'token')
+  final String token;
+
+  factory UserModel.fromJson(Map<String, dynamic> json) =>
+      _$UserModelFromJson(json);
+
+  Map<String, dynamic> toJson() => _$UserModelToJson(this);
+}
+
diff --git a/ontime_user_flutter/lib/features/auth/data/models/user_model.g.dart b/ontime_user_flutter/lib/features/auth/data/models/user_model.g.dart
new file mode 100644
index 0000000..8324605
--- /dev/null
+++ b/ontime_user_flutter/lib/features/auth/data/models/user_model.g.dart
@@ -0,0 +1,22 @@
+// GENERATED CODE - placeholder for build_runner. You can regenerate.
+
+part of 'user_model.dart';
+
+UserModel _$UserModelFromJson(Map<String, dynamic> json) {
+  return UserModel(
+    id: json['id'] as String? ?? '',
+    fullName: json['fullnama'] as String? ?? '',
+    email: json['email'] as String? ?? '',
+    phone: json['no_telepon'] as String? ?? '',
+    token: json['token'] as String? ?? '',
+  );
+}
+
+Map<String, dynamic> _$UserModelToJson(UserModel instance) => <String, dynamic>{
+      'id': instance.id,
+      'fullnama': instance.fullName,
+      'email': instance.email,
+      'no_telepon': instance.phone,
+      'token': instance.token,
+    };
+
diff --git a/ontime_user_flutter/lib/features/auth/presentation/login_screen.dart b/ontime_user_flutter/lib/features/auth/presentation/login_screen.dart
new file mode 100644
index 0000000..cc2206a
--- /dev/null
+++ b/ontime_user_flutter/lib/features/auth/presentation/login_screen.dart
@@ -0,0 +1,122 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+import 'package:ontime_user_flutter/core/fcm_service.dart';
+import 'package:ontime_user_flutter/features/auth/application/auth_controller.dart';
+
+class LoginScreen extends ConsumerStatefulWidget {
+  const LoginScreen({super.key});
+
+  @override
+  ConsumerState<LoginScreen> createState() => _LoginScreenState();
+}
+
+class _LoginScreenState extends ConsumerState<LoginScreen> {
+  final _formKey = GlobalKey<FormState>();
+  final _emailController = TextEditingController();
+  final _phoneController = TextEditingController();
+  final _passwordController = TextEditingController();
+
+  @override
+  void dispose() {
+    _emailController.dispose();
+    _phoneController.dispose();
+    _passwordController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _submit() async {
+    if (!_formKey.currentState!.validate()) return;
+
+    final fcmToken = await FcmService.getToken();
+    final auth = ref.read(authControllerProvider.notifier);
+    await auth.login(
+      email: _emailController.text.trim().isEmpty
+          ? null
+          : _emailController.text.trim(),
+      phone: _phoneController.text.trim().isEmpty
+          ? null
+          : _phoneController.text.trim(),
+      password: _passwordController.text,
+      fcmToken: fcmToken,
+    );
+
+    final state = ref.read(authControllerProvider);
+    if (state.user != null) {
+      if (mounted) {
+        context.go('/home');
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final state = ref.watch(authControllerProvider);
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Masuk'),
+      ),
+      body: SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Form(
+            key: _formKey,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                TextFormField(
+                  controller: _emailController,
+                  decoration: const InputDecoration(
+                    labelText: 'Email',
+                  ),
+                ),
+                const SizedBox(height: 12),
+                TextFormField(
+                  controller: _phoneController,
+                  decoration: const InputDecoration(
+                    labelText: 'No. Telepon',
+                  ),
+                  keyboardType: TextInputType.phone,
+                ),
+                const SizedBox(height: 12),
+                TextFormField(
+                  controller: _passwordController,
+                  decoration: const InputDecoration(
+                    labelText: 'Kata sandi',
+                  ),
+                  obscureText: true,
+                  validator: (value) {
+                    if (value == null || value.isEmpty) {
+                      return 'Password wajib diisi';
+                    }
+                    return null;
+                  },
+                ),
+                const SizedBox(height: 16),
+                if (state.errorMessage != null)
+                  Text(
+                    state.errorMessage!,
+                    style: TextStyle(
+                      color: Theme.of(context).colorScheme.error,
+                    ),
+                  ),
+                const Spacer(),
+                ElevatedButton(
+                  onPressed: state.isLoading ? null : _submit,
+                  child: state.isLoading
+                      ? const SizedBox(
+                          height: 20,
+                          width: 20,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      : const Text('Masuk'),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
diff --git a/ontime_user_flutter/lib/features/home/presentation/home_shell.dart b/ontime_user_flutter/lib/features/home/presentation/home_shell.dart
new file mode 100644
index 0000000..7599dbb
--- /dev/null
+++ b/ontime_user_flutter/lib/features/home/presentation/home_shell.dart
@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+
+class HomeShell extends StatefulWidget {
+  const HomeShell({super.key});
+
+  @override
+  State<HomeShell> createState() => _HomeShellState();
+}
+
+class _HomeShellState extends State<HomeShell> {
+  int _index = 0;
+
+  @override
+  Widget build(BuildContext context) {
+    final pages = <Widget>[
+      const Center(child: Text('Beranda (slider, fitur, merchant terdekat)')),
+      const Center(child: Text('Pesanan (aktif & riwayat)')),
+      const Center(child: Text('Dompet (saldo & topup/withdraw)')),
+      const Center(child: Text('Profil')),
+    ];
+
+    return Scaffold(
+      body: SafeArea(
+        child: pages[_index],
+      ),
+      bottomNavigationBar: NavigationBar(
+        selectedIndex: _index,
+        onDestinationSelected: (i) => setState(() => _index = i),
+        destinations: const [
+          NavigationDestination(
+            icon: Icon(Icons.home_outlined),
+            selectedIcon: Icon(Icons.home),
+            label: 'Beranda',
+          ),
+          NavigationDestination(
+            icon: Icon(Icons.receipt_long_outlined),
+            selectedIcon: Icon(Icons.receipt_long),
+            label: 'Pesanan',
+          ),
+          NavigationDestination(
+            icon: Icon(Icons.account_balance_wallet_outlined),
+            selectedIcon: Icon(Icons.account_balance_wallet),
+            label: 'Dompet',
+          ),
+          NavigationDestination(
+            icon: Icon(Icons.person_outline),
+            selectedIcon: Icon(Icons.person),
+            label: 'Profil',
+          ),
+        ],
+      ),
+    );
+  }
+}
+
diff --git a/ontime_user_flutter/lib/main.dart b/ontime_user_flutter/lib/main.dart
new file mode 100644
index 0000000..3e73188
--- /dev/null
+++ b/ontime_user_flutter/lib/main.dart
@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import 'core/app_router.dart';
+import 'core/app_theme.dart';
+import 'core/fcm_service.dart';
+
+void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+  await FcmService.init();
+  final router = createAppRouter();
+  runApp(ProviderScope(child: OntimeUserApp(router: router)));
+}
+
+class OntimeUserApp extends StatelessWidget {
+  const OntimeUserApp({super.key, required this.router});
+
+  final Object router;
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp.router(
+      debugShowCheckedModeBanner: false,
+      title: 'Ontime User',
+      theme: AppTheme.light(),
+      routerConfig: router as dynamic,
+    );
+  }
+}
+
diff --git a/ontime_user_flutter/pubspec.lock b/ontime_user_flutter/pubspec.lock
new file mode 100644
index 0000000..40dd2bb
--- /dev/null
+++ b/ontime_user_flutter/pubspec.lock
@@ -0,0 +1,1106 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      sha256: "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "93.0.0"
+  _flutterfire_internals:
+    dependency: transitive
+    description:
+      name: _flutterfire_internals
+      sha256: ff0a84a2734d9e1089f8aedd5c0af0061b82fb94e95260d943404e0ef2134b11
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.59"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      sha256: de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.1"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.13.0"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      sha256: "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.4"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      sha256: "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.1"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      sha256: "7981eb922842c77033026eb4341d5af651562008cdb116bdfa31fc46516b6462"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.12.2"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.1"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      sha256: "6ae8a6435a8c6520c7077b107e77f1fb4ba7009633259a4d49a8afd8e7efc5e9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.12.4"
+  cached_network_image:
+    dependency: "direct main"
+    description:
+      name: cached_network_image
+      sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.1"
+  cached_network_image_platform_interface:
+    dependency: transitive
+    description:
+      name: cached_network_image_platform_interface
+      sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.1"
+  cached_network_image_web:
+    dependency: transitive
+    description:
+      name: cached_network_image_web
+      sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  code_assets:
+    dependency: transitive
+    description:
+      name: code_assets
+      sha256: "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      sha256: "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.11.1"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.19.1"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.2"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.7"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  cupertino_icons:
+    dependency: "direct main"
+    description:
+      name: cupertino_icons
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.8"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      sha256: "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.7"
+  dio:
+    dependency: "direct main"
+    description:
+      name: dio
+      sha256: aff32c08f92787a557dd5c0145ac91536481831a01b4648136373cddb0e64f8c
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.9.2"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: "2f9e64323a7c3c7ef69567d5c800424a11f8337b8b228bad02524c9fb3c1f340"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.3"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.1"
+  firebase_core:
+    dependency: "direct main"
+    description:
+      name: firebase_core
+      sha256: "7be63a3f841fc9663342f7f3a011a42aef6a61066943c90b1c434d79d5c995c5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.15.2"
+  firebase_core_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_core_platform_interface
+      sha256: cccb4f572325dc14904c02fcc7db6323ad62ba02536833dddb5c02cac7341c64
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.2"
+  firebase_core_web:
+    dependency: transitive
+    description:
+      name: firebase_core_web
+      sha256: "0ed0dc292e8f9ac50992e2394e9d336a0275b6ae400d64163fdf0a8a8b556c37"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.24.1"
+  firebase_messaging:
+    dependency: "direct main"
+    description:
+      name: firebase_messaging
+      sha256: "60be38574f8b5658e2f22b7e311ff2064bea835c248424a383783464e8e02fcc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "15.2.10"
+  firebase_messaging_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_messaging_platform_interface
+      sha256: "685e1771b3d1f9c8502771ccc9f91485b376ffe16d553533f335b9183ea99754"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.6.10"
+  firebase_messaging_web:
+    dependency: transitive
+    description:
+      name: firebase_messaging_web
+      sha256: "0d1be17bc89ed3ff5001789c92df678b2e963a51b6fa2bdb467532cc9dbed390"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.10.10"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_cache_manager:
+    dependency: transitive
+    description:
+      name: flutter_cache_manager
+      sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.1"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  flutter_plugin_android_lifecycle:
+    dependency: transitive
+    description:
+      name: flutter_plugin_android_lifecycle
+      sha256: ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.33"
+  flutter_riverpod:
+    dependency: "direct main"
+    description:
+      name: flutter_riverpod
+      sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  geolocator:
+    dependency: "direct main"
+    description:
+      name: geolocator
+      sha256: f62bcd90459e63210bbf9c35deb6a51c521f992a78de19a1fe5c11704f9530e2
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.4"
+  geolocator_android:
+    dependency: transitive
+    description:
+      name: geolocator_android
+      sha256: fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.6.2"
+  geolocator_apple:
+    dependency: transitive
+    description:
+      name: geolocator_apple
+      sha256: dbdd8789d5aaf14cf69f74d4925ad1336b4433a6efdf2fce91e8955dc921bf22
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.13"
+  geolocator_platform_interface:
+    dependency: transitive
+    description:
+      name: geolocator_platform_interface
+      sha256: "30cb64f0b9adcc0fb36f628b4ebf4f731a2961a0ebd849f4b56200205056fe67"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.6"
+  geolocator_web:
+    dependency: transitive
+    description:
+      name: geolocator_web
+      sha256: b1ae9bdfd90f861fde8fd4f209c37b953d65e92823cb73c7dee1fa021b06f172
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.3"
+  geolocator_windows:
+    dependency: transitive
+    description:
+      name: geolocator_windows
+      sha256: "175435404d20278ffd220de83c2ca293b73db95eafbdc8131fe8609be1421eb6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.5"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.3"
+  go_router:
+    dependency: "direct main"
+    description:
+      name: go_router
+      sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.8.1"
+  google_maps:
+    dependency: transitive
+    description:
+      name: google_maps
+      sha256: "5d410c32112d7c6eb7858d359275b2aa04778eed3e36c745aeae905fb2fa6468"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.2.0"
+  google_maps_flutter:
+    dependency: "direct main"
+    description:
+      name: google_maps_flutter
+      sha256: "85339d0c9b5c7bac305df0bc1bc72a990f7f59b1846f048c96c022110d5d4a69"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.15.0"
+  google_maps_flutter_android:
+    dependency: transitive
+    description:
+      name: google_maps_flutter_android
+      sha256: ba0947315ddc9107ecc8d95fa26eb3b87b4f27b221606ce72518314d99c7306c
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.19.2"
+  google_maps_flutter_ios:
+    dependency: transitive
+    description:
+      name: google_maps_flutter_ios
+      sha256: c855600dce17e77e8af96edcf85cb68501675bb77a72f85009d08c17a8805ace
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.18.0"
+  google_maps_flutter_platform_interface:
+    dependency: transitive
+    description:
+      name: google_maps_flutter_platform_interface
+      sha256: "0f8c6674d70c7e9a09cd34f63b18ebaf8a5822e85b558128eae0fdf02b4a3e93"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.14.2"
+  google_maps_flutter_web:
+    dependency: transitive
+    description:
+      name: google_maps_flutter_web
+      sha256: "2321d24f8bce2d01c441b9fd7835a6032ea44b3f0bfcf93bcebd9740fb5a85cd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.1"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  hooks:
+    dependency: transitive
+    description:
+      name: hooks
+      sha256: e79ed1e8e1929bc6ecb6ec85f0cb519c887aa5b423705ded0d0f2d9226def388
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.6"
+  http:
+    dependency: transitive
+    description:
+      name: http
+      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.6.0"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.2"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.2"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.19.0"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
+  json_annotation:
+    dependency: "direct main"
+    description:
+      name: json_annotation
+      sha256: cb09e7dac6210041fad964ed7fbee004f14258b4eca4040f72d1234062ace4c8
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.11.0"
+  json_serializable:
+    dependency: "direct dev"
+    description:
+      name: json_serializable
+      sha256: "44729f5c45748e6748f6b9a57ab8f7e4336edc8ae41fc295070e3814e616a6c0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.13.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.0.2"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.10"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.19"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.13.0"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.17.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
+  native_toolchain_c:
+    dependency: transitive
+    description:
+      name: native_toolchain_c
+      sha256: "92b2ca62c8bd2b8d2f267cdfccf9bfbdb7322f778f8f91b3ce5b5cda23a3899f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.17.5"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.3.0"
+  octo_image:
+    dependency: transitive
+    description:
+      name: octo_image
+      sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.1"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.5"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.22"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.0"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.4.0"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.1.0"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.4.7"
+  permission_handler_html:
+    dependency: transitive
+    description:
+      name: permission_handler_html
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3+5"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.6"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.8"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.2"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.0"
+  riverpod:
+    dependency: transitive
+    description:
+      name: riverpod
+      sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.1"
+  rxdart:
+    dependency: transitive
+    description:
+      name: rxdart
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.28.0"
+  sanitize_html:
+    dependency: transitive
+    description:
+      name: sanitize_html
+      sha256: "12669c4a913688a26555323fb9cec373d8f9fbe091f2d01c40c723b33caa8989"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.4"
+  shared_preferences_android:
+    dependency: transitive
+    description:
+      name: shared_preferences_android
+      sha256: "8374d6200ab33ac99031a852eba4c8eb2170c4bf20778b3e2c9eccb45384fb41"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.21"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.6"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.3"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.2"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      sha256: "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.0"
+  source_helper:
+    dependency: transitive
+    description:
+      name: source_helper
+      sha256: "4a85e90b50694e652075cbe4575665539d253e6ec10e46e76b45368ab5e3caae"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.10"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.2"
+  sqflite:
+    dependency: transitive
+    description:
+      name: sqflite
+      sha256: e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  sqflite_android:
+    dependency: transitive
+    description:
+      name: sqflite_android
+      sha256: "881e28efdcc9950fd8e9bb42713dcf1103e62a2e7168f23c9338d82db13dec40"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2+3"
+  sqflite_common:
+    dependency: transitive
+    description:
+      name: sqflite_common
+      sha256: "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.5.6"
+  sqflite_darwin:
+    dependency: transitive
+    description:
+      name: sqflite_darwin
+      sha256: "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.2"
+  sqflite_platform_interface:
+    dependency: transitive
+    description:
+      name: sqflite_platform_interface
+      sha256: "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.12.1"
+  state_notifier:
+    dependency: transitive
+    description:
+      name: state_notifier
+      sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  synchronized:
+    dependency: transitive
+    description:
+      name: synchronized
+      sha256: c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.0"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.2"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.10"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.5.3"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
+      url: "https://pub.dev"
+    source: hosted
+    version: "15.0.2"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.3"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
+sdks:
+  dart: ">=3.10.3 <4.0.0"
+  flutter: ">=3.38.4"
diff --git a/ontime_user_flutter/pubspec.yaml b/ontime_user_flutter/pubspec.yaml
new file mode 100644
index 0000000..61205d0
--- /dev/null
+++ b/ontime_user_flutter/pubspec.yaml
@@ -0,0 +1,50 @@
+name: ontime_user_flutter
+description: Ontime user Flutter app (MVP) consuming backendpanel Pelanggan API.
+version: 0.1.0+1
+
+environment:
+  sdk: ">=3.3.0 <4.0.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+
+  cupertino_icons: ^1.0.8
+
+  # HTTP & JSON
+  dio: ^5.7.0
+  json_annotation: ^4.9.0
+
+  # State management
+  flutter_riverpod: ^2.6.1
+
+  # Navigation
+  go_router: ^14.3.0
+
+  # Storage
+  shared_preferences: ^2.3.3
+
+  # Location & maps (MVP)
+  geolocator: ^13.0.2
+  google_maps_flutter: ^2.10.0
+  permission_handler: ^11.3.1
+
+  # Firebase / FCM (tokens wired to existing backend)
+  firebase_core: ^3.6.0
+  firebase_messaging: ^15.1.0
+
+  # UI helpers
+  intl: ^0.19.0
+  cached_network_image: ^3.4.1
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  flutter_lints: ^4.0.0
+  build_runner: ^2.4.13
+  json_serializable: ^6.9.0
+
+flutter:
+  uses-material-design: true
+  assets:
+    - assets/images/
diff --git a/ontime_user_flutter/test/widget_test.dart b/ontime_user_flutter/test/widget_test.dart
new file mode 100644
index 0000000..fa91ef1
--- /dev/null
+++ b/ontime_user_flutter/test/widget_test.dart
@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import 'package:ontime_user_flutter/core/app_router.dart';
+import 'package:ontime_user_flutter/main.dart';
+
+void main() {
+  testWidgets('App loads and shows login', (WidgetTester tester) async {
+    final router = createAppRouter();
+    await tester.pumpWidget(
+      ProviderScope(
+        child: OntimeUserApp(router: router),
+      ),
+    );
+    await tester.pumpAndSettle();
+    expect(find.text('Masuk'), findsOneWidget);
+  });
+}
diff --git a/test/README.md b/test/README.md
new file mode 100644
index 0000000..f06e3df
--- /dev/null
+++ b/test/README.md
@@ -0,0 +1,57 @@
+# Ontime Merchant (id.ontime.merchant)
+
+Small Android app: Firebase Auth (phone OTP and email/password), FCM, and request/response logging.
+
+## Setup
+
+1. **Open in Android Studio** (or ensure JDK 17+ and Android SDK are installed).
+2. **Firebase Console** (project `ngojol-trial`):
+   - Enable **Authentication → Sign-in method → Email/Password** (for email login).
+   - Enable **Authentication → Sign-in method → Phone** (for phone OTP login). Add your app’s SHA-1 in Project settings if you use phone auth (e.g. from `keytool -list -v -keystore app/ontimekeystore.jks`).
+3. **Realtime Database** (required for Send message): This app uses the same Firebase project as other apps. **Add** only the `merchant_messages` rules; do **not** replace your existing rules.
+   - In Firebase Console → **Realtime Database** → **Rules**, open your current rules.
+   - Inside the `"rules"` object, add the block below (keep any existing keys like `customer_messages`, `driver_messages`, etc.):
+   ```json
+   "merchant_messages": {
+     "$uid": {
+       ".read": "auth != null",
+       ".write": "auth != null"
+     }
+   }
+   ```
+   - Example merged rules (yours may differ):
+   ```json
+   {
+     "rules": {
+       "customer_messages": { ... },
+       "driver_messages": { ... },
+       "merchant_messages": {
+         "$uid": {
+           ".read": "auth != null",
+           ".write": "auth != null"
+         }
+       }
+     }
+   }
+   ```
+   Then click **Publish**. See `database.rules.merge-only.txt` for the fragment only.
+4. Build and run: **Run → Run 'app'** or `./gradlew assembleDebug` (with Java and Android SDK on PATH).
+
+## Credentials
+
+- **Phone:** 62811936767 (for OTP: use with country code, e.g. +62811936767; for email login: `62811936767@merchant.ontime.id`)
+- **Password:** 123456 (email/password only)
+
+## Screens
+
+- **Login** – Two options: (1) **Login with phone (OTP)**: enter phone, tap Send OTP, enter SMS code, tap Verify; (2) **Login with email/password**: enter phone + password, Login or Register. Shows login token and request message in text fields.
+- **Home** – Launcher to Send message, Receipt message, Request & Response log; shows FCM token.
+- **Send message** – Type message, send to Firebase Realtime Database; sent payload/request shown in text.
+- **Receipt message** – Received FCM messages in text form.
+- **Request & Response log** – Text log of recent requests and responses (Auth, RTDB, FCM).
+
+## Project layout
+
+- `app/build.gradle` – App config, package `id.ontime.merchant`, signing with `ontimekeystore.jks`.
+- `app/google-services.json` – Firebase config (unchanged).
+- `app/ontimekeystore.jks` – Debug/release signing (store/key password: `123456@ontime`, alias: `ontimekeystore`).
diff --git a/test/app/build.gradle b/test/app/build.gradle
new file mode 100644
index 0000000..cbabed3
--- /dev/null
+++ b/test/app/build.gradle
@@ -0,0 +1,56 @@
+apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
+
+android {
+    namespace "id.ontime.merchant"
+    signingConfigs {
+        debug {
+            storeFile file('ontimekeystore.jks')
+            storePassword '123456@ontime'
+            keyAlias 'ontimekeystore'
+            keyPassword '123456@ontime'
+        }
+    }
+    compileSdk 34
+
+    defaultConfig {
+        applicationId "id.ontime.merchant"
+        minSdk 21
+        targetSdk 34
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
+    }
+    lint {
+        checkReleaseBuilds false
+        abortOnError false
+    }
+    buildTypes {
+        debug {
+            signingConfig signingConfigs.debug
+        }
+        release {
+            signingConfig signingConfigs.debug
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation platform('com.google.firebase:firebase-bom:32.7.0')
+    implementation 'com.google.firebase:firebase-auth'
+    implementation 'com.google.firebase:firebase-messaging'
+    implementation 'com.google.firebase:firebase-database'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
diff --git a/test/app/proguard-rules.pro b/test/app/proguard-rules.pro
new file mode 100644
index 0000000..e3737d1
--- /dev/null
+++ b/test/app/proguard-rules.pro
@@ -0,0 +1,2 @@
+# Add project specific ProGuard rules here.
+-keepattributes *Annotation*
diff --git a/test/app/src/main/AndroidManifest.xml b/test/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..16868aa
--- /dev/null
+++ b/test/app/src/main/AndroidManifest.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="id.ontime.merchant">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:name=".OntimeMerchantApp"
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@drawable/ic_launcher"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.OntimeMerchant">
+        <activity
+            android:name=".LoginActivity"
+            android:exported="true"
+            android:theme="@style/Theme.OntimeMerchant">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".HomeActivity"
+            android:exported="false" />
+        <activity
+            android:name=".SendMessageActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ReceiptMessageActivity"
+            android:exported="false" />
+        <activity
+            android:name=".RequestResponseLogActivity"
+            android:exported="false" />
+        <service
+            android:name=".OntimeFcmService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+    </application>
+</manifest>
diff --git a/test/app/src/main/java/id/ontime/merchant/HomeActivity.java b/test/app/src/main/java/id/ontime/merchant/HomeActivity.java
new file mode 100644
index 0000000..7e78f4e
--- /dev/null
+++ b/test/app/src/main/java/id/ontime/merchant/HomeActivity.java
@@ -0,0 +1,38 @@
+package id.ontime.merchant;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.EditText;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.messaging.FirebaseMessaging;
+
+public class HomeActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (FirebaseAuth.getInstance().getCurrentUser() == null) {
+            startActivity(new Intent(this, LoginActivity.class));
+            finish();
+            return;
+        }
+        setContentView(R.layout.activity_home);
+
+        EditText fcmTokenText = findViewById(R.id.fcmTokenText);
+        FirebaseMessaging.getInstance().getToken()
+                .addOnCompleteListener(task -> {
+                    if (task.isSuccessful() && task.getResult() != null) {
+                        fcmTokenText.setText(task.getResult());
+                    }
+                });
+
+        findViewById(R.id.btnSendMessage).setOnClickListener(v ->
+                startActivity(new Intent(this, SendMessageActivity.class)));
+        findViewById(R.id.btnReceiptMessage).setOnClickListener(v ->
+                startActivity(new Intent(this, ReceiptMessageActivity.class)));
+        findViewById(R.id.btnRequestResponseLog).setOnClickListener(v ->
+                startActivity(new Intent(this, RequestResponseLogActivity.class)));
+    }
+}
diff --git a/test/app/src/main/java/id/ontime/merchant/LogBuffer.java b/test/app/src/main/java/id/ontime/merchant/LogBuffer.java
new file mode 100644
index 0000000..1299c3e
--- /dev/null
+++ b/test/app/src/main/java/id/ontime/merchant/LogBuffer.java
@@ -0,0 +1,96 @@
+package id.ontime.merchant;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.NonNull;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * In-memory log for request/response text. Thread-safe.
+ */
+public final class LogBuffer {
+    private static final int MAX_ENTRIES = 500;
+    private static final LogBuffer INSTANCE = new LogBuffer();
+
+    private final List<Entry> entries = new CopyOnWriteArrayList<>();
+    private final List<Listener> listeners = new CopyOnWriteArrayList<>();
+    private final Handler mainHandler = new Handler(Looper.getMainLooper());
+
+    public static LogBuffer get() {
+        return INSTANCE;
+    }
+
+    public void logRequest(@NonNull String tag, @NonNull String message) {
+        add(new Entry(System.currentTimeMillis(), "REQUEST", tag, message));
+    }
+
+    public void logResponse(@NonNull String tag, @NonNull String message) {
+        add(new Entry(System.currentTimeMillis(), "RESPONSE", tag, message));
+    }
+
+    public void log(@NonNull String type, @NonNull String tag, @NonNull String message) {
+        add(new Entry(System.currentTimeMillis(), type, tag, message));
+    }
+
+    private void add(Entry e) {
+        synchronized (entries) {
+            entries.add(e);
+            while (entries.size() > MAX_ENTRIES) {
+                entries.remove(0);
+            }
+        }
+        notifyListeners();
+    }
+
+    public String getLogText() {
+        StringBuilder sb = new StringBuilder();
+        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss", Locale.getDefault());
+        synchronized (entries) {
+            for (Entry e : entries) {
+                sb.append(sdf.format(new Date(e.time))).append(" [").append(e.type).append("] ")
+                        .append(e.tag).append(": ").append(e.message).append("\n");
+            }
+        }
+        return sb.toString();
+    }
+
+    public void addListener(Listener listener) {
+        listeners.add(listener);
+    }
+
+    public void removeListener(Listener listener) {
+        listeners.remove(listener);
+    }
+
+    private void notifyListeners() {
+        mainHandler.post(() -> {
+            for (Listener l : listeners) {
+                l.onLogUpdated();
+            }
+        });
+    }
+
+    public interface Listener {
+        void onLogUpdated();
+    }
+
+    private static final class Entry {
+        final long time;
+        final String type;
+        final String tag;
+        final String message;
+
+        Entry(long time, String type, String tag, String message) {
+            this.time = time;
+            this.type = type;
+            this.tag = tag;
+            this.message = message;
+        }
+    }
+}
diff --git a/test/app/src/main/java/id/ontime/merchant/LoginActivity.java b/test/app/src/main/java/id/ontime/merchant/LoginActivity.java
new file mode 100644
index 0000000..5e47de7
--- /dev/null
+++ b/test/app/src/main/java/id/ontime/merchant/LoginActivity.java
@@ -0,0 +1,246 @@
+package id.ontime.merchant;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.google.firebase.FirebaseException;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+import com.google.firebase.auth.PhoneAuthCredential;
+import com.google.firebase.auth.PhoneAuthOptions;
+import com.google.firebase.auth.PhoneAuthProvider;
+import com.google.firebase.messaging.FirebaseMessaging;
+
+import java.util.concurrent.TimeUnit;
+
+public class LoginActivity extends AppCompatActivity {
+    private static final String EMAIL_DOMAIN = "@merchant.ontime.id";
+
+    private EditText phoneEdit;
+    private EditText otpCodeEdit;
+    private EditText emailPhoneEdit;
+    private EditText passwordEdit;
+    private EditText tokenText;
+    private EditText requestMessageText;
+    private Button sendOtpButton;
+    private Button verifyOtpButton;
+    private FirebaseAuth auth;
+
+    private String verificationId;
+    private PhoneAuthProvider.ForceResendingToken resendToken;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login);
+        auth = FirebaseAuth.getInstance();
+
+        phoneEdit = findViewById(R.id.phoneEdit);
+        otpCodeEdit = findViewById(R.id.otpCodeEdit);
+        emailPhoneEdit = findViewById(R.id.emailPhoneEdit);
+        passwordEdit = findViewById(R.id.passwordEdit);
+        tokenText = findViewById(R.id.tokenText);
+        requestMessageText = findViewById(R.id.requestMessageText);
+        sendOtpButton = findViewById(R.id.sendOtpButton);
+        verifyOtpButton = findViewById(R.id.verifyOtpButton);
+        Button loginButton = findViewById(R.id.loginButton);
+
+        phoneEdit.setText("62811936767");
+        emailPhoneEdit.setText("62811936767");
+        passwordEdit.setText("123456");
+
+        fetchFcmToken();
+
+        if (auth.getCurrentUser() != null) {
+            startActivity(new Intent(this, HomeActivity.class));
+            finish();
+            return;
+        }
+
+        sendOtpButton.setOnClickListener(v -> sendOtp());
+        verifyOtpButton.setOnClickListener(v -> verifyOtp());
+        loginButton.setOnClickListener(v -> doLogin());
+        findViewById(R.id.registerButton).setOnClickListener(v -> doRegister());
+    }
+
+    private void fetchFcmToken() {
+        FirebaseMessaging.getInstance().getToken()
+                .addOnCompleteListener(task -> {
+                    if (task.isSuccessful() && task.getResult() != null) {
+                        tokenText.setText("FCM: " + task.getResult());
+                    }
+                });
+    }
+
+    /** Normalize to E.164: ensure leading + and country code (e.g. 62 for Indonesia). */
+    private String toE164(String phone) {
+        String p = phone.trim().replaceAll("\\s+", "");
+        if (p.startsWith("+")) return p;
+        if (p.startsWith("0")) p = "62" + p.substring(1);
+        else if (!p.startsWith("62")) p = "62" + p;
+        return "+" + p;
+    }
+
+    private void sendOtp() {
+        String phone = phoneEdit.getText().toString().trim();
+        if (TextUtils.isEmpty(phone)) {
+            Toast.makeText(this, "Enter phone number", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        String e164 = toE164(phone);
+        String requestMsg = "Send OTP to " + e164;
+        requestMessageText.setText(requestMsg);
+        LogBuffer.get().logRequest("PhoneAuth", requestMsg);
+        sendOtpButton.setEnabled(false);
+
+        PhoneAuthOptions options = PhoneAuthOptions.newBuilder(auth)
+                .setPhoneNumber(e164)
+                .setTimeout(60L, TimeUnit.SECONDS)
+                .setActivity(this)
+                .setCallbacks(new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
+                    @Override
+                    public void onVerificationCompleted(@NonNull PhoneAuthCredential credential) {
+                        sendOtpButton.setEnabled(true);
+                        requestMessageText.setText(requestMsg + "\nAuto-verified.");
+                        LogBuffer.get().logResponse("PhoneAuth", "Verification completed (auto)");
+                        signInWithPhoneCredential(credential);
+                    }
+
+                    @Override
+                    public void onVerificationFailed(@NonNull FirebaseException e) {
+                        sendOtpButton.setEnabled(true);
+                        String err = e.getMessage();
+                        requestMessageText.setText(requestMsg + "\nError: " + err);
+                        LogBuffer.get().logResponse("PhoneAuth", "Verification failed: " + err);
+                        Toast.makeText(LoginActivity.this, "OTP failed: " + err, Toast.LENGTH_LONG).show();
+                    }
+
+                    @Override
+                    public void onCodeSent(@NonNull String verId, @NonNull PhoneAuthProvider.ForceResendingToken token) {
+                        sendOtpButton.setEnabled(true);
+                        verificationId = verId;
+                        resendToken = token;
+                        requestMessageText.setText(requestMsg + "\nSMS code sent. Enter code below.");
+                        LogBuffer.get().logResponse("PhoneAuth", "Code sent");
+                        otpCodeEdit.setVisibility(View.VISIBLE);
+                        verifyOtpButton.setVisibility(View.VISIBLE);
+                        Toast.makeText(LoginActivity.this, "SMS code sent", Toast.LENGTH_SHORT).show();
+                    }
+                })
+                .build();
+        PhoneAuthProvider.verifyPhoneNumber(options);
+    }
+
+    private void verifyOtp() {
+        String code = otpCodeEdit.getText().toString().trim();
+        if (TextUtils.isEmpty(verificationId) || TextUtils.isEmpty(code)) {
+            Toast.makeText(this, "Enter the SMS code", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        PhoneAuthCredential credential = PhoneAuthProvider.getCredential(verificationId, code);
+        signInWithPhoneCredential(credential);
+    }
+
+    private void signInWithPhoneCredential(PhoneAuthCredential credential) {
+        requestMessageText.setText(requestMessageText.getText() + "\nSigning in…");
+        auth.signInWithCredential(credential)
+                .addOnCompleteListener(this, task -> {
+                    if (task.isSuccessful()) {
+                        LogBuffer.get().logResponse("PhoneAuth", "Sign in success");
+                        onAuthSuccess("Phone sign in");
+                    } else {
+                        String err = task.getException() != null ? task.getException().getMessage() : "Unknown";
+                        requestMessageText.setText(requestMessageText.getText() + "\nError: " + err);
+                        LogBuffer.get().logResponse("PhoneAuth", "Sign in failed: " + err);
+                        Toast.makeText(LoginActivity.this, "Sign in failed: " + err, Toast.LENGTH_LONG).show();
+                    }
+                });
+    }
+
+    private void doLogin() {
+        String phone = emailPhoneEdit.getText().toString().trim();
+        String password = passwordEdit.getText().toString().trim();
+        if (TextUtils.isEmpty(phone) || TextUtils.isEmpty(password)) {
+            Toast.makeText(this, "Enter phone and password", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        String email = phone + EMAIL_DOMAIN;
+        String requestMsg = "Sign in with email " + email;
+        requestMessageText.setText(requestMsg);
+        LogBuffer.get().logRequest("Auth", requestMsg);
+
+        auth.signInWithEmailAndPassword(email, password)
+                .addOnCompleteListener(this, task -> {
+                    if (task.isSuccessful()) {
+                        onAuthSuccess(requestMsg);
+                    } else {
+                        String err = task.getException() != null ? task.getException().getMessage() : "";
+                        boolean noUser = err != null && (err.contains("no user record") || err.contains("INVALID_LOGIN_CREDENTIALS") || err.contains("ERROR_USER_NOT_FOUND"));
+                        if (noUser) {
+                            requestMessageText.setText(requestMsg + "\nNo account yet. Creating account…");
+                            doRegister();
+                            return;
+                        }
+                        requestMessageText.setText(requestMsg + "\nError: " + err);
+                        LogBuffer.get().logResponse("Auth", "Sign in failed: " + err);
+                        Toast.makeText(LoginActivity.this, "Login failed: " + err, Toast.LENGTH_LONG).show();
+                    }
+                });
+    }
+
+    private void doRegister() {
+        String phone = emailPhoneEdit.getText().toString().trim();
+        String password = passwordEdit.getText().toString().trim();
+        if (TextUtils.isEmpty(phone) || TextUtils.isEmpty(password)) {
+            Toast.makeText(this, "Enter phone and password", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        String email = phone + EMAIL_DOMAIN;
+        String requestMsg = "Create account: " + email;
+        requestMessageText.setText(requestMsg);
+        LogBuffer.get().logRequest("Auth", requestMsg);
+
+        auth.createUserWithEmailAndPassword(email, password)
+                .addOnCompleteListener(this, task -> {
+                    if (task.isSuccessful()) {
+                        LogBuffer.get().logResponse("Auth", "Account created");
+                        requestMessageText.setText(requestMsg + "\nAccount created. Signing in…");
+                        onAuthSuccess(requestMsg);
+                    } else {
+                        String err = task.getException() != null ? task.getException().getMessage() : "Unknown error";
+                        requestMessageText.setText(requestMsg + "\nError: " + err);
+                        LogBuffer.get().logResponse("Auth", "Register failed: " + err);
+                        Toast.makeText(LoginActivity.this, "Register failed: " + err, Toast.LENGTH_LONG).show();
+                    }
+                });
+    }
+
+    private void onAuthSuccess(String requestMsg) {
+        FirebaseUser user = auth.getCurrentUser();
+        if (user != null) {
+            user.getIdToken(false).addOnCompleteListener(t -> {
+                String tokenDisplay = tokenText.getText().toString();
+                if (t.isSuccessful() && t.getResult() != null) {
+                    String idToken = t.getResult().getToken();
+                    tokenDisplay = "FCM token: (see above)\nID token: " + (idToken != null ? idToken.substring(0, Math.min(80, idToken.length())) + "…" : "");
+                }
+                tokenText.setText(tokenDisplay);
+                LogBuffer.get().logResponse("Auth", "Sign in success");
+                startActivity(new Intent(LoginActivity.this, HomeActivity.class));
+                finish();
+            });
+        } else {
+            LogBuffer.get().logResponse("Auth", "Sign in success");
+            startActivity(new Intent(LoginActivity.this, HomeActivity.class));
+            finish();
+        }
+    }
+}
diff --git a/test/app/src/main/java/id/ontime/merchant/MessageStore.java b/test/app/src/main/java/id/ontime/merchant/MessageStore.java
new file mode 100644
index 0000000..989258f
--- /dev/null
+++ b/test/app/src/main/java/id/ontime/merchant/MessageStore.java
@@ -0,0 +1,50 @@
+package id.ontime.merchant;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * Holds received FCM messages for Receipt screen. Thread-safe.
+ */
+public final class MessageStore {
+    private static final int MAX = 100;
+    private static final MessageStore INSTANCE = new MessageStore();
+
+    private final List<String> received = new CopyOnWriteArrayList<>();
+    private final List<Listener> listeners = new CopyOnWriteArrayList<>();
+
+    public static MessageStore get() {
+        return INSTANCE;
+    }
+
+    public void addReceived(String message) {
+        received.add(0, message);
+        while (received.size() > MAX) {
+            received.remove(received.size() - 1);
+        }
+        for (Listener l : listeners) {
+            l.onNewMessage();
+        }
+    }
+
+    public String getAllAsText() {
+        StringBuilder sb = new StringBuilder();
+        for (String s : received) {
+            sb.append("---\n").append(s).append("\n");
+        }
+        return sb.length() > 0 ? sb.toString() : "(No messages received yet)";
+    }
+
+    public void addListener(Listener l) {
+        listeners.add(l);
+    }
+
+    public void removeListener(Listener l) {
+        listeners.remove(l);
+    }
+
+    public interface Listener {
+        void onNewMessage();
+    }
+}
diff --git a/test/app/src/main/java/id/ontime/merchant/OntimeFcmService.java b/test/app/src/main/java/id/ontime/merchant/OntimeFcmService.java
new file mode 100644
index 0000000..085e39e
--- /dev/null
+++ b/test/app/src/main/java/id/ontime/merchant/OntimeFcmService.java
@@ -0,0 +1,40 @@
+package id.ontime.merchant;
+
+import androidx.annotation.NonNull;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+
+import java.util.Map;
+
+/**
+ * Receives FCM messages and logs them; notifies ReceiptMessageActivity via MessageStore.
+ */
+public class OntimeFcmService extends FirebaseMessagingService {
+
+    @Override
+    public void onNewToken(@NonNull String token) {
+        super.onNewToken(token);
+        LogBuffer.get().log("FCM", "token", "New token: " + token);
+    }
+
+    @Override
+    public void onMessageReceived(@NonNull RemoteMessage remoteMessage) {
+        super.onMessageReceived(remoteMessage);
+        StringBuilder sb = new StringBuilder();
+        sb.append("From: ").append(remoteMessage.getFrom()).append("\n");
+        if (remoteMessage.getData() != null && !remoteMessage.getData().isEmpty()) {
+            sb.append("Data:\n");
+            for (Map.Entry<String, String> e : remoteMessage.getData().entrySet()) {
+                sb.append("  ").append(e.getKey()).append("=").append(e.getValue()).append("\n");
+            }
+        }
+        if (remoteMessage.getNotification() != null) {
+            sb.append("Notification title: ").append(remoteMessage.getNotification().getTitle()).append("\n");
+            sb.append("Notification body: ").append(remoteMessage.getNotification().getBody()).append("\n");
+        }
+        String text = sb.toString();
+        LogBuffer.get().logResponse("FCM", text);
+        MessageStore.get().addReceived(text);
+    }
+}
diff --git a/test/app/src/main/java/id/ontime/merchant/OntimeMerchantApp.java b/test/app/src/main/java/id/ontime/merchant/OntimeMerchantApp.java
new file mode 100644
index 0000000..1e2a2bd
--- /dev/null
+++ b/test/app/src/main/java/id/ontime/merchant/OntimeMerchantApp.java
@@ -0,0 +1,10 @@
+package id.ontime.merchant;
+
+import android.app.Application;
+
+public class OntimeMerchantApp extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+    }
+}
diff --git a/test/app/src/main/java/id/ontime/merchant/ReceiptMessageActivity.java b/test/app/src/main/java/id/ontime/merchant/ReceiptMessageActivity.java
new file mode 100644
index 0000000..3cdb096
--- /dev/null
+++ b/test/app/src/main/java/id/ontime/merchant/ReceiptMessageActivity.java
@@ -0,0 +1,36 @@
+package id.ontime.merchant;
+
+import android.os.Bundle;
+import android.widget.EditText;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class ReceiptMessageActivity extends AppCompatActivity {
+    private EditText receiptText;
+    private final MessageStore.Listener messageListener = this::refreshReceipt;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_receipt_message);
+        receiptText = findViewById(R.id.receiptText);
+        refreshReceipt();
+        MessageStore.get().addListener(messageListener);
+    }
+
+    @Override
+    protected void onDestroy() {
+        MessageStore.get().removeListener(messageListener);
+        super.onDestroy();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        refreshReceipt();
+    }
+
+    private void refreshReceipt() {
+        runOnUiThread(() -> receiptText.setText(MessageStore.get().getAllAsText()));
+    }
+}
diff --git a/test/app/src/main/java/id/ontime/merchant/RequestResponseLogActivity.java b/test/app/src/main/java/id/ontime/merchant/RequestResponseLogActivity.java
new file mode 100644
index 0000000..91cae21
--- /dev/null
+++ b/test/app/src/main/java/id/ontime/merchant/RequestResponseLogActivity.java
@@ -0,0 +1,37 @@
+package id.ontime.merchant;
+
+import android.os.Bundle;
+import android.widget.EditText;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class RequestResponseLogActivity extends AppCompatActivity {
+    private EditText logText;
+    private final LogBuffer.Listener logListener = this::refreshLog;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_request_response_log);
+        logText = findViewById(R.id.logText);
+        refreshLog();
+        LogBuffer.get().addListener(logListener);
+        findViewById(R.id.refreshButton).setOnClickListener(v -> refreshLog());
+    }
+
+    @Override
+    protected void onDestroy() {
+        LogBuffer.get().removeListener(logListener);
+        super.onDestroy();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        refreshLog();
+    }
+
+    private void refreshLog() {
+        logText.setText(LogBuffer.get().getLogText());
+    }
+}
diff --git a/test/app/src/main/java/id/ontime/merchant/SendMessageActivity.java b/test/app/src/main/java/id/ontime/merchant/SendMessageActivity.java
new file mode 100644
index 0000000..a9789b8
--- /dev/null
+++ b/test/app/src/main/java/id/ontime/merchant/SendMessageActivity.java
@@ -0,0 +1,70 @@
+package id.ontime.merchant;
+
+import android.os.Bundle;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SendMessageActivity extends AppCompatActivity {
+    private EditText messageEdit;
+    private EditText sentPayloadText;
+    private DatabaseReference database;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_send_message);
+        database = FirebaseDatabase.getInstance().getReference();
+
+        messageEdit = findViewById(R.id.messageEdit);
+        sentPayloadText = findViewById(R.id.sentPayloadText);
+        findViewById(R.id.sendButton).setOnClickListener(v -> sendMessage());
+    }
+
+    private void sendMessage() {
+        if (FirebaseAuth.getInstance().getCurrentUser() == null) {
+            Toast.makeText(this, "Please log in first", Toast.LENGTH_LONG).show();
+            return;
+        }
+        String text = messageEdit.getText().toString().trim();
+        if (text.isEmpty()) {
+            Toast.makeText(this, "Enter a message", Toast.LENGTH_SHORT).show();
+            return;
+        }
+        String uid = FirebaseAuth.getInstance().getCurrentUser().getUid();
+        String path = "merchant_messages/" + uid + "/" + System.currentTimeMillis();
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("message", text);
+        payload.put("timestamp", System.currentTimeMillis());
+
+        String requestStr = "PUT " + path + "\n" + payload.toString();
+        LogBuffer.get().logRequest("RTDB", requestStr);
+        sentPayloadText.setText(requestStr);
+
+        DatabaseReference ref = database.child("merchant_messages").child(uid).child(String.valueOf(System.currentTimeMillis()));
+        ref.setValue(payload)
+                .addOnSuccessListener(aVoid -> {
+                    String response = "Sent successfully to " + ref.getPath();
+                    LogBuffer.get().logResponse("RTDB", response);
+                    sentPayloadText.setText(requestStr + "\n\n" + response);
+                    Toast.makeText(this, "Message sent", Toast.LENGTH_SHORT).show();
+                })
+                .addOnFailureListener(e -> {
+                    String err = e.getMessage();
+                    LogBuffer.get().logResponse("RTDB", "Failed: " + err);
+                    sentPayloadText.setText(requestStr + "\n\nError: " + err);
+                    String toast = err != null && err.contains("Permission denied")
+                            ? "Permission denied. Set Realtime Database rules (see README or database.rules.json)."
+                            : err;
+                    Toast.makeText(this, toast, Toast.LENGTH_LONG).show();
+                });
+    }
+}
diff --git a/test/app/src/main/res/drawable/ic_launcher.xml b/test/app/src/main/res/drawable/ic_launcher.xml
new file mode 100644
index 0000000..e4868bc
--- /dev/null
+++ b/test/app/src/main/res/drawable/ic_launcher.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+    <path
+        android:fillColor="@color/primary"
+        android:pathData="M24,18 L24,30 L30,24 L18,24 Z"/>
+</vector>
diff --git a/test/app/src/main/res/drawable/ic_launcher_foreground.xml b/test/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..cb8f231
--- /dev/null
+++ b/test/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M54,42 L54,66 L66,54 L42,54 Z"/>
+</vector>
diff --git a/test/app/src/main/res/layout/activity_home.xml b/test/app/src/main/res/layout/activity_home.xml
new file mode 100644
index 0000000..2f81498
--- /dev/null
+++ b/test/app/src/main/res/layout/activity_home.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp"
+    tools:context=".HomeActivity">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/home"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        android:layout_marginBottom="16dp" />
+
+    <Button
+        android:id="@+id/btnSendMessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/send_message"
+        android:layout_marginBottom="8dp" />
+
+    <Button
+        android:id="@+id/btnReceiptMessage"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/receipt_message"
+        android:layout_marginBottom="8dp" />
+
+    <Button
+        android:id="@+id/btnRequestResponseLog"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/request_response_log"
+        android:layout_marginBottom="8dp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="FCM Token"
+        android:textStyle="bold" />
+    <EditText
+        android:id="@+id/fcmTokenText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minLines="2"
+        android:maxLines="4"
+        android:inputType="none"
+        android:focusable="false"
+        android:background="?android:attr/editTextBackground"
+        android:padding="8dp" />
+</LinearLayout>
diff --git a/test/app/src/main/res/layout/activity_login.xml b/test/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000..7326793
--- /dev/null
+++ b/test/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp"
+    tools:context=".LoginActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <!-- Phone (OTP) login -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/login_with_phone"
+            android:textStyle="bold"
+            android:textSize="16sp"
+            android:layout_marginBottom="8dp" />
+        <EditText
+            android:id="@+id/phoneEdit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/phone"
+            android:inputType="phone"
+            android:maxLines="1" />
+        <Button
+            android:id="@+id/sendOtpButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/send_otp" />
+        <EditText
+            android:id="@+id/otpCodeEdit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:hint="@string/otp_code"
+            android:inputType="number"
+            android:maxLength="6"
+            android:maxLines="1"
+            android:visibility="gone" />
+        <Button
+            android:id="@+id/verifyOtpButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/verify_otp"
+            android:visibility="gone" />
+
+        <!-- Email/Password login -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@string/login_with_email"
+            android:textStyle="bold"
+            android:textSize="16sp"
+            android:layout_marginBottom="8dp" />
+        <EditText
+            android:id="@+id/emailPhoneEdit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/phone"
+            android:inputType="phone"
+            android:maxLines="1" />
+        <EditText
+            android:id="@+id/passwordEdit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:hint="@string/password"
+            android:inputType="textPassword"
+            android:maxLines="1" />
+        <Button
+            android:id="@+id/loginButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/login" />
+        <Button
+            android:id="@+id/registerButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/register" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@string/login_token"
+            android:textStyle="bold" />
+        <EditText
+            android:id="@+id/tokenText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minLines="2"
+            android:maxLines="6"
+            android:inputType="none"
+            android:focusable="false"
+            android:background="?android:attr/editTextBackground"
+            android:padding="8dp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/request_message"
+            android:textStyle="bold" />
+        <EditText
+            android:id="@+id/requestMessageText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minLines="2"
+            android:maxLines="6"
+            android:inputType="none"
+            android:focusable="false"
+            android:background="?android:attr/editTextBackground"
+            android:padding="8dp" />
+    </LinearLayout>
+</ScrollView>
diff --git a/test/app/src/main/res/layout/activity_receipt_message.xml b/test/app/src/main/res/layout/activity_receipt_message.xml
new file mode 100644
index 0000000..88884cf
--- /dev/null
+++ b/test/app/src/main/res/layout/activity_receipt_message.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp"
+    tools:context=".ReceiptMessageActivity">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/receipt_message"
+        android:textStyle="bold"
+        android:textSize="18sp"
+        android:layout_marginBottom="8dp" />
+
+    <EditText
+        android:id="@+id/receiptText"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:minLines="8"
+        android:inputType="textMultiLine|none"
+        android:focusable="false"
+        android:gravity="top"
+        android:background="?android:attr/editTextBackground"
+        android:padding="8dp" />
+</LinearLayout>
diff --git a/test/app/src/main/res/layout/activity_request_response_log.xml b/test/app/src/main/res/layout/activity_request_response_log.xml
new file mode 100644
index 0000000..b92dce5
--- /dev/null
+++ b/test/app/src/main/res/layout/activity_request_response_log.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp"
+    tools:context=".RequestResponseLogActivity">
+
+    <Button
+        android:id="@+id/refreshButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/refresh"
+        android:layout_marginBottom="8dp" />
+
+    <EditText
+        android:id="@+id/logText"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:minLines="10"
+        android:inputType="textMultiLine|none"
+        android:focusable="false"
+        android:gravity="top"
+        android:background="?android:attr/editTextBackground"
+        android:padding="8dp"
+        android:fontFamily="monospace" />
+</LinearLayout>
diff --git a/test/app/src/main/res/layout/activity_send_message.xml b/test/app/src/main/res/layout/activity_send_message.xml
new file mode 100644
index 0000000..c341c71
--- /dev/null
+++ b/test/app/src/main/res/layout/activity_send_message.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp"
+    tools:context=".SendMessageActivity">
+
+    <EditText
+        android:id="@+id/messageEdit"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minLines="3"
+        android:hint="@string/message_hint"
+        android:inputType="textMultiLine" />
+
+    <Button
+        android:id="@+id/sendButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/send" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Sent payload / request"
+        android:textStyle="bold" />
+    <EditText
+        android:id="@+id/sentPayloadText"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:minLines="4"
+        android:inputType="textMultiLine|none"
+        android:focusable="false"
+        android:background="?android:attr/editTextBackground"
+        android:padding="8dp" />
+</LinearLayout>
diff --git a/test/app/src/main/res/values/colors.xml b/test/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..0cebe14
--- /dev/null
+++ b/test/app/src/main/res/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="primary">#1976D2</color>
+    <color name="primary_dark">#0D47A1</color>
+    <color name="white">#FFFFFF</color>
+    <color name="black">#FF000000</color>
+</resources>
diff --git a/test/app/src/main/res/values/strings.xml b/test/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..1432859
--- /dev/null
+++ b/test/app/src/main/res/values/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Ontime Merchant</string>
+    <string name="login">Login</string>
+    <string name="register">Register (create account)</string>
+    <string name="login_with_phone">Login with phone (OTP)</string>
+    <string name="login_with_email">Login with email / password</string>
+    <string name="send_otp">Send OTP</string>
+    <string name="verify_otp">Verify &amp; sign in</string>
+    <string name="otp_code">SMS code</string>
+    <string name="phone">Phone</string>
+    <string name="password">Password</string>
+    <string name="login_token">Login token</string>
+    <string name="request_message">Request message</string>
+    <string name="send_message">Send message</string>
+    <string name="receipt_message">Receipt message</string>
+    <string name="request_response_log">Request &amp; Response log</string>
+    <string name="home">Home</string>
+    <string name="send">Send</string>
+    <string name="refresh">Refresh</string>
+    <string name="message_hint">Enter message…</string>
+</resources>
diff --git a/test/app/src/main/res/values/themes.xml b/test/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..9eb7a83
--- /dev/null
+++ b/test/app/src/main/res/values/themes.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.OntimeMerchant" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryVariant">@color/primary_dark</item>
+        <item name="colorOnPrimary">@color/white</item>
+    </style>
+</resources>
diff --git a/test/build.gradle b/test/build.gradle
new file mode 100755
index 0000000..4c657e8
--- /dev/null
+++ b/test/build.gradle
@@ -0,0 +1,13 @@
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.google.gms:google-services:4.4.0'
+    }
+}
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/test/database.rules.json b/test/database.rules.json
new file mode 100644
index 0000000..22d5145
--- /dev/null
+++ b/test/database.rules.json
@@ -0,0 +1,10 @@
+{
+  "rules": {
+    "merchant_messages": {
+      "$uid": {
+        ".read": "auth != null",
+        ".write": "auth != null"
+      }
+    }
+  }
+}
diff --git a/test/database.rules.merge-only.txt b/test/database.rules.merge-only.txt
new file mode 100644
index 0000000..2df2caa
--- /dev/null
+++ b/test/database.rules.merge-only.txt
@@ -0,0 +1,23 @@
+# Add this block inside "rules" only (do not replace your existing rules)
+# Firebase project is shared with other apps — merge, don't replace.
+
+"merchant_messages": {
+  "$uid": {
+    ".read": "auth != null",
+    ".write": "auth != null"
+  }
+}
+
+# Example if you already have other paths (customer, driver, etc.):
+# {
+#   "rules": {
+#     "customer_messages": { ... },
+#     "driver_messages": { ... },
+#     "merchant_messages": {
+#       "$uid": {
+#         ".read": "auth != null",
+#         ".write": "auth != null"
+#       }
+#     }
+#   }
+# }
diff --git a/test/debug-adb.sh b/test/debug-adb.sh
new file mode 100755
index 0000000..6611712
--- /dev/null
+++ b/test/debug-adb.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+# Debug id.ontime.merchant via ADB
+# Usage: ./debug-adb.sh [install|launch|logcat|all]
+set -e
+SDK="${ANDROID_HOME:-$HOME/Library/Android/sdk}"
+ADB="$SDK/platform-tools/adb"
+APK="app/build/outputs/apk/debug/app-debug.apk"
+PKG="id.ontime.merchant"
+
+case "${1:-all}" in
+  install)
+    "$ADB" install -r "$APK"
+    echo "Installed. Launch with: $ADB shell am start -n $PKG/.LoginActivity"
+    ;;
+  launch)
+    "$ADB" shell am start -n "$PKG/.LoginActivity"
+    echo "App launched. View logs with: $ADB logcat --pid=\$($ADB shell pidof -s $PKG)"
+    ;;
+  logcat)
+    echo "Logcat for $PKG (Ctrl+C to stop)..."
+    "$ADB" logcat --pid=$("$ADB" shell pidof -s "$PKG" 2>/dev/null || true) 2>/dev/null || "$ADB" logcat | grep -E "($PKG|AndroidRuntime|FATAL)"
+    ;;
+  all)
+    "$ADB" install -r "$APK"
+    "$ADB" shell am start -n "$PKG/.LoginActivity"
+    echo "App installed and launched. Run './debug-adb.sh logcat' for logs."
+    ;;
+  *)
+    echo "Usage: $0 [install|launch|logcat|all]"
+    echo "  install  - install/reinstall APK"
+    echo "  launch   - start LoginActivity"
+    echo "  logcat   - stream logcat for app (debug)"
+    echo "  all      - install, launch (default)"
+    exit 1
+    ;;
+esac
diff --git a/test/gradle.properties b/test/gradle.properties
new file mode 100644
index 0000000..bae9034
--- /dev/null
+++ b/test/gradle.properties
@@ -0,0 +1,3 @@
+android.useAndroidX=true
+android.nonTransitiveRClass=true
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
diff --git a/test/gradle/wrapper/gradle-wrapper.properties b/test/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..1af9e09
--- /dev/null
+++ b/test/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/test/gradlew b/test/gradlew
new file mode 100755
index 0000000..b7cd6ac
--- /dev/null
+++ b/test/gradlew
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Resolve script directory (project root)
+dir=$(dirname "$0")
+[ -z "$dir" ] && dir=.
+APP_HOME=$( cd "$dir" && pwd )
+cd "$APP_HOME" || exit 1
+if [ -f "gradle/wrapper/gradle-wrapper.jar" ]; then
+  exec java -Dfile.encoding=UTF-8 -cp gradle/wrapper/gradle-wrapper.jar org.gradle.wrapper.GradleWrapperMain "$@"
+else
+  echo "gradle-wrapper.jar not found. Run from Android Studio or install Gradle and run: gradle wrapper"
+  exit 1
+fi
diff --git a/test/settings.gradle b/test/settings.gradle
new file mode 100644
index 0000000..c127240
--- /dev/null
+++ b/test/settings.gradle
@@ -0,0 +1,16 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+rootProject.name = "OntimeMerchant"
+include ':app'